SSPCPP-616 - clean up concatenated string literals

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index 3470e06..fdf3b9b 100644 (file)
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -149,7 +149,7 @@ bool SAMLInternalConfig::init(bool initXMLTooling)
 #ifdef _DEBUG
     xmltooling::NDC ndc("init");
 #endif
-    Category& log=Category::getInstance(SAML_LOGCAT".Config");
+    Category& log=Category::getInstance(SAML_LOGCAT ".Config");
 
     Lock initLock(m_lock);
 
@@ -209,7 +209,7 @@ void SAMLInternalConfig::term(bool termXMLTooling)
 
     Lock initLock(m_lock);
     if (m_initCount == 0) {
-        Category::getInstance(SAML_LOGCAT".Config").crit("term without corresponding init");
+        Category::getInstance(SAML_LOGCAT ".Config").crit("term without corresponding init");
         return;
     }
     else if (--m_initCount > 0) {
@@ -230,7 +230,7 @@ void SAMLInternalConfig::term(bool termXMLTooling)
     if (termXMLTooling)
         XMLToolingConfig::getConfig().term();
     
-    Category::getInstance(SAML_LOGCAT".Config").info("%s library shutdown complete", PACKAGE_STRING);
+    Category::getInstance(SAML_LOGCAT ".Config").info("%s library shutdown complete", PACKAGE_STRING);
 }
 
 void SAMLInternalConfig::generateRandomBytes(void* buf, unsigned int len)

