X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2FSAMLConfig.cpp;h=f5082b8f0f43665414ee2dd39f58a53b9cae4360;hb=5ff8914c92dd6c8ff80a09daa98f0c23a1401104;hp=6328b84988acac61697dd98b8b9bc6884162e67e;hpb=0f6286d0ffd9371c187ecb1775cbd199ed051af5;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index 6328b84..f5082b8 100644
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -54,6 +54,7 @@
 #include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/signature/Signature.h>
 #include <xmltooling/util/NDC.h>
+#include <xmltooling/util/PathResolver.h>
 
 #include <xsec/enc/XSECCryptoException.hpp>
 #include <xsec/enc/XSECCryptoProvider.hpp>
@@ -116,10 +117,9 @@ bool SAMLInternalConfig::init(bool initXMLTooling)
     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);
@@ -142,7 +142,7 @@ bool SAMLInternalConfig::init(bool initXMLTooling)
     registerMessageDecoders();
     registerSecurityPolicyRules();
 
-    log.info("library initialization complete");
+    log.info("%s library initialization complete", PACKAGE_STRING);
     return true;
 }
 
@@ -163,11 +163,10 @@ void SAMLInternalConfig::term(bool termXMLTooling)
     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)