[cpp-sp] branch main updated: Remove logging dependency from autoconf and source file.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=02be79f7ff7e9ff33b39c23e705477937f5cf855

The following commit(s) were added to refs/heads/main by this push:
     new 02be79f7 Remove logging dependency from autoconf and source file.
02be79f7 is described below

commit 02be79f7ff7e9ff33b39c23e705477937f5cf855
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Dec 17 15:17:05 2024 -0500

    Remove logging dependency from autoconf and source file.
---
 configure.ac        |  7 -------
 shibsp/SPConfig.cpp | 14 ++------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index dd2e0bb7..49f47f06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,13 +115,6 @@ else
     AC_MSG_RESULT([yes, and it takes $ac_cv_ctime_args arguments])
 fi 
 
-AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
-    [AC_DEFINE([SHIBSP_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])],
-    [AX_PKG_CHECK_MODULES([log4cpp],,[log4cpp],
-        [AC_DEFINE([SHIBSP_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])],,
-        [SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])],,
-    [SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])
-
 AX_PKG_CHECK_MODULES([xerces],,[xerces-c >= 3.2],,,
     [SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])
 
diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index 313237f9..89d9c3e7 100644
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -26,18 +26,6 @@
 
 #include "internal.h"
 
-#if defined(XMLTOOLING_LOG4SHIB)
-# ifndef SHIBSP_LOG4SHIB
-#  error "Logging library mismatch (XMLTooling is using log4shib)."
-# endif
-#elif defined(XMLTOOLING_LOG4CPP)
-# ifndef SHIBSP_LOG4CPP
-#  error "Logging library mismatch (XMLTooling is using log4cpp)."
-# endif
-#else
-# error "No supported logging library."
-#endif
-
 #include "exceptions.h"
 #include "version.h"
 #include "AccessControl.h"
@@ -68,6 +56,7 @@ using namespace std;
 DECL_XMLTOOLING_EXCEPTION_FACTORY(AttributeException,shibsp);
 DECL_XMLTOOLING_EXCEPTION_FACTORY(ConfigurationException,shibsp);
 DECL_XMLTOOLING_EXCEPTION_FACTORY(ListenerException,shibsp);
+DECL_XMLTOOLING_EXCEPTION_FACTORY(SessionException,shibsp);
 
 namespace shibsp {
     class SHIBSP_DLLLOCAL SPInternalConfig : public SPConfig
@@ -156,6 +145,7 @@ bool SPConfig::init(const char* catalog_path, const char* inst_prefix)
     REGISTER_XMLTOOLING_EXCEPTION_FACTORY(AttributeException,shibsp);
     REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ConfigurationException,shibsp);
     REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ListenerException,shibsp);
+    REGISTER_XMLTOOLING_EXCEPTION_FACTORY(SessionException,shibsp);
 
     registerAttributeFactories();
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.