diff --git a/saml/binding/impl/ArtifactMap.cpp b/saml/binding/impl/ArtifactMap.cpp
index 641acfa..c63c57a 100644 (file)
--- a/saml/binding/impl/ArtifactMap.cpp
+++ b/saml/binding/impl/ArtifactMap.cpp
@@ -128,7 +128,7 @@ void ArtifactMappings::storeContent(XMLObject* content, const SAMLArtifact* arti
 
 XMLObject* ArtifactMappings::retrieveContent(const SAMLArtifact* artifact, const char* relyingParty)
 {
-    Category& log=Category::getInstance(SAML_LOGCAT".ArtifactMap");
+    Category& log=Category::getInstance(SAML_LOGCAT ".ArtifactMap");
     Lock wrapper(m_lock);
 
     map<string,Mapping>::iterator i = m_artMap.find(SAMLArtifact::toHex(artifact->getMessageHandle()));
@@ -251,7 +251,7 @@ XMLObject* ArtifactMap::retrieveContent(const SAMLArtifact* artifact, const char
 #ifdef _DEBUG
     xmltooling::NDC ndc("retrieveContent");
 #endif
-    Category& log=Category::getInstance(SAML_LOGCAT".ArtifactMap");
+    Category& log=Category::getInstance(SAML_LOGCAT ".ArtifactMap");
 
     if (!m_storage)
         return m_mappings->retrieveContent(artifact, relyingParty);

diff --git a/saml/binding/impl/ClientCertAuthRule.cpp b/saml/binding/impl/ClientCertAuthRule.cpp
index 6438b8b..4f3a884 100644 (file)
--- a/saml/binding/impl/ClientCertAuthRule.cpp
+++ b/saml/binding/impl/ClientCertAuthRule.cpp
@@ -74,7 +74,7 @@ ClientCertAuthRule::ClientCertAuthRule(const DOMElement* e) : m_errorFatal(XMLHe
 
 bool ClientCertAuthRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
 {
-    Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.ClientCertAuth");
+    Category& log=Category::getInstance(SAML_LOGCAT ".SecurityPolicyRule.ClientCertAuth");
     
     if (!request)
         return false;

diff --git a/saml/binding/impl/MessageFlowRule.cpp b/saml/binding/impl/MessageFlowRule.cpp
index c6fb740..8b117cf 100644 (file)
--- a/saml/binding/impl/MessageFlowRule.cpp
+++ b/saml/binding/impl/MessageFlowRule.cpp
@@ -74,7 +74,7 @@ MessageFlowRule::MessageFlowRule(const DOMElement* e)
 
 bool MessageFlowRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
 {
-    Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.MessageFlow");
+    Category& log=Category::getInstance(SAML_LOGCAT ".SecurityPolicyRule.MessageFlow");
     log.debug("evaluating message flow policy (replay checking %s, expiration %lu)", m_checkReplay ? "on" : "off", m_expires);
 
     time_t now = policy.getTime();

diff --git a/saml/binding/impl/NullSecurityRule.cpp b/saml/binding/impl/NullSecurityRule.cpp
index 161230b..0368d0e 100644 (file)
--- a/saml/binding/impl/NullSecurityRule.cpp
+++ b/saml/binding/impl/NullSecurityRule.cpp
@@ -39,7 +39,7 @@ namespace opensaml {
     class SAML_DLLLOCAL NullSecurityRule : public SecurityPolicyRule
     {
     public:
-        NullSecurityRule(const DOMElement* e) : m_log(Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.NullSecurity")) {}
+        NullSecurityRule(const DOMElement* e) : m_log(Category::getInstance(SAML_LOGCAT ".SecurityPolicyRule.NullSecurity")) {}
         virtual ~NullSecurityRule() {}
         
         const char* getType() const {

diff --git a/saml/binding/impl/SimpleSigningRule.cpp b/saml/binding/impl/SimpleSigningRule.cpp
index e662a26..ee46c11 100644 (file)
--- a/saml/binding/impl/SimpleSigningRule.cpp
+++ b/saml/binding/impl/SimpleSigningRule.cpp
@@ -99,7 +99,7 @@ SimpleSigningRule::SimpleSigningRule(const DOMElement* e) : m_errorFatal(XMLHelp
 
 bool SimpleSigningRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
 {
-    Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.SimpleSigning");
+    Category& log=Category::getInstance(SAML_LOGCAT ".SecurityPolicyRule.SimpleSigning");
     
     if (!policy.getIssuerMetadata()) {
         log.debug("ignoring message, no issuer metadata supplied");

diff --git a/saml/binding/impl/XMLSigningRule.cpp b/saml/binding/impl/XMLSigningRule.cpp
index 0ac8591..4597894 100644 (file)
--- a/saml/binding/impl/XMLSigningRule.cpp
+++ b/saml/binding/impl/XMLSigningRule.cpp
@@ -76,7 +76,7 @@ XMLSigningRule::XMLSigningRule(const DOMElement* e) : m_errorFatal(XMLHelper::ge
 
 bool XMLSigningRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
 {
-    Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.XMLSigning");
+    Category& log=Category::getInstance(SAML_LOGCAT ".SecurityPolicyRule.XMLSigning");
     
     if (!policy.getIssuerMetadata()) {
         log.debug("ignoring message, no issuer metadata supplied");

diff --git a/saml/profile/impl/AudienceRestrictionRule.cpp b/saml/profile/impl/AudienceRestrictionRule.cpp
index 0c55eda..97fb22e 100644 (file)
--- a/saml/profile/impl/AudienceRestrictionRule.cpp
+++ b/saml/profile/impl/AudienceRestrictionRule.cpp
@@ -100,7 +100,7 @@ bool AudienceRestrictionRule::evaluate(const XMLObject& message, const GenericRe
 
         ostringstream os;
         os << *ac2;
-        Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.AudienceRestriction").error(
+        Category::getInstance(SAML_LOGCAT ".SecurityPolicyRule.AudienceRestriction").error(
             "unacceptable AudienceRestriction in assertion (%s)", os.str().c_str()
             );
         throw SecurityPolicyException("Assertion contains an unacceptable AudienceRestriction.");
@@ -129,7 +129,7 @@ bool AudienceRestrictionRule::evaluate(const XMLObject& message, const GenericRe
 
         ostringstream os;
         os << *ac1;
-        Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.AudienceRestriction").error(
+        Category::getInstance(SAML_LOGCAT ".SecurityPolicyRule.AudienceRestriction").error(
             "unacceptable AudienceRestrictionCondition in assertion (%s)", os.str().c_str()
             );
         throw SecurityPolicyException("Assertion contains an unacceptable AudienceRestrictionCondition.");

diff --git a/saml/profile/impl/ConditionsRule.cpp b/saml/profile/impl/ConditionsRule.cpp
index a390c2c..0153bb6 100644 (file)
--- a/saml/profile/impl/ConditionsRule.cpp
+++ b/saml/profile/impl/ConditionsRule.cpp
@@ -82,7 +82,7 @@ namespace opensaml {
 
 ConditionsRule::ConditionsRule(const DOMElement* e) : m_doc(nullptr)
 {
-    Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.Conditions");
+    Category& log=Category::getInstance(SAML_LOGCAT ".SecurityPolicyRule.Conditions");
 
     if (!e || !e->hasChildNodes()) {
         // Default the configuration.

diff --git a/saml/profile/impl/IgnoreRule.cpp b/saml/profile/impl/IgnoreRule.cpp
index 68a736e..5b9aa3a 100644 (file)
--- a/saml/profile/impl/IgnoreRule.cpp
+++ b/saml/profile/impl/IgnoreRule.cpp
@@ -45,7 +45,7 @@ namespace opensaml {
     {
     public:
         IgnoreRule(const DOMElement* e)
-            : m_log(Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.Ignore")), m_qname(XMLHelper::getNodeValueAsQName(e)) {
+            : m_log(Category::getInstance(SAML_LOGCAT ".SecurityPolicyRule.Ignore")), m_qname(XMLHelper::getNodeValueAsQName(e)) {
             if (!m_qname.get())
                 throw SecurityPolicyException("No schema type or element name supplied to Ignore rule.");
         }

diff --git a/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp b/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp
index 6706a62..75b92f3 100644 (file)
--- a/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp
@@ -79,7 +79,7 @@ XMLObject* SAML1ArtifactDecoder::decode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("decode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML1Artifact");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML1Artifact");
 
     log.debug("validating input");
     const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);

diff --git a/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp b/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp
index b66dc8c..de833f2 100644 (file)
--- a/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp
+++ b/saml/saml1/binding/impl/SAML1ArtifactEncoder.cpp
@@ -95,7 +95,7 @@ long SAML1ArtifactEncoder::encode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("encode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML1Artifact");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageEncoder.SAML1Artifact");
 
     log.debug("validating input");
     HTTPResponse* httpResponse=dynamic_cast<HTTPResponse*>(&genericResponse);

diff --git a/saml/saml1/binding/impl/SAML1MessageDecoder.cpp b/saml/saml1/binding/impl/SAML1MessageDecoder.cpp
index ba62030..bf5c673 100644 (file)
--- a/saml/saml1/binding/impl/SAML1MessageDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1MessageDecoder.cpp
@@ -64,7 +64,7 @@ void SAML1MessageDecoder::extractMessageDetails(
     if (!XMLString::equals(q.getNamespaceURI(), samlconstants::SAML1P_NS))
         return;
 
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML1");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML1");
 
     const Request* request=nullptr;
     const Response* response=nullptr;

diff --git a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
index 6c3f324..773a2bc 100644 (file)
--- a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
@@ -82,7 +82,7 @@ XMLObject* SAML1POSTDecoder::decode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("decode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML1POST");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML1POST");
 
     log.debug("validating input");
     const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);

diff --git a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
index 2db3d14..5086cea 100644 (file)
--- a/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
+++ b/saml/saml1/binding/impl/SAML1POSTEncoder.cpp
@@ -111,7 +111,7 @@ long SAML1POSTEncoder::encode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("encode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML1POST");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageEncoder.SAML1POST");
     log.debug("validating input");
 
     TemplateEngine* engine = XMLToolingConfig::getConfig().getTemplateEngine();

diff --git a/saml/saml1/binding/impl/SAML1SOAPClient.cpp b/saml/saml1/binding/impl/SAML1SOAPClient.cpp
index 0e23b88..60f5d7b 100644 (file)
--- a/saml/saml1/binding/impl/SAML1SOAPClient.cpp
+++ b/saml/saml1/binding/impl/SAML1SOAPClient.cpp
@@ -118,7 +118,7 @@ bool SAML1SOAPClient::handleError(const saml1p::Status& status)
 {
     const xmltooling::QName* code = status.getStatusCode() ? status.getStatusCode()->getValue() : nullptr;
     auto_ptr_char str((status.getStatusMessage() ? status.getStatusMessage()->getMessage() : nullptr));
-    Category::getInstance(SAML_LOGCAT".SOAPClient").error(
+    Category::getInstance(SAML_LOGCAT ".SOAPClient").error(
         "SOAP client detected a SAML error: (%s) (%s)",
         (code ? code->toString().c_str() : "no code"),
         (str.get() ? str.get() : "no message")

diff --git a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp b/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp
index e6cfbf1..58949d3 100644 (file)
--- a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp
@@ -80,7 +80,7 @@ XMLObject* SAML1SOAPDecoder::decode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("decode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML1SOAP");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML1SOAP");
 
     log.debug("validating input");
     string s = genericRequest.getContentType();

diff --git a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
index 7b105c2..c5f41f5 100644 (file)
--- a/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
+++ b/saml/saml1/binding/impl/SAML1SOAPEncoder.cpp
@@ -97,7 +97,7 @@ long SAML1SOAPEncoder::encode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("encode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML1SOAP");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageEncoder.SAML1SOAP");
 
     log.debug("validating input");
     if (xmlObject->getParent())

diff --git a/saml/saml1/profile/impl/AssertionValidator.cpp b/saml/saml1/profile/impl/AssertionValidator.cpp
index 11e5b99..403edc0 100644 (file)
--- a/saml/saml1/profile/impl/AssertionValidator.cpp
+++ b/saml/saml1/profile/impl/AssertionValidator.cpp
@@ -93,7 +93,7 @@ void AssertionValidator::validateCondition(const Condition* c) const
 {
     const AudienceRestrictionCondition* ac=dynamic_cast<const AudienceRestrictionCondition*>(c);
     if (!ac) {
-        Category::getInstance(SAML_LOGCAT".AssertionValidator").error("unrecognized Condition in assertion (%s)",
+        Category::getInstance(SAML_LOGCAT ".AssertionValidator").error("unrecognized Condition in assertion (%s)",
             c->getSchemaType() ? c->getSchemaType()->toString().c_str() : c->getElementQName().toString().c_str());
         throw ValidationException("Assertion contains an unrecognized condition.");
     }
@@ -114,7 +114,7 @@ void AssertionValidator::validateCondition(const Condition* c) const
     if (!found) {
         ostringstream os;
         os << *ac;
-        Category::getInstance(SAML_LOGCAT".AssertionValidator").error(
+        Category::getInstance(SAML_LOGCAT ".AssertionValidator").error(
             "unacceptable AudienceRestrictionCondition in assertion (%s)", os.str().c_str()
             );
         throw ValidationException("Assertion contains an unacceptable AudienceRestrictionCondition.");

diff --git a/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp
index 313df44..46ec815 100644 (file)
--- a/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp
@@ -80,7 +80,7 @@ XMLObject* SAML2ArtifactDecoder::decode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("decode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML2Artifact");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML2Artifact");
 
     log.debug("validating input");
     const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);

diff --git a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
index 85ce4b5..51e2528 100644 (file)
--- a/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2ArtifactEncoder.cpp
@@ -114,7 +114,7 @@ long SAML2ArtifactEncoder::encode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("encode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML2Artifact");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageEncoder.SAML2Artifact");
     log.debug("validating input");
     if (!destination)
         throw BindingException("Encoding response requires a destination.");

diff --git a/saml/saml2/binding/impl/SAML2ECPDecoder.cpp b/saml/saml2/binding/impl/SAML2ECPDecoder.cpp
index fbc47a1..d571b1b 100644 (file)
--- a/saml/saml2/binding/impl/SAML2ECPDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2ECPDecoder.cpp
@@ -77,7 +77,7 @@ XMLObject* SAML2ECPDecoder::decode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("decode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML2ECP");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML2ECP");
 
     log.debug("validating input");
     const HTTPRequest* httpRequest = dynamic_cast<const HTTPRequest*>(&genericRequest);

diff --git a/saml/saml2/binding/impl/SAML2ECPEncoder.cpp b/saml/saml2/binding/impl/SAML2ECPEncoder.cpp
index cd9ac82..12a9b4f 100644 (file)
--- a/saml/saml2/binding/impl/SAML2ECPEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2ECPEncoder.cpp
@@ -112,7 +112,7 @@ long SAML2ECPEncoder::encode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("encode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML2ECP");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageEncoder.SAML2ECP");
 
     log.debug("validating input");
     if (xmlObject->getParent())

diff --git a/saml/saml2/binding/impl/SAML2MessageDecoder.cpp b/saml/saml2/binding/impl/SAML2MessageDecoder.cpp
index 86e8053..d2e0a82 100644 (file)
--- a/saml/saml2/binding/impl/SAML2MessageDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2MessageDecoder.cpp
@@ -64,7 +64,7 @@ void SAML2MessageDecoder::extractMessageDetails(
     if (!XMLString::equals(q.getNamespaceURI(), samlconstants::SAML20P_NS))
         return;
 
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML2");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML2");
 
     try {
         const saml2::RootObject& samlRoot = dynamic_cast<const saml2::RootObject&>(message);

diff --git a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
index 5e0ac12..e873d8f 100644 (file)
--- a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
@@ -81,7 +81,7 @@ XMLObject* SAML2POSTDecoder::decode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("decode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML2POST");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML2POST");
 
     log.debug("validating input");
     const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);

diff --git a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp
index 6c52c1e..7d388fd 100644 (file)
--- a/saml/saml2/binding/impl/SAML2POSTEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2POSTEncoder.cpp
@@ -118,7 +118,7 @@ long SAML2POSTEncoder::encode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("encode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML2POST");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageEncoder.SAML2POST");
     log.debug("validating input");
 
     TemplateEngine* engine = XMLToolingConfig::getConfig().getTemplateEngine();

diff --git a/saml/saml2/binding/impl/SAML2Redirect.cpp b/saml/saml2/binding/impl/SAML2Redirect.cpp
index 98fa736..7c2a4a5 100644 (file)
--- a/saml/saml2/binding/impl/SAML2Redirect.cpp
+++ b/saml/saml2/binding/impl/SAML2Redirect.cpp
@@ -53,7 +53,7 @@ char* opensaml::saml2p::deflate(char* in, unsigned int in_len, unsigned int* out
 #ifdef _DEBUG
     xmltooling::NDC ndc("deflate");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML2Redirect.zlib");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML2Redirect.zlib");
 
     z_stream z;
     memset(&z, 0, sizeof(z_stream));
@@ -93,7 +93,7 @@ unsigned int opensaml::saml2p::inflate(char* in, unsigned int in_len, ostream& o
 #ifdef _DEBUG
     xmltooling::NDC ndc("inflate");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML2Redirect.zlib");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML2Redirect.zlib");
 
     z_stream z;
     memset(&z, 0, sizeof(z_stream));

diff --git a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
index 03a0622..485fa88 100644 (file)
--- a/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2RedirectDecoder.cpp
@@ -81,7 +81,7 @@ XMLObject* SAML2RedirectDecoder::decode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("decode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML2Redirect");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML2Redirect");
 
     log.debug("validating input");
     const HTTPRequest* httpRequest=dynamic_cast<const HTTPRequest*>(&genericRequest);

diff --git a/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp b/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
index 0cbab6c..604abbc 100644 (file)
--- a/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2RedirectEncoder.cpp
@@ -101,7 +101,7 @@ long SAML2RedirectEncoder::encode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("encode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML2Redirect");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageEncoder.SAML2Redirect");
 
     log.debug("validating input");
     HTTPResponse* httpResponse=dynamic_cast<HTTPResponse*>(&genericResponse);

diff --git a/saml/saml2/binding/impl/SAML2SOAPClient.cpp b/saml/saml2/binding/impl/SAML2SOAPClient.cpp
index d010275..a78b8b2 100644 (file)
--- a/saml/saml2/binding/impl/SAML2SOAPClient.cpp
+++ b/saml/saml2/binding/impl/SAML2SOAPClient.cpp
@@ -123,7 +123,7 @@ bool SAML2SOAPClient::handleError(const saml2p::Status& status)
 {
     auto_ptr_char code((status.getStatusCode() ? status.getStatusCode()->getValue() : nullptr));
     auto_ptr_char str((status.getStatusMessage() ? status.getStatusMessage()->getMessage() : nullptr));
-    Category::getInstance(SAML_LOGCAT".SOAPClient").error(
+    Category::getInstance(SAML_LOGCAT ".SOAPClient").error(
         "SOAP client detected a SAML error: (%s) (%s)",
         (code.get() ? code.get() : "no code"),
         (str.get() ? str.get() : "no message")

diff --git a/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp b/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp
index 768eaec..702d96a 100644 (file)
--- a/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2SOAPDecoder.cpp
@@ -80,7 +80,7 @@ XMLObject* SAML2SOAPDecoder::decode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("decode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageDecoder.SAML2SOAP");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageDecoder.SAML2SOAP");
 
     log.debug("validating input");
     string s = genericRequest.getContentType();

diff --git a/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp b/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp
index 43e5af1..7183747 100644 (file)
--- a/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp
+++ b/saml/saml2/binding/impl/SAML2SOAPEncoder.cpp
@@ -97,7 +97,7 @@ long SAML2SOAPEncoder::encode(
 #ifdef _DEBUG
     xmltooling::NDC ndc("encode");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".MessageEncoder.SAML2SOAP");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MessageEncoder.SAML2SOAP");
 
     log.debug("validating input");
     if (xmlObject->getParent())

diff --git a/saml/saml2/core/impl/Assertions.cpp b/saml/saml2/core/impl/Assertions.cpp
index 4a163d5..5e07502 100644 (file)
--- a/saml/saml2/core/impl/Assertions.cpp
+++ b/saml/saml2/core/impl/Assertions.cpp
@@ -169,7 +169,7 @@ void EncryptedElementType::encrypt(
         vector<const Credential*> creds;
         if (r->first->resolve(creds, r->second) == 0) {
             auto_ptr_char name(dynamic_cast<const EntityDescriptor*>(r->second->getRole().getParent())->getEntityID());
-            logging::Category::getInstance(SAML_LOGCAT".Encryption").warn("No key encryption credentials found for (%s).", name.get());
+            logging::Category::getInstance(SAML_LOGCAT ".Encryption").warn("No key encryption credentials found for (%s).", name.get());
             continue;
         }
 
@@ -205,7 +205,7 @@ void EncryptedElementType::encrypt(
 
         if (!KEK) {
             auto_ptr_char name(dynamic_cast<const EntityDescriptor*>(r->second->getRole().getParent())->getEntityID());
-            logging::Category::getInstance(SAML_LOGCAT".Encryption").warn("no supported key encryption credential found for (%s).", name.get());
+            logging::Category::getInstance(SAML_LOGCAT ".Encryption").warn("no supported key encryption credential found for (%s).", name.get());
             continue;
         }
 

diff --git a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
index 419fe1e..f2cca92 100644 (file)
--- a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
@@ -259,7 +259,7 @@ const EntitiesDescriptor* AbstractMetadataProvider::getEntitiesDescriptor(const
             return i->second;
     
     if (range.first != range.second) {
-        Category& log = Category::getInstance(SAML_LOGCAT".MetadataProvider");
+        Category& log = Category::getInstance(SAML_LOGCAT ".MetadataProvider");
         if (strict) {
             log.warn("ignored expired metadata group (%s)", range.first->first.c_str());
         }
@@ -299,7 +299,7 @@ pair<const EntityDescriptor*,const RoleDescriptor*> AbstractMetadataProvider::ge
     }
     
     if (!result.first && range.first!=range.second) {
-        Category& log = Category::getInstance(SAML_LOGCAT".MetadataProvider");
+        Category& log = Category::getInstance(SAML_LOGCAT ".MetadataProvider");
         if (criteria.validOnly) {
             log.warn("ignored expired metadata instance for (%s)", range.first->first.c_str());
         }

diff --git a/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp b/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp
index 04e4e1c..7081e13 100644 (file)
--- a/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp
+++ b/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp
@@ -91,24 +91,24 @@ void BlacklistMetadataFilter::doFilter(XMLObject& xmlObject) const
     EntitiesDescriptor* group = dynamic_cast<EntitiesDescriptor*>(&xmlObject);
     if (group) {
         if (group->getName() && !m_entities.empty() && m_entities.count(group->getName()) > 0)
-            throw MetadataFilterException(BLACKLIST_METADATA_FILTER" MetadataFilter instructed to filter the root group in the metadata.");
+            throw MetadataFilterException(BLACKLIST_METADATA_FILTER " MetadataFilter instructed to filter the root group in the metadata.");
         filterGroup(group);
     }
     else {
         EntityDescriptor* entity = dynamic_cast<EntityDescriptor*>(&xmlObject);
         if (entity) {
             if (included(*entity))
-                throw MetadataFilterException(BLACKLIST_METADATA_FILTER" MetadataFilter instructed to filter the root/only entity in the metadata.");
+                throw MetadataFilterException(BLACKLIST_METADATA_FILTER " MetadataFilter instructed to filter the root/only entity in the metadata.");
         }
         else {
-            throw MetadataFilterException(BLACKLIST_METADATA_FILTER" MetadataFilter was given an improper metadata instance to filter.");
+            throw MetadataFilterException(BLACKLIST_METADATA_FILTER " MetadataFilter was given an improper metadata instance to filter.");
         }
     }
 }
 
 void BlacklistMetadataFilter::filterGroup(EntitiesDescriptor* entities) const
 {
-    Category& log = Category::getInstance(SAML_LOGCAT".MetadataFilter."WHITELIST_METADATA_FILTER);
+    Category& log = Category::getInstance(SAML_LOGCAT ".MetadataFilter." WHITELIST_METADATA_FILTER);
 
     VectorOf(EntityDescriptor) v = entities->getEntityDescriptors();
     for (VectorOf(EntityDescriptor)::size_type i = 0; i < v.size(); ) {

diff --git a/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp b/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp
index cea88e8..f95cfdd 100644 (file)
--- a/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp
@@ -161,7 +161,7 @@ namespace opensaml {
         static const XMLCh _MetadataProvider[] =    UNICODE_LITERAL_16(M,e,t,a,d,a,t,a,P,r,o,v,i,d,e,r);
         static const XMLCh precedence[] =           UNICODE_LITERAL_10(p,r,e,c,e,d,e,n,c,e);
         static const XMLCh last[] =                 UNICODE_LITERAL_4(l,a,s,t);
-        static const XMLCh _type[] =                 UNICODE_LITERAL_4(t,y,p,e);
+        static const XMLCh _type[] =                UNICODE_LITERAL_4(t,y,p,e);
     };
 };
 
@@ -178,7 +178,7 @@ void ChainingMetadataProvider::tracker_cleanup(void* ptr)
 
 ChainingMetadataProvider::ChainingMetadataProvider(const DOMElement* e)
     : ObservableMetadataProvider(e), m_firstMatch(true), m_trackerLock(Mutex::create()), m_tlsKey(ThreadKey::create(tracker_cleanup)),
-        m_log(Category::getInstance(SAML_LOGCAT".Metadata.Chaining"))
+        m_log(Category::getInstance(SAML_LOGCAT ".Metadata.Chaining"))
 {
     if (XMLString::equals(e ? e->getAttributeNS(nullptr, precedence) : nullptr, last))
         m_firstMatch = false;

diff --git a/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp b/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
index 2b26618..c1ed11c 100644 (file)
--- a/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
@@ -69,17 +69,17 @@ DiscoverableMetadataProvider::DiscoverableMetadataProvider(const DOMElement* e)
                     m_discoFilters.push_back(make_pair(t == "Whitelist", temp));
                 }
                 catch (std::exception& ex) {
-                    Category::getInstance(SAML_LOGCAT".MetadataProvider.Discoverable").error(
+                    Category::getInstance(SAML_LOGCAT ".MetadataProvider.Discoverable").error(
                         "exception creating <DiscoveryFilter> EntityMatcher: %s", ex.what()
                         );
                 }
             }
             else {
-                Category::getInstance(SAML_LOGCAT".MetadataProvider.Discoverable").error("<DiscoveryFilter> requires matcher attribute");
+                Category::getInstance(SAML_LOGCAT ".MetadataProvider.Discoverable").error("<DiscoveryFilter> requires matcher attribute");
             }
         }
         else {
-            Category::getInstance(SAML_LOGCAT".MetadataProvider.Discoverable").error(
+            Category::getInstance(SAML_LOGCAT ".MetadataProvider.Discoverable").error(
                 "unknown <DiscoveryFilter> type (%s)", t.empty() ? "none" : t.c_str()
                 );
         }

diff --git a/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp b/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp
index 42320e1..2768440 100644 (file)
--- a/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp
@@ -72,7 +72,7 @@ DynamicMetadataProvider::DynamicMetadataProvider(const DOMElement* e)
         m_maxCacheDuration(XMLHelper::getAttrInt(e, 28800, maxCacheDuration))
 {
     if (m_minCacheDuration > m_maxCacheDuration) {
-        Category::getInstance(SAML_LOGCAT".MetadataProvider.Dynamic").error(
+        Category::getInstance(SAML_LOGCAT ".MetadataProvider.Dynamic").error(
             "minCacheDuration setting exceeds maxCacheDuration setting, lowering to match it"
             );
         m_minCacheDuration = m_maxCacheDuration;
@@ -83,7 +83,7 @@ DynamicMetadataProvider::DynamicMetadataProvider(const DOMElement* e)
         auto_ptr_char temp(delay);
         m_refreshDelayFactor = atof(temp.get());
         if (m_refreshDelayFactor <= 0.0 || m_refreshDelayFactor >= 1.0) {
-            Category::getInstance(SAML_LOGCAT".MetadataProvider.Dynamic").error(
+            Category::getInstance(SAML_LOGCAT ".MetadataProvider.Dynamic").error(
                 "invalid refreshDelayFactor setting, using default"
                 );
             m_refreshDelayFactor = 0.75;
@@ -124,7 +124,7 @@ const char* DynamicMetadataProvider::getId() const
 
 pair<const EntityDescriptor*,const RoleDescriptor*> DynamicMetadataProvider::getEntityDescriptor(const Criteria& criteria) const
 {
-    Category& log = Category::getInstance(SAML_LOGCAT".MetadataProvider.Dynamic");
+    Category& log = Category::getInstance(SAML_LOGCAT ".MetadataProvider.Dynamic");
 
     // First we check the underlying cache.
     pair<const EntityDescriptor*,const RoleDescriptor*> entity = AbstractMetadataProvider::getEntityDescriptor(criteria);
@@ -312,7 +312,7 @@ EntityDescriptor* DynamicMetadataProvider::resolve(const Criteria& criteria) con
     }
     catch (XMLException& e) {
         auto_ptr_char msg(e.getMessage());
-        Category::getInstance(SAML_LOGCAT".MetadataProvider.Dynamic").error(
+        Category::getInstance(SAML_LOGCAT ".MetadataProvider.Dynamic").error(
             "Xerces error while resolving entityID (%s): %s", name.c_str(), msg.get()
             );
         throw MetadataException(msg.get());

diff --git a/saml/saml2/metadata/impl/EntityAttributesEntityMatcher.cpp b/saml/saml2/metadata/impl/EntityAttributesEntityMatcher.cpp
index 1e4d1aa..2f48208 100644 (file)
--- a/saml/saml2/metadata/impl/EntityAttributesEntityMatcher.cpp
+++ b/saml/saml2/metadata/impl/EntityAttributesEntityMatcher.cpp
@@ -83,7 +83,7 @@ namespace opensaml {
 
 EntityAttributesEntityMatcher::EntityAttributesEntityMatcher(const DOMElement* e)
     : m_trimTags(XMLHelper::getAttrBool(e, false, trimTags)),
-        m_log(Category::getInstance(SAML_LOGCAT".EntityMatcher.EntityAttributes"))
+        m_log(Category::getInstance(SAML_LOGCAT ".EntityMatcher.EntityAttributes"))
 {
     // Check for shorthand syntax.
     if (e && e->hasAttributeNS(nullptr, attributeName) && (e->hasAttributeNS(nullptr, attributeValue) || e->hasAttributeNS(nullptr, attributeValueRegex))) {

diff --git a/saml/saml2/metadata/impl/EntityAttributesMetadataFilter.cpp b/saml/saml2/metadata/impl/EntityAttributesMetadataFilter.cpp
index 3038a57..e9d0103 100644 (file)
--- a/saml/saml2/metadata/impl/EntityAttributesMetadataFilter.cpp
+++ b/saml/saml2/metadata/impl/EntityAttributesMetadataFilter.cpp
@@ -109,7 +109,7 @@ void EntityAttributesMetadataFilter::doFilter(XMLObject& xmlObject) const
             filterEntity(entity);
         }
         else {
-            throw MetadataFilterException(ENTITYATTR_METADATA_FILTER" MetadataFilter was given an improper metadata instance to filter.");
+            throw MetadataFilterException(ENTITYATTR_METADATA_FILTER " MetadataFilter was given an improper metadata instance to filter.");
         }
     }
 }

diff --git a/saml/saml2/metadata/impl/EntityRoleMetadataFilter.cpp b/saml/saml2/metadata/impl/EntityRoleMetadataFilter.cpp
index cce0b39..3f4b9ac 100644 (file)
--- a/saml/saml2/metadata/impl/EntityRoleMetadataFilter.cpp
+++ b/saml/saml2/metadata/impl/EntityRoleMetadataFilter.cpp
@@ -112,14 +112,14 @@ void EntityRoleMetadataFilter::doFilter(XMLObject& xmlObject) const
             doFilter(*entity);
         }
         else {
-            throw MetadataFilterException(ENTITYROLE_METADATA_FILTER" MetadataFilter was given an improper metadata instance to filter.");
+            throw MetadataFilterException(ENTITYROLE_METADATA_FILTER " MetadataFilter was given an improper metadata instance to filter.");
         }
     }
 }
 
 void EntityRoleMetadataFilter::doFilter(EntitiesDescriptor& entities) const
 {
-    Category& log=Category::getInstance(SAML_LOGCAT".MetadataFilter."ENTITYROLE_METADATA_FILTER);
+    Category& log=Category::getInstance(SAML_LOGCAT ".MetadataFilter." ENTITYROLE_METADATA_FILTER);
 
     VectorOf(EntityDescriptor) v = entities.getEntityDescriptors();
     for (VectorOf(EntityDescriptor)::size_type i = 0; i < v.size(); ) {

diff --git a/saml/saml2/metadata/impl/FolderMetadataProvider.cpp b/saml/saml2/metadata/impl/FolderMetadataProvider.cpp
index a6b61e3..425b5ff 100644 (file)
--- a/saml/saml2/metadata/impl/FolderMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/FolderMetadataProvider.cpp
@@ -87,7 +87,7 @@ namespace opensaml {
             if (e->hasAttributeNS(nullptr, precedence))
                 root->setAttributeNS(nullptr, precedence, e->getAttributeNS(nullptr, precedence));
 
-            Category& log = Category::getInstance(SAML_LOGCAT".Metadata.Folder");
+            Category& log = Category::getInstance(SAML_LOGCAT ".Metadata.Folder");
             log.info("loading metadata files from folder (%s)", loc.c_str());
 
 #ifdef WIN32

diff --git a/saml/saml2/metadata/impl/MetadataProvider.cpp b/saml/saml2/metadata/impl/MetadataProvider.cpp
index 33c852c..efb923a 100644 (file)
--- a/saml/saml2/metadata/impl/MetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/MetadataProvider.cpp
@@ -96,7 +96,7 @@ MetadataProvider::MetadataProvider(const DOMElement* e) : m_filterContext(nullpt
 #ifdef _DEBUG
     NDC ndc("MetadataProvider");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".Metadata");
+    Category& log = Category::getInstance(SAML_LOGCAT ".Metadata");
     SAMLConfig& conf = SAMLConfig::getConfig();
 
     // Locate any default recognized filters and plugins.
@@ -174,7 +174,7 @@ void MetadataProvider::setContext(const MetadataFilterContext* ctx)
 
 void MetadataProvider::doFilters(XMLObject& xmlObject) const
 {
-    Category& log = Category::getInstance(SAML_LOGCAT".Metadata");
+    Category& log = Category::getInstance(SAML_LOGCAT ".Metadata");
     for (ptr_vector<MetadataFilter>::const_iterator i = m_filters.begin(); i != m_filters.end(); i++) {
         log.info("applying metadata filter (%s)", i->getId());
         i->doFilter(m_filterContext, xmlObject);

diff --git a/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp b/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp
index da3e787..e87ba5e 100644 (file)
--- a/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp
+++ b/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp
@@ -90,7 +90,7 @@ static const XMLCh verifyName[] =           UNICODE_LITERAL_10(v,e,r,i,f,y,N,a,m
 SignatureMetadataFilter::SignatureMetadataFilter(const DOMElement* e)
     : m_verifyRoles(XMLHelper::getAttrBool(e, false, verifyRoles)),
         m_verifyName(XMLHelper::getAttrBool(e, true, verifyName)),
-        m_log(Category::getInstance(SAML_LOGCAT".MetadataFilter.Signature"))
+        m_log(Category::getInstance(SAML_LOGCAT ".MetadataFilter.Signature"))
 {
     if (e && e->hasAttributeNS(nullptr,certificate)) {
         // Use a file-based credential resolver rooted here.

diff --git a/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp b/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp
index 016745d..dd98063 100644 (file)
--- a/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp
+++ b/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp
@@ -97,17 +97,17 @@ void WhitelistMetadataFilter::doFilter(XMLObject& xmlObject) const
         EntityDescriptor* entity = dynamic_cast<EntityDescriptor*>(&xmlObject);
         if (entity) {
             if (!included(*entity))
-                throw MetadataFilterException(WHITELIST_METADATA_FILTER" MetadataFilter instructed to filter the root/only entity in the metadata.");
+                throw MetadataFilterException(WHITELIST_METADATA_FILTER " MetadataFilter instructed to filter the root/only entity in the metadata.");
         }
         else {
-            throw MetadataFilterException(WHITELIST_METADATA_FILTER" MetadataFilter was given an improper metadata instance to filter.");
+            throw MetadataFilterException(WHITELIST_METADATA_FILTER " MetadataFilter was given an improper metadata instance to filter.");
         }
     }
 }
 
 void WhitelistMetadataFilter::filterGroup(EntitiesDescriptor* entities) const
 {
-    Category& log = Category::getInstance(SAML_LOGCAT".MetadataFilter."WHITELIST_METADATA_FILTER);
+    Category& log = Category::getInstance(SAML_LOGCAT ".MetadataFilter." WHITELIST_METADATA_FILTER);
 
     VectorOf(EntityDescriptor) v = entities->getEntityDescriptors();
     for (VectorOf(EntityDescriptor)::size_type i = 0; i < v.size(); ) {

diff --git a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
index 00c4a0c..6986b9d 100644 (file)
--- a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
@@ -140,7 +140,7 @@ namespace opensaml {
 
 XMLMetadataProvider::XMLMetadataProvider(const DOMElement* e)
     : MetadataProvider(e), AbstractMetadataProvider(e), DiscoverableMetadataProvider(e),
-        ReloadableXMLFile(e, Category::getInstance(SAML_LOGCAT".MetadataProvider.XML"), false),
+        ReloadableXMLFile(e, Category::getInstance(SAML_LOGCAT ".MetadataProvider.XML"), false),
         m_discoveryFeed(XMLHelper::getAttrBool(e, true, discoveryFeed)),
         m_dropDOM(XMLHelper::getAttrBool(e, true, dropDOM)),
         m_refreshDelayFactor(0.75), m_backoffFactor(1),

diff --git a/saml/saml2/profile/impl/Assertion20Validator.cpp b/saml/saml2/profile/impl/Assertion20Validator.cpp
index 1a2a1a3..a1e0599 100644 (file)
--- a/saml/saml2/profile/impl/Assertion20Validator.cpp
+++ b/saml/saml2/profile/impl/Assertion20Validator.cpp
@@ -92,7 +92,7 @@ void AssertionValidator::validateCondition(const Condition* c) const
 {
     const AudienceRestriction* ac=dynamic_cast<const AudienceRestriction*>(c);
     if (!ac) {
-        Category::getInstance(SAML_LOGCAT".AssertionValidator").error("unrecognized Condition in assertion (%s)",
+        Category::getInstance(SAML_LOGCAT ".AssertionValidator").error("unrecognized Condition in assertion (%s)",
             c->getSchemaType() ? c->getSchemaType()->toString().c_str() : c->getElementQName().toString().c_str());
         throw ValidationException("Assertion contains an unrecognized condition.");
     }
@@ -113,7 +113,7 @@ void AssertionValidator::validateCondition(const Condition* c) const
     if (!found) {
         ostringstream os;
         os << *ac;
-        Category::getInstance(SAML_LOGCAT".AssertionValidator").error("unacceptable AudienceRestriction in assertion (%s)", os.str().c_str());
+        Category::getInstance(SAML_LOGCAT ".AssertionValidator").error("unacceptable AudienceRestriction in assertion (%s)", os.str().c_str());
         throw ValidationException("Assertion contains an unacceptable AudienceRestriction.");
     }
 }

diff --git a/saml/saml2/profile/impl/BearerConfirmationRule.cpp b/saml/saml2/profile/impl/BearerConfirmationRule.cpp
index 1649130..cc771a0 100644 (file)
--- a/saml/saml2/profile/impl/BearerConfirmationRule.cpp
+++ b/saml/saml2/profile/impl/BearerConfirmationRule.cpp
@@ -84,7 +84,7 @@ bool BearerConfirmationRule::evaluate(const XMLObject& message, const GenericReq
     if (!a)
         return false;
 
-    logging::Category& log = logging::Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.BearerConfirmation");
+    logging::Category& log = logging::Category::getInstance(SAML_LOGCAT ".SecurityPolicyRule.BearerConfirmation");
 
     const char* msg="assertion is missing bearer SubjectConfirmation";
     const Subject* subject = a->getSubject();

diff --git a/saml/saml2/profile/impl/BrowserSSOProfile20Validator.cpp b/saml/saml2/profile/impl/BrowserSSOProfile20Validator.cpp
index 9a5d8de..0869567 100644 (file)
--- a/saml/saml2/profile/impl/BrowserSSOProfile20Validator.cpp
+++ b/saml/saml2/profile/impl/BrowserSSOProfile20Validator.cpp
@@ -56,7 +56,7 @@ void BrowserSSOProfileValidator::validateAssertion(const Assertion& assertion) c
 #ifdef _DEBUG
     xmltooling::NDC ndc("validate");
 #endif
-    Category& log = Category::getInstance(SAML_LOGCAT".AssertionValidator");
+    Category& log = Category::getInstance(SAML_LOGCAT ".AssertionValidator");
 
     // The assertion MUST have proper confirmation requirements.
     const char* msg="assertion is missing bearer SubjectConfirmation";

diff --git a/saml/saml2/profile/impl/DelegationRestrictionRule.cpp b/saml/saml2/profile/impl/DelegationRestrictionRule.cpp
index 66e92a7..2faf209 100644 (file)
--- a/saml/saml2/profile/impl/DelegationRestrictionRule.cpp
+++ b/saml/saml2/profile/impl/DelegationRestrictionRule.cpp
@@ -96,7 +96,7 @@ namespace opensaml {
             // d1 is the input from the message, d2 is from the policy
             bool operator()(const Delegate* d1, const Delegate& d2) const {
                 if (!d1->getNameID()) {
-                    Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.DelegationRestriction").error(
+                    Category::getInstance(SAML_LOGCAT ".SecurityPolicyRule.DelegationRestriction").error(
                         "rule doesn't support evaluation of BaseID or EncryptedID in a Delegate"
                         );
                     return false;

diff --git a/saml/signature/SignatureProfileValidator.cpp b/saml/signature/SignatureProfileValidator.cpp
index 76623a1..36812e1 100644 (file)
--- a/saml/signature/SignatureProfileValidator.cpp
+++ b/saml/signature/SignatureProfileValidator.cpp
@@ -70,7 +70,7 @@ void SignatureProfileValidator::validateSignature(const Signature& sigObj) const
         throw ValidationException("Signature is not a child of a signable SAML object.");
 
     if (sig->getObjectLength() != 0) {
-        Category::getInstance(SAML_LOGCAT".SignatureProfileValidator").error("signature contained an embedded <Object> element");
+        Category::getInstance(SAML_LOGCAT ".SignatureProfileValidator").error("signature contained an embedded <Object> element");
         throw ValidationException("Invalid signature profile for SAML object.");
     }
 
@@ -92,7 +92,7 @@ void SignatureProfileValidator::validateSignature(const Signature& sigObj) const
                         else if (tlist->item(i)->getTransformType()!=TRANSFORM_EXC_C14N &&
                                  tlist->item(i)->getTransformType()!=TRANSFORM_C14N) {
                             valid=false;
-                            Category::getInstance(SAML_LOGCAT".SignatureProfileValidator").error("signature contained an invalid transform");
+                            Category::getInstance(SAML_LOGCAT ".SignatureProfileValidator").error("signature contained an invalid transform");
                             break;
                         }
                     }
@@ -106,18 +106,18 @@ void SignatureProfileValidator::validateSignature(const Signature& sigObj) const
                             valid = true;
                         }
                         else {
-                            Category::getInstance(SAML_LOGCAT".SignatureProfileValidator").error("signature reference does not match parent object node");
+                            Category::getInstance(SAML_LOGCAT ".SignatureProfileValidator").error("signature reference does not match parent object node");
                         }
                     }
                 }
             }
             else {
-                Category::getInstance(SAML_LOGCAT".SignatureProfileValidator").error("signature reference does not match parent object ID");
+                Category::getInstance(SAML_LOGCAT ".SignatureProfileValidator").error("signature reference does not match parent object ID");
             }
         }
     }
     else {
-        Category::getInstance(SAML_LOGCAT".SignatureProfileValidator").error("signature contained multiple or zero references");
+        Category::getInstance(SAML_LOGCAT ".SignatureProfileValidator").error("signature contained multiple or zero references");
     }
     
     if (!valid)