*/
#include "internal.h"
+
+#if defined(XMLTOOLING_LOG4SHIB)
+# ifndef OPENSAML_LOG4SHIB
+# error "Logging library mismatch (XMLTooling is using log4shib)."
+# endif
+#elif defined(XMLTOOLING_LOG4CPP)
+# ifndef OPENSAML_LOG4CPP
+# error "Logging library mismatch (XMLTooling is using log4cpp)."
+# endif
+#else
+# error "No supported logging library."
+#endif
+
#include "exceptions.h"
#include "SAMLConfig.h"
#include "binding/ArtifactMap.h"
#include "saml2/metadata/MetadataProvider.h"
#include "util/SAMLConstants.h"
+#include <xmltooling/logging.h>
#include <xmltooling/XMLToolingConfig.h>
#include <xmltooling/signature/Signature.h>
#include <xmltooling/util/NDC.h>
+#include <xmltooling/util/PathResolver.h>
-#include <log4cpp/Category.hh>
#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/enc/XSECCryptoProvider.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
using namespace opensaml;
using namespace xmlsignature;
+using namespace xmltooling::logging;
using namespace xmltooling;
-using namespace log4cpp;
using namespace std;
// Expose entry points when used as an extension library
Category& log=Category::getInstance(SAML_LOGCAT".SAMLConfig");
log.debug("library initialization started");
- if (initXMLTooling) {
+ if (initXMLTooling)
XMLToolingConfig::getConfig().init();
- log.debug("XMLTooling library initialized");
- }
+ XMLToolingConfig::getConfig().getPathResolver()->setDefaultPackageName("opensaml");
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ArtifactException,opensaml);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(SecurityPolicyException,opensaml);
registerMessageDecoders();
registerSecurityPolicyRules();
- log.info("library initialization complete");
+ log.info("%s library initialization complete", PACKAGE_STRING);
return true;
}
delete m_artifactMap;
m_artifactMap = NULL;
- if (termXMLTooling) {
+ if (termXMLTooling)
XMLToolingConfig::getConfig().term();
- log.debug("XMLTooling library shut down");
- }
- log.info("library shutdown complete");
+
+ log.info("%s library shutdown complete", PACKAGE_STRING);
}
void SAMLInternalConfig::generateRandomBytes(void* buf, unsigned int len)