Removed unnecessary class from string literals.

diff --git a/saml/binding/impl/MessageDecoder.cpp b/saml/binding/impl/MessageDecoder.cpp
index 744c8f2..ffcd27b 100644 (file)
--- a/saml/binding/impl/MessageDecoder.cpp
+++ b/saml/binding/impl/MessageDecoder.cpp
@@ -22,7 +22,7 @@
 
 #include "internal.h"
 #include "binding/MessageDecoder.h"
 
 #include "internal.h"
 #include "binding/MessageDecoder.h"

-#include "util/SAMLConstants.h"
+#include "util/samlconstants.h"

 
 using namespace opensaml;
 using namespace xmltooling;
 
 using namespace opensaml;
 using namespace xmltooling;


@@ -42,8 +42,8 @@ namespace opensaml {
 void SAML_API opensaml::registerMessageDecoders()
 {
     SAMLConfig& conf=SAMLConfig::getConfig();
 void SAML_API opensaml::registerMessageDecoders()
 {
     SAMLConfig& conf=SAMLConfig::getConfig();

-    conf.MessageDecoderManager.registerFactory(SAMLConstants::SAML1_PROFILE_BROWSER_ARTIFACT, saml1p::SAML1ArtifactDecoderFactory);
-    conf.MessageDecoderManager.registerFactory(SAMLConstants::SAML1_PROFILE_BROWSER_POST, saml1p::SAML1POSTDecoderFactory);
-    conf.MessageDecoderManager.registerFactory(SAMLConstants::SAML20_BINDING_HTTP_ARTIFACT, saml2p::SAML2ArtifactDecoderFactory);
-    conf.MessageDecoderManager.registerFactory(SAMLConstants::SAML20_BINDING_HTTP_POST, saml2p::SAML2POSTDecoderFactory);
+    conf.MessageDecoderManager.registerFactory(samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, saml1p::SAML1ArtifactDecoderFactory);
+    conf.MessageDecoderManager.registerFactory(samlconstants::SAML1_PROFILE_BROWSER_POST, saml1p::SAML1POSTDecoderFactory);
+    conf.MessageDecoderManager.registerFactory(samlconstants::SAML20_BINDING_HTTP_ARTIFACT, saml2p::SAML2ArtifactDecoderFactory);
+    conf.MessageDecoderManager.registerFactory(samlconstants::SAML20_BINDING_HTTP_POST, saml2p::SAML2POSTDecoderFactory);

 }
 }

diff --git a/saml/binding/impl/MessageEncoder.cpp b/saml/binding/impl/MessageEncoder.cpp
index 53880b5..16ca166 100644 (file)
--- a/saml/binding/impl/MessageEncoder.cpp
+++ b/saml/binding/impl/MessageEncoder.cpp
@@ -22,7 +22,7 @@
 
 #include "internal.h"
 #include "binding/MessageEncoder.h"
 
 #include "internal.h"
 #include "binding/MessageEncoder.h"

-#include "util/SAMLConstants.h"
+#include "util/samlconstants.h"

 
 #include <xmltooling/signature/KeyInfo.h>
 #include <xmltooling/signature/Signature.h>
 
 #include <xmltooling/signature/KeyInfo.h>
 #include <xmltooling/signature/Signature.h>


@@ -47,10 +47,10 @@ namespace opensaml {
 void SAML_API opensaml::registerMessageEncoders()
 {
     SAMLConfig& conf=SAMLConfig::getConfig();
 void SAML_API opensaml::registerMessageEncoders()
 {
     SAMLConfig& conf=SAMLConfig::getConfig();

-    conf.MessageEncoderManager.registerFactory(SAMLConstants::SAML1_PROFILE_BROWSER_ARTIFACT, saml1p::SAML1ArtifactEncoderFactory);
-    conf.MessageEncoderManager.registerFactory(SAMLConstants::SAML1_PROFILE_BROWSER_POST, saml1p::SAML1POSTEncoderFactory);
-    conf.MessageEncoderManager.registerFactory(SAMLConstants::SAML20_BINDING_HTTP_ARTIFACT, saml2p::SAML2ArtifactEncoderFactory);
-    conf.MessageEncoderManager.registerFactory(SAMLConstants::SAML20_BINDING_HTTP_POST, saml2p::SAML2POSTEncoderFactory);
+    conf.MessageEncoderManager.registerFactory(samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, saml1p::SAML1ArtifactEncoderFactory);
+    conf.MessageEncoderManager.registerFactory(samlconstants::SAML1_PROFILE_BROWSER_POST, saml1p::SAML1POSTEncoderFactory);
+    conf.MessageEncoderManager.registerFactory(samlconstants::SAML20_BINDING_HTTP_ARTIFACT, saml2p::SAML2ArtifactEncoderFactory);
+    conf.MessageEncoderManager.registerFactory(samlconstants::SAML20_BINDING_HTTP_POST, saml2p::SAML2POSTEncoderFactory);

 }
 
 namespace {
 }
 
 namespace {

diff --git a/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp b/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp
index 24b8423..5e679f5 100644 (file)
--- a/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1ArtifactDecoder.cpp
@@ -130,9 +130,9 @@ Response* SAML1ArtifactDecoder::decode(
     }
     
     log.debug("attempting to find artifact issuing role...");
     }
     
     log.debug("attempting to find artifact issuing role...");

-    issuer=provider->getRoleDescriptor(*role, SAMLConstants::SAML11_PROTOCOL_ENUM);
+    issuer=provider->getRoleDescriptor(*role, samlconstants::SAML11_PROTOCOL_ENUM);

     if (!issuer)
     if (!issuer)

-        issuer=provider->getRoleDescriptor(*role, SAMLConstants::SAML10_PROTOCOL_ENUM);
+        issuer=provider->getRoleDescriptor(*role, samlconstants::SAML10_PROTOCOL_ENUM);

     if (!issuer || !dynamic_cast<const IDPSSODescriptor*>(issuer)) {
         log.error("unable to find compatible SAML role (%s) in metadata", role->toString().c_str());
         for_each(artifacts.begin(), artifacts.end(), xmltooling::cleanup<SAMLArtifact>());
     if (!issuer || !dynamic_cast<const IDPSSODescriptor*>(issuer)) {
         log.error("unable to find compatible SAML role (%s) in metadata", role->toString().c_str());
         for_each(artifacts.begin(), artifacts.end(), xmltooling::cleanup<SAMLArtifact>());

diff --git a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
index e4f01dd..52c3d0e 100644 (file)
--- a/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1POSTDecoder.cpp
@@ -151,7 +151,7 @@ Response* SAML1POSTDecoder::decode(
                 pair<bool,int> minor = response->getMinorVersion();
                 issuer=provider->getRoleDescriptor(
                     *role,
                 pair<bool,int> minor = response->getMinorVersion();
                 issuer=provider->getRoleDescriptor(
                     *role,

-                    (minor.first && minor.second==0) ? SAMLConstants::SAML10_PROTOCOL_ENUM : SAMLConstants::SAML11_PROTOCOL_ENUM
+                    (minor.first && minor.second==0) ? samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM

                     );
                 if (issuer) {
                     if (trustEngine && response->getSignature()) {
                     );
                 if (issuer) {
                     if (trustEngine && response->getSignature()) {


@@ -205,7 +205,7 @@ Response* SAML1POSTDecoder::decode(
             pair<bool,int> minor = response->getMinorVersion();
             issuer=provider->getRoleDescriptor(
                 *role,
             pair<bool,int> minor = response->getMinorVersion();
             issuer=provider->getRoleDescriptor(
                 *role,

-                (minor.first && minor.second==0) ? SAMLConstants::SAML10_PROTOCOL_ENUM : SAMLConstants::SAML11_PROTOCOL_ENUM
+                (minor.first && minor.second==0) ? samlconstants::SAML10_PROTOCOL_ENUM : samlconstants::SAML11_PROTOCOL_ENUM

                 );
         }
         if (issuer) annotateException(&ex,issuer); // throws it
                 );
         }
         if (issuer) annotateException(&ex,issuer); // throws it

diff --git a/saml/saml1/core/Assertions.h b/saml/saml1/core/Assertions.h
index 8f0ea55..b4cf753 100644 (file)
--- a/saml/saml1/core/Assertions.h
+++ b/saml/saml1/core/Assertions.h
@@ -34,7 +34,7 @@
 #include <xmltooling/util/DateTime.h>
 
 #define DECL_SAML1OBJECTBUILDER(cname) \
 #include <xmltooling/util/DateTime.h>
 
 #define DECL_SAML1OBJECTBUILDER(cname) \

-    DECL_XMLOBJECTBUILDER(SAML_API,cname,opensaml::SAMLConstants::SAML1_NS,opensaml::SAMLConstants::SAML1_PREFIX)
+    DECL_XMLOBJECTBUILDER(SAML_API,cname,samlconstants::SAML1_NS,samlconstants::SAML1_PREFIX)

 
 namespace opensaml {
 
 
 namespace opensaml {
 

diff --git a/saml/saml1/core/Protocols.h b/saml/saml1/core/Protocols.h
index bf22e15..074edea 100644 (file)
--- a/saml/saml1/core/Protocols.h
+++ b/saml/saml1/core/Protocols.h
@@ -34,7 +34,7 @@
 #include <xmltooling/util/DateTime.h>
 
 #define DECL_SAML1POBJECTBUILDER(cname) \
 #include <xmltooling/util/DateTime.h>
 
 #define DECL_SAML1POBJECTBUILDER(cname) \

-    DECL_XMLOBJECTBUILDER(SAML_API,cname,opensaml::SAMLConstants::SAML1P_NS,opensaml::SAMLConstants::SAML1P_PREFIX)
+    DECL_XMLOBJECTBUILDER(SAML_API,cname,samlconstants::SAML1P_NS,samlconstants::SAML1P_PREFIX)

 
 namespace opensaml {
 
 
 namespace opensaml {
 

diff --git a/saml/saml1/core/impl/AssertionsImpl.cpp b/saml/saml1/core/impl/AssertionsImpl.cpp
index 1378de8..6d6bb1c 100644 (file)
--- a/saml/saml1/core/impl/AssertionsImpl.cpp
+++ b/saml/saml1/core/impl/AssertionsImpl.cpp
@@ -41,6 +41,9 @@ using namespace opensaml;
 using namespace xmlsignature;
 using namespace xmltooling;
 using namespace std;
 using namespace xmlsignature;
 using namespace xmltooling;
 using namespace std;

+using xmlconstants::XMLSIG_NS;
+using xmlconstants::XML_ONE;
+using samlconstants::SAML1_NS;

 
 #if defined (_MSC_VER)
     #pragma warning( push )
 
 #if defined (_MSC_VER)
     #pragma warning( push )


@@ -85,7 +88,7 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(Audience,SAMLConstants::SAML1_NS,false);
+                PROC_TYPED_CHILDREN(Audience,SAML1_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -177,9 +180,9 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AudienceRestrictionCondition,SAMLConstants::SAML1_NS,true);
-                PROC_TYPED_CHILDREN(DoNotCacheCondition,SAMLConstants::SAML1_NS,true);
-                PROC_TYPED_CHILDREN(Condition,SAMLConstants::SAML1_NS,true);
+                PROC_TYPED_CHILDREN(AudienceRestrictionCondition,SAML1_NS,true);
+                PROC_TYPED_CHILDREN(DoNotCacheCondition,SAML1_NS,true);
+                PROC_TYPED_CHILDREN(Condition,SAML1_NS,true);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     


@@ -294,8 +297,8 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(ConfirmationMethod,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILD(KeyInfo,XMLConstants::XMLSIG_NS,false);
+                PROC_TYPED_CHILDREN(ConfirmationMethod,SAML1_NS,false);
+                PROC_TYPED_CHILD(KeyInfo,XMLSIG_NS,false);

                 
                 // Anything else we'll assume is the data.
                 if (getSubjectConfirmationData())
                 
                 // Anything else we'll assume is the data.
                 if (getSubjectConfirmationData())


@@ -343,8 +346,8 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(NameIdentifier,SAMLConstants::SAML1_NS,true);
-                PROC_TYPED_CHILD(SubjectConfirmation,SAMLConstants::SAML1_NS,true);
+                PROC_TYPED_CHILD(NameIdentifier,SAML1_NS,true);
+                PROC_TYPED_CHILD(SubjectConfirmation,SAML1_NS,true);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -383,7 +386,7 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Subject,SAMLConstants::SAML1_NS,true);
+                PROC_TYPED_CHILD(Subject,SAML1_NS,true);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -538,8 +541,8 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(SubjectLocality,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILDREN(AuthorityBinding,SAMLConstants::SAML1_NS,false);
+                PROC_TYPED_CHILD(SubjectLocality,SAML1_NS,false);
+                PROC_TYPED_CHILDREN(AuthorityBinding,SAML1_NS,false);

                 SubjectStatementImpl::processChildElement(childXMLObject,root);
             }
     
                 SubjectStatementImpl::processChildElement(childXMLObject,root);
             }
     


@@ -620,8 +623,8 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AssertionIDReference,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILDREN(Assertion,SAMLConstants::SAML1_NS,true);
+                PROC_TYPED_CHILDREN(AssertionIDReference,SAML1_NS,false);
+                PROC_TYPED_CHILDREN(Assertion,SAML1_NS,true);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -684,8 +687,8 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Evidence,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILDREN(Action,SAMLConstants::SAML1_NS,false);
+                PROC_TYPED_CHILD(Evidence,SAML1_NS,false);
+                PROC_TYPED_CHILDREN(Action,SAML1_NS,false);

                 SubjectStatementImpl::processChildElement(childXMLObject,root);
             }
     
                 SubjectStatementImpl::processChildElement(childXMLObject,root);
             }
     


@@ -842,7 +845,7 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(Attribute,SAMLConstants::SAML1_NS,true);
+                PROC_TYPED_CHILDREN(Attribute,SAML1_NS,true);

                 SubjectStatementImpl::processChildElement(childXMLObject,root);
             }
         };
                 SubjectStatementImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -888,12 +891,12 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AssertionIDReference,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILDREN(Assertion,SAMLConstants::SAML1_NS,true);
+                PROC_TYPED_CHILDREN(AssertionIDReference,SAML1_NS,false);
+                PROC_TYPED_CHILDREN(Assertion,SAML1_NS,true);

                 
                 // Unknown child.
                 const XMLCh* nsURI=root->getNamespaceURI();
                 
                 // Unknown child.
                 const XMLCh* nsURI=root->getNamespaceURI();

-                if (!XMLString::equals(nsURI,SAMLConstants::SAML1_NS) && nsURI && *nsURI) {
+                if (!XMLString::equals(nsURI,SAML1_NS) && nsURI && *nsURI) {

                     getOthers().push_back(childXMLObject);
                     return;
                 }
                     getOthers().push_back(childXMLObject);
                     return;
                 }


@@ -1024,9 +1027,9 @@ namespace opensaml {
         protected:
             void marshallAttributes(DOMElement* domElement) const {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);
         protected:
             void marshallAttributes(DOMElement* domElement) const {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);

-                domElement->setAttributeNS(NULL,MAJORVERSION,XMLConstants::XML_ONE);
+                domElement->setAttributeNS(NULL,MAJORVERSION,XML_ONE);

                 if (!m_MinorVersion)
                 if (!m_MinorVersion)

-                    const_cast<AssertionImpl*>(this)->m_MinorVersion=XMLString::replicate(XMLConstants::XML_ONE);
+                    const_cast<AssertionImpl*>(this)->m_MinorVersion=XMLString::replicate(XML_ONE);

                 MARSHALL_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);
                 if (!m_AssertionID)
                     const_cast<AssertionImpl*>(this)->m_AssertionID=SAMLConfig::getConfig().generateIdentifier();
                 MARSHALL_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);
                 if (!m_AssertionID)
                     const_cast<AssertionImpl*>(this)->m_AssertionID=SAMLConfig::getConfig().generateIdentifier();


@@ -1040,21 +1043,21 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Conditions,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILD(Advice,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILD(Signature,XMLConstants::XMLSIG_NS,false);
-                PROC_TYPED_CHILDREN(AuthenticationStatement,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILDREN(AttributeStatement,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILDREN(AuthorizationDecisionStatement,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILDREN(SubjectStatement,SAMLConstants::SAML1_NS,true);
-                PROC_TYPED_CHILDREN(Statement,SAMLConstants::SAML1_NS,true);
+                PROC_TYPED_CHILD(Conditions,SAML1_NS,false);
+                PROC_TYPED_CHILD(Advice,SAML1_NS,false);
+                PROC_TYPED_CHILD(Signature,XMLSIG_NS,false);
+                PROC_TYPED_CHILDREN(AuthenticationStatement,SAML1_NS,false);
+                PROC_TYPED_CHILDREN(AttributeStatement,SAML1_NS,false);
+                PROC_TYPED_CHILDREN(AuthorizationDecisionStatement,SAML1_NS,false);
+                PROC_TYPED_CHILDREN(SubjectStatement,SAML1_NS,true);
+                PROC_TYPED_CHILDREN(Statement,SAML1_NS,true);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     
             void processAttribute(const DOMAttr* attribute) {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);
                 if (XMLHelper::isNodeNamed(attribute,NULL,MAJORVERSION)) {
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     
             void processAttribute(const DOMAttr* attribute) {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);
                 if (XMLHelper::isNodeNamed(attribute,NULL,MAJORVERSION)) {

-                    if (!XMLString::equals(attribute->getValue(),XMLConstants::XML_ONE))
+                    if (!XMLString::equals(attribute->getValue(),XML_ONE))

                         throw UnmarshallingException("Assertion has invalid major version.");
                 }
                 PROC_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);
                         throw UnmarshallingException("Assertion has invalid major version.");
                 }
                 PROC_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);

diff --git a/saml/saml1/core/impl/AssertionsSchemaValidators.cpp b/saml/saml1/core/impl/AssertionsSchemaValidators.cpp
index ca8c002..2c48041 100644 (file)
--- a/saml/saml1/core/impl/AssertionsSchemaValidators.cpp
+++ b/saml/saml1/core/impl/AssertionsSchemaValidators.cpp
@@ -30,6 +30,7 @@ using namespace opensaml::saml1;
 using namespace opensaml;
 using namespace xmltooling;
 using namespace std;
 using namespace opensaml;
 using namespace xmltooling;
 using namespace std;

+using samlconstants::SAML1_NS;

 
 namespace opensaml {
     namespace saml1 {
 
 namespace opensaml {
     namespace saml1 {


@@ -126,7 +127,7 @@ namespace opensaml {
         public:
             void operator()(const XMLObject* xmlObject) const {
                 const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();
         public:
             void operator()(const XMLObject* xmlObject) const {
                 const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();

-                if (XMLString::equals(ns,SAMLConstants::SAML1_NS) || !ns || !*ns) {
+                if (XMLString::equals(ns,SAML1_NS) || !ns || !*ns) {

                     throw ValidationException(
                         "Object contains an illegal extension child element ($1).",
                         params(1,xmlObject->getElementQName().toString().c_str())
                     throw ValidationException(
                         "Object contains an illegal extension child element ($1).",
                         params(1,xmlObject->getElementQName().toString().c_str())


@@ -144,21 +145,21 @@ namespace opensaml {
 };
 
 #define REGISTER_ELEMENT(cname) \
 };
 
 #define REGISTER_ELEMENT(cname) \

-    q=QName(SAMLConstants::SAML1_NS,cname::LOCAL_NAME); \
+    q=QName(SAML1_NS,cname::LOCAL_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(cname) \

-    q=QName(SAMLConstants::SAML1_NS,cname::TYPE_NAME); \
+    q=QName(SAML1_NS,cname::TYPE_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(cname) \

-    q=QName(SAMLConstants::SAML1_NS,cname::LOCAL_NAME); \
+    q=QName(SAML1_NS,cname::LOCAL_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
     
 #define REGISTER_TYPE_NOVAL(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
     
 #define REGISTER_TYPE_NOVAL(cname) \

-    q=QName(SAMLConstants::SAML1_NS,cname::TYPE_NAME); \
+    q=QName(SAML1_NS,cname::TYPE_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
 void opensaml::saml1::registerAssertionClasses() {
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
 void opensaml::saml1::registerAssertionClasses() {

diff --git a/saml/saml1/core/impl/ProtocolsImpl.cpp b/saml/saml1/core/impl/ProtocolsImpl.cpp
index 9ade57f..a823253 100644 (file)
--- a/saml/saml1/core/impl/ProtocolsImpl.cpp
+++ b/saml/saml1/core/impl/ProtocolsImpl.cpp
@@ -42,6 +42,11 @@ using namespace opensaml;
 using namespace xmlsignature;
 using namespace xmltooling;
 using namespace std;
 using namespace xmlsignature;
 using namespace xmltooling;
 using namespace std;

+using xmlconstants::XMLSIG_NS;
+using xmlconstants::XML_ONE;
+using samlconstants::SAML1P_NS;
+using samlconstants::SAML1_NS;
+using samlconstants::SAML1P_PREFIX;

 
 #if defined (_MSC_VER)
     #pragma warning( push )
 
 #if defined (_MSC_VER)
     #pragma warning( push )


@@ -126,7 +131,7 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Subject,SAMLConstants::SAML1_NS,true);
+                PROC_TYPED_CHILD(Subject,SAML1_NS,true);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -215,7 +220,7 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AttributeDesignator,SAMLConstants::SAML1_NS,true);
+                PROC_TYPED_CHILDREN(AttributeDesignator,SAML1_NS,true);

                 SubjectQueryImpl::processChildElement(childXMLObject,root);
             }
     
                 SubjectQueryImpl::processChildElement(childXMLObject,root);
             }
     


@@ -275,8 +280,8 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Evidence,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILDREN(Action,SAMLConstants::SAML1_NS,false);
+                PROC_TYPED_CHILD(Evidence,SAML1_NS,false);
+                PROC_TYPED_CHILDREN(Action,SAML1_NS,false);

                 SubjectQueryImpl::processChildElement(childXMLObject,root);
             }
     
                 SubjectQueryImpl::processChildElement(childXMLObject,root);
             }
     


@@ -362,9 +367,9 @@ namespace opensaml {
         protected:
             void marshallAttributes(DOMElement* domElement) const {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);
         protected:
             void marshallAttributes(DOMElement* domElement) const {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);

-                domElement->setAttributeNS(NULL,MAJORVERSION,XMLConstants::XML_ONE);
+                domElement->setAttributeNS(NULL,MAJORVERSION,XML_ONE);

                 if (!m_MinorVersion)
                 if (!m_MinorVersion)

-                    const_cast<RequestAbstractTypeImpl*>(this)->m_MinorVersion=XMLString::replicate(XMLConstants::XML_ONE);
+                    const_cast<RequestAbstractTypeImpl*>(this)->m_MinorVersion=XMLString::replicate(XML_ONE);

                 MARSHALL_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);
                 if (!m_RequestID)
                     const_cast<RequestAbstractTypeImpl*>(this)->m_RequestID=SAMLConfig::getConfig().generateIdentifier();
                 MARSHALL_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);
                 if (!m_RequestID)
                     const_cast<RequestAbstractTypeImpl*>(this)->m_RequestID=SAMLConfig::getConfig().generateIdentifier();


@@ -377,15 +382,15 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(RespondWith,SAMLConstants::SAML1P_NS,false);
-                PROC_TYPED_CHILD(Signature,XMLConstants::XMLSIG_NS,false);
+                PROC_TYPED_CHILDREN(RespondWith,SAML1P_NS,false);
+                PROC_TYPED_CHILD(Signature,XMLSIG_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
             void processAttribute(const DOMAttr* attribute) {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);
                 if (XMLHelper::isNodeNamed(attribute,NULL,MAJORVERSION)) {
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
             void processAttribute(const DOMAttr* attribute) {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);
                 if (XMLHelper::isNodeNamed(attribute,NULL,MAJORVERSION)) {

-                    if (!XMLString::equals(attribute->getValue(),XMLConstants::XML_ONE))
+                    if (!XMLString::equals(attribute->getValue(),XML_ONE))

                         throw UnmarshallingException("Request has invalid major version.");
                 }
                 PROC_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);
                         throw UnmarshallingException("Request has invalid major version.");
                 }
                 PROC_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);


@@ -465,9 +470,9 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Query,SAMLConstants::SAML1P_NS,true);
-                PROC_TYPED_CHILDREN(AssertionIDReference,SAMLConstants::SAML1_NS,false);
-                PROC_TYPED_CHILDREN(AssertionArtifact,SAMLConstants::SAML1P_NS,false);
+                PROC_TYPED_CHILD(Query,SAML1P_NS,true);
+                PROC_TYPED_CHILDREN(AssertionIDReference,SAML1_NS,false);
+                PROC_TYPED_CHILDREN(AssertionArtifact,SAML1P_NS,false);

                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -512,7 +517,7 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(StatusCode,SAMLConstants::SAML1P_NS,true);
+                PROC_TYPED_CHILD(StatusCode,SAML1P_NS,true);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -598,9 +603,9 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(StatusCode,SAMLConstants::SAML1P_NS,false);
-                PROC_TYPED_CHILD(StatusMessage,SAMLConstants::SAML1P_NS,false);
-                PROC_TYPED_CHILD(StatusDetail,SAMLConstants::SAML1P_NS,false);
+                PROC_TYPED_CHILD(StatusCode,SAML1P_NS,false);
+                PROC_TYPED_CHILD(StatusMessage,SAML1P_NS,false);
+                PROC_TYPED_CHILD(StatusDetail,SAML1P_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -682,9 +687,9 @@ namespace opensaml {
         protected:
             void marshallAttributes(DOMElement* domElement) const {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);
         protected:
             void marshallAttributes(DOMElement* domElement) const {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);

-                domElement->setAttributeNS(NULL,MAJORVERSION,XMLConstants::XML_ONE);
+                domElement->setAttributeNS(NULL,MAJORVERSION,XML_ONE);

                 if (!m_MinorVersion)
                 if (!m_MinorVersion)

-                    const_cast<ResponseAbstractTypeImpl*>(this)->m_MinorVersion=XMLString::replicate(XMLConstants::XML_ONE);
+                    const_cast<ResponseAbstractTypeImpl*>(this)->m_MinorVersion=XMLString::replicate(XML_ONE);

                 MARSHALL_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);
                 if (!m_ResponseID)
                     const_cast<ResponseAbstractTypeImpl*>(this)->m_ResponseID=SAMLConfig::getConfig().generateIdentifier();
                 MARSHALL_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);
                 if (!m_ResponseID)
                     const_cast<ResponseAbstractTypeImpl*>(this)->m_ResponseID=SAMLConfig::getConfig().generateIdentifier();


@@ -699,14 +704,14 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Signature,XMLConstants::XMLSIG_NS,false);
+                PROC_TYPED_CHILD(Signature,XMLSIG_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
             void processAttribute(const DOMAttr* attribute) {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);
                 if (XMLHelper::isNodeNamed(attribute,NULL,MAJORVERSION)) {
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
             void processAttribute(const DOMAttr* attribute) {
                 static const XMLCh MAJORVERSION[] = UNICODE_LITERAL_12(M,a,j,o,r,V,e,r,s,i,o,n);
                 if (XMLHelper::isNodeNamed(attribute,NULL,MAJORVERSION)) {

-                    if (!XMLString::equals(attribute->getValue(),XMLConstants::XML_ONE))
+                    if (!XMLString::equals(attribute->getValue(),XML_ONE))

                         throw UnmarshallingException("Response has invalid major version.");
                 }
                 PROC_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);
                         throw UnmarshallingException("Response has invalid major version.");
                 }
                 PROC_INTEGER_ATTRIB(MinorVersion,MINORVERSION,NULL);


@@ -754,8 +759,8 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Status,SAMLConstants::SAML1P_NS,false);
-                PROC_TYPED_CHILDREN(Assertion,SAMLConstants::SAML1_NS,true);
+                PROC_TYPED_CHILD(Status,SAML1P_NS,false);
+                PROC_TYPED_CHILDREN(Assertion,SAML1_NS,true);

                 ResponseAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 ResponseAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -828,7 +833,7 @@ const XMLCh _REQUESTER[] =                                  UNICODE_LITERAL_9(R,
 const XMLCh _RESPONDER[] =                                  UNICODE_LITERAL_9(R,e,s,p,o,n,d,e,r);
 const XMLCh _VERSIONMISMATCH[] =                            UNICODE_LITERAL_15(V,e,r,s,i,o,n,M,i,s,m,a,t,c,h);
  
 const XMLCh _RESPONDER[] =                                  UNICODE_LITERAL_9(R,e,s,p,o,n,d,e,r);
 const XMLCh _VERSIONMISMATCH[] =                            UNICODE_LITERAL_15(V,e,r,s,i,o,n,M,i,s,m,a,t,c,h);
  

-QName StatusCode::SUCCESS(SAMLConstants::SAML1P_NS,_SUCCESS,SAMLConstants::SAML1P_PREFIX);
-QName StatusCode::REQUESTER(SAMLConstants::SAML1P_NS,_REQUESTER,SAMLConstants::SAML1P_PREFIX);
-QName StatusCode::RESPONDER(SAMLConstants::SAML1P_NS,_RESPONDER,SAMLConstants::SAML1P_PREFIX);
-QName StatusCode::VERSIONMISMATCH(SAMLConstants::SAML1P_NS,_VERSIONMISMATCH,SAMLConstants::SAML1P_PREFIX);
+QName StatusCode::SUCCESS(SAML1P_NS,_SUCCESS,SAML1P_PREFIX);
+QName StatusCode::REQUESTER(SAML1P_NS,_REQUESTER,SAML1P_PREFIX);
+QName StatusCode::RESPONDER(SAML1P_NS,_RESPONDER,SAML1P_PREFIX);
+QName StatusCode::VERSIONMISMATCH(SAML1P_NS,_VERSIONMISMATCH,SAML1P_PREFIX);

diff --git a/saml/saml1/core/impl/ProtocolsSchemaValidators.cpp b/saml/saml1/core/impl/ProtocolsSchemaValidators.cpp
index 06f0b2b..260b528 100644 (file)
--- a/saml/saml1/core/impl/ProtocolsSchemaValidators.cpp
+++ b/saml/saml1/core/impl/ProtocolsSchemaValidators.cpp
@@ -31,6 +31,7 @@ using namespace opensaml::saml1;
 using namespace opensaml;
 using namespace xmltooling;
 using namespace std;
 using namespace opensaml;
 using namespace xmltooling;
 using namespace std;

+using samlconstants::SAML1P_NS;

 
 namespace opensaml {
     namespace saml1p {
 
 namespace opensaml {
     namespace saml1p {


@@ -98,21 +99,21 @@ namespace opensaml {
 };
 
 #define REGISTER_ELEMENT(cname) \
 };
 
 #define REGISTER_ELEMENT(cname) \

-    q=QName(SAMLConstants::SAML1P_NS,cname::LOCAL_NAME); \
+    q=QName(SAML1P_NS,cname::LOCAL_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(cname) \

-    q=QName(SAMLConstants::SAML1P_NS,cname::TYPE_NAME); \
+    q=QName(SAML1P_NS,cname::TYPE_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(cname) \

-    q=QName(SAMLConstants::SAML1P_NS,cname::LOCAL_NAME); \
+    q=QName(SAML1P_NS,cname::LOCAL_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
     
 #define REGISTER_TYPE_NOVAL(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
     
 #define REGISTER_TYPE_NOVAL(cname) \

-    q=QName(SAMLConstants::SAML1P_NS,cname::TYPE_NAME); \
+    q=QName(SAML1P_NS,cname::TYPE_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
 void opensaml::saml1p::registerProtocolClasses() {
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
 void opensaml::saml1p::registerProtocolClasses() {

diff --git a/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp b/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp
index d484b2f..5ba166e 100644 (file)
--- a/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2ArtifactDecoder.cpp
@@ -130,7 +130,7 @@ XMLObject* SAML2ArtifactDecoder::decode(
     }
     
     log.debug("attempting to find artifact issuing role...");
     }
     
     log.debug("attempting to find artifact issuing role...");

-    issuer=provider->getRoleDescriptor(*role, SAMLConstants::SAML20P_NS);
+    issuer=provider->getRoleDescriptor(*role, samlconstants::SAML20P_NS);

     if (!issuer || !dynamic_cast<const SSODescriptorType*>(issuer)) {
         log.error("unable to find compatible SAML role (%s) in metadata", role->toString().c_str());
         BindingException ex("Unable to find compatible metadata role for artifact issuer.");
     if (!issuer || !dynamic_cast<const SSODescriptorType*>(issuer)) {
         log.error("unable to find compatible SAML role (%s) in metadata", role->toString().c_str());
         BindingException ex("Unable to find compatible metadata role for artifact issuer.");

diff --git a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
index acccd93..5f659a5 100644 (file)
--- a/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
+++ b/saml/saml2/binding/impl/SAML2POSTDecoder.cpp
@@ -180,7 +180,7 @@ XMLObject* SAML2POSTDecoder::decode(
         provider=metadataProvider ? metadataProvider->getEntityDescriptor(claimedIssuer->getName()) : NULL;
         if (provider) {
             log.debug("matched assertion issuer against metadata, searching for applicable role...");
         provider=metadataProvider ? metadataProvider->getEntityDescriptor(claimedIssuer->getName()) : NULL;
         if (provider) {
             log.debug("matched assertion issuer against metadata, searching for applicable role...");

-            issuer=provider->getRoleDescriptor(*role, SAMLConstants::SAML20P_NS);
+            issuer=provider->getRoleDescriptor(*role, samlconstants::SAML20P_NS);

             if (issuer) {
                 if (trustEngine && signature) {
                     issuerTrusted = trustEngine->validate(*signature, *issuer, metadataProvider->getKeyResolver());
             if (issuer) {
                 if (trustEngine && signature) {
                     issuerTrusted = trustEngine->validate(*signature, *issuer, metadataProvider->getKeyResolver());


@@ -219,7 +219,7 @@ XMLObject* SAML2POSTDecoder::decode(
             }
         }
         if (!issuer)
             }
         }
         if (!issuer)

-            issuer=provider->getRoleDescriptor(*role, SAMLConstants::SAML20P_NS);
+            issuer=provider->getRoleDescriptor(*role, samlconstants::SAML20P_NS);

         if (issuer) annotateException(&ex,issuer); // throws it
         annotateException(&ex,provider);  // throws it
     }
         if (issuer) annotateException(&ex,issuer); // throws it
         annotateException(&ex,provider);  // throws it
     }

diff --git a/saml/saml2/core/Assertions.h b/saml/saml2/core/Assertions.h
index c48a323..e4cd74a 100644 (file)
--- a/saml/saml2/core/Assertions.h
+++ b/saml/saml2/core/Assertions.h
@@ -35,7 +35,7 @@
 #include <xmltooling/util/DateTime.h>
 
 #define DECL_SAML2OBJECTBUILDER(cname) \
 #include <xmltooling/util/DateTime.h>
 
 #define DECL_SAML2OBJECTBUILDER(cname) \

-    DECL_XMLOBJECTBUILDER(SAML_API,cname,opensaml::SAMLConstants::SAML20_NS,opensaml::SAMLConstants::SAML20_PREFIX)
+    DECL_XMLOBJECTBUILDER(SAML_API,cname,samlconstants::SAML20_NS,samlconstants::SAML20_PREFIX)

 
 namespace opensaml {
 
 
 namespace opensaml {
 


@@ -370,10 +370,10 @@ namespace opensaml {
             /** Singleton builder. */
             static NameIDType* buildNameIDType(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL) {
                 const NameIDTypeBuilder* b = dynamic_cast<const NameIDTypeBuilder*>(
             /** Singleton builder. */
             static NameIDType* buildNameIDType(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL) {
                 const NameIDTypeBuilder* b = dynamic_cast<const NameIDTypeBuilder*>(

-                    XMLObjectBuilder::getBuilder(xmltooling::QName(SAMLConstants::SAML20_NS,NameIDType::TYPE_NAME))
+                    XMLObjectBuilder::getBuilder(xmltooling::QName(samlconstants::SAML20_NS,NameIDType::TYPE_NAME))

                     );
                 if (b) {
                     );
                 if (b) {

-                    xmltooling::QName schemaType(SAMLConstants::SAML20_NS,NameIDType::TYPE_NAME,SAMLConstants::SAML20_PREFIX);
+                    xmltooling::QName schemaType(samlconstants::SAML20_NS,NameIDType::TYPE_NAME,samlconstants::SAML20_PREFIX);

                     return b->buildObject(nsURI, localName, prefix, &schemaType);
                 }
                 throw xmltooling::XMLObjectException("Unable to obtain typed builder for NameIDType.");
                     return b->buildObject(nsURI, localName, prefix, &schemaType);
                 }
                 throw xmltooling::XMLObjectException("Unable to obtain typed builder for NameIDType.");


@@ -392,10 +392,10 @@ namespace opensaml {
             /** Default builder. */
             virtual KeyInfoConfirmationDataType* buildObject() const {
                 xmltooling::QName schemaType(
             /** Default builder. */
             virtual KeyInfoConfirmationDataType* buildObject() const {
                 xmltooling::QName schemaType(

-                    SAMLConstants::SAML20_NS,KeyInfoConfirmationDataType::TYPE_NAME,SAMLConstants::SAML20_PREFIX
+                    samlconstants::SAML20_NS,KeyInfoConfirmationDataType::TYPE_NAME,samlconstants::SAML20_PREFIX

                     );
                 return buildObject(
                     );
                 return buildObject(

-                    SAMLConstants::SAML20_NS,KeyInfoConfirmationDataType::LOCAL_NAME,SAMLConstants::SAML20_PREFIX,&schemaType
+                    samlconstants::SAML20_NS,KeyInfoConfirmationDataType::LOCAL_NAME,samlconstants::SAML20_PREFIX,&schemaType

                     );
             }
             /** Builder that allows element/type override. */
                     );
             }
             /** Builder that allows element/type override. */


@@ -406,7 +406,7 @@ namespace opensaml {
             /** Singleton builder. */
             static KeyInfoConfirmationDataType* buildKeyInfoConfirmationDataType() {
                 const KeyInfoConfirmationDataTypeBuilder* b = dynamic_cast<const KeyInfoConfirmationDataTypeBuilder*>(
             /** Singleton builder. */
             static KeyInfoConfirmationDataType* buildKeyInfoConfirmationDataType() {
                 const KeyInfoConfirmationDataTypeBuilder* b = dynamic_cast<const KeyInfoConfirmationDataTypeBuilder*>(

-                    XMLObjectBuilder::getBuilder(xmltooling::QName(SAMLConstants::SAML20_NS,KeyInfoConfirmationDataType::TYPE_NAME))
+                    XMLObjectBuilder::getBuilder(xmltooling::QName(samlconstants::SAML20_NS,KeyInfoConfirmationDataType::TYPE_NAME))

                     );
                 if (b)
                     return b->buildObject();
                     );
                 if (b)
                     return b->buildObject();

diff --git a/saml/saml2/core/Protocols.h b/saml/saml2/core/Protocols.h
index fb02de7..440032f 100644 (file)
--- a/saml/saml2/core/Protocols.h
+++ b/saml/saml2/core/Protocols.h
@@ -26,7 +26,7 @@
 #include <saml/saml2/core/Assertions.h>
 
 #define DECL_SAML2POBJECTBUILDER(cname) \
 #include <saml/saml2/core/Assertions.h>
 
 #define DECL_SAML2POBJECTBUILDER(cname) \

-    DECL_XMLOBJECTBUILDER(SAML_API,cname,opensaml::SAMLConstants::SAML20P_NS,opensaml::SAMLConstants::SAML20P_PREFIX)
+    DECL_XMLOBJECTBUILDER(SAML_API,cname,samlconstants::SAML20P_NS,samlconstants::SAML20P_PREFIX)

 
 namespace opensaml {
 
 
 namespace opensaml {
 


@@ -388,7 +388,7 @@ namespace opensaml {
         DECL_SAML2POBJECTBUILDER(StatusMessage);
         DECL_SAML2POBJECTBUILDER(Terminate);
         
         DECL_SAML2POBJECTBUILDER(StatusMessage);
         DECL_SAML2POBJECTBUILDER(Terminate);
         

-        DECL_XMLOBJECTBUILDER(SAML_API,RespondTo,opensaml::SAMLConstants::SAML20P_THIRDPARTY_EXT_NS,opensaml::SAMLConstants::SAML20P_THIRDPARTY_EXT_PREFIX);
+        DECL_XMLOBJECTBUILDER(SAML_API,RespondTo,samlconstants::SAML20P_THIRDPARTY_EXT_NS,samlconstants::SAML20P_THIRDPARTY_EXT_PREFIX);

 
         /**
          * Registers builders and validators for SAML 2.0 Protocol classes into the runtime.
 
         /**
          * Registers builders and validators for SAML 2.0 Protocol classes into the runtime.

diff --git a/saml/saml2/core/impl/Assertions20Impl.cpp b/saml/saml2/core/impl/Assertions20Impl.cpp
index 31d19cb..d570aba 100644 (file)
--- a/saml/saml2/core/impl/Assertions20Impl.cpp
+++ b/saml/saml2/core/impl/Assertions20Impl.cpp
@@ -43,6 +43,9 @@ using namespace xmlencryption;
 using namespace xmlsignature;
 using namespace xmltooling;
 using namespace std;
 using namespace xmlsignature;
 using namespace xmltooling;
 using namespace std;

+using xmlconstants::XMLSIG_NS;
+using xmlconstants::XMLENC_NS;
+using samlconstants::SAML20_NS;

 
 #if defined (_MSC_VER)
     #pragma warning( push )
 
 #if defined (_MSC_VER)
     #pragma warning( push )


@@ -215,8 +218,8 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(EncryptedData,xmlencryption,XMLConstants::XMLENC_NS,false);
-                PROC_TYPED_FOREIGN_CHILDREN(EncryptedKey,xmlencryption,XMLConstants::XMLENC_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(EncryptedData,xmlencryption,XMLENC_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(EncryptedKey,xmlencryption,XMLENC_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -269,7 +272,7 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(Audience,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILDREN(Audience,SAML20_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -337,7 +340,7 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(Audience,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILDREN(Audience,SAML20_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -418,10 +421,10 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AudienceRestriction,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(OneTimeUse,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(ProxyRestriction,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(Condition,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILDREN(AudienceRestriction,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(OneTimeUse,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(ProxyRestriction,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(Condition,SAML20_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     


@@ -596,7 +599,7 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(KeyInfo,XMLConstants::XMLSIG_NS,false);
+                PROC_TYPED_CHILDREN(KeyInfo,XMLSIG_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -670,11 +673,11 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(BaseID,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(NameID,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(EncryptedID,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(KeyInfoConfirmationDataType,SAMLConstants::SAML20_NS,false);
-                PROC_XMLOBJECT_CHILD(SubjectConfirmationData,SAMLConstants::SAML20_NS);
+                PROC_TYPED_CHILD(BaseID,SAML20_NS,false);
+                PROC_TYPED_CHILD(NameID,SAML20_NS,false);
+                PROC_TYPED_CHILD(EncryptedID,SAML20_NS,false);
+                PROC_TYPED_CHILD(KeyInfoConfirmationDataType,SAML20_NS,false);
+                PROC_XMLOBJECT_CHILD(SubjectConfirmationData,SAML20_NS);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -736,10 +739,10 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(BaseID,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(NameID,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(EncryptedID,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(SubjectConfirmation,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILD(BaseID,SAML20_NS,false);
+                PROC_TYPED_CHILD(NameID,SAML20_NS,false);
+                PROC_TYPED_CHILD(EncryptedID,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(SubjectConfirmation,SAML20_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -856,10 +859,10 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(AuthnContextClassRef,SAMLConstants::SAML20_NS,false);
-                PROC_XMLOBJECT_CHILD(AuthnContextDecl,SAMLConstants::SAML20_NS);
-                PROC_TYPED_CHILD(AuthnContextDeclRef,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(AuthenticatingAuthority,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILD(AuthnContextClassRef,SAML20_NS,false);
+                PROC_XMLOBJECT_CHILD(AuthnContextDecl,SAML20_NS);
+                PROC_TYPED_CHILD(AuthnContextDeclRef,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(AuthenticatingAuthority,SAML20_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -924,8 +927,8 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(SubjectLocality,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(AuthnContext,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILD(SubjectLocality,SAML20_NS,false);
+                PROC_TYPED_CHILD(AuthnContext,SAML20_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     


@@ -1023,10 +1026,10 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AssertionIDRef,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(AssertionURIRef,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(Assertion,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(EncryptedAssertion,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILDREN(AssertionIDRef,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(AssertionURIRef,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(Assertion,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(EncryptedAssertion,SAML20_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -1086,8 +1089,8 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Evidence,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(Action,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILD(Evidence,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(Action,SAML20_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     


@@ -1251,8 +1254,8 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(Attribute,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(EncryptedAttribute,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILDREN(Attribute,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(EncryptedAttribute,SAML20_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -1312,14 +1315,14 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AssertionIDRef,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(AssertionURIRef,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(Assertion,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(EncryptedAssertion,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILDREN(AssertionIDRef,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(AssertionURIRef,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(Assertion,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(EncryptedAssertion,SAML20_NS,false);

                 
                 // Unknown child.
                 const XMLCh* nsURI=root->getNamespaceURI();
                 
                 // Unknown child.
                 const XMLCh* nsURI=root->getNamespaceURI();

-                if (!XMLString::equals(nsURI,SAMLConstants::SAML20_NS) && nsURI && *nsURI) {
+                if (!XMLString::equals(nsURI,SAML20_NS) && nsURI && *nsURI) {

                     getOthers().push_back(childXMLObject);
                     return;
                 }
                     getOthers().push_back(childXMLObject);
                     return;
                 }


@@ -1479,15 +1482,15 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Issuer,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(Signature,XMLConstants::XMLSIG_NS,false);
-                PROC_TYPED_CHILD(Subject,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(Conditions,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(Advice,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(AuthnStatement,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(AttributeStatement,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(AuthzDecisionStatement,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(Statement,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILD(Issuer,SAML20_NS,false);
+                PROC_TYPED_CHILD(Signature,XMLSIG_NS,false);
+                PROC_TYPED_CHILD(Subject,SAML20_NS,false);
+                PROC_TYPED_CHILD(Conditions,SAML20_NS,false);
+                PROC_TYPED_CHILD(Advice,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(AuthnStatement,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(AttributeStatement,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(AuthzDecisionStatement,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(Statement,SAML20_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     

diff --git a/saml/saml2/core/impl/Assertions20SchemaValidators.cpp b/saml/saml2/core/impl/Assertions20SchemaValidators.cpp
index fac134c..2d47a27 100644 (file)
--- a/saml/saml2/core/impl/Assertions20SchemaValidators.cpp
+++ b/saml/saml2/core/impl/Assertions20SchemaValidators.cpp
@@ -30,6 +30,7 @@ using namespace opensaml::saml2;
 using namespace opensaml;
 using namespace xmltooling;
 using namespace std;
 using namespace opensaml;
 using namespace xmltooling;
 using namespace std;

+using samlconstants::SAML20_NS;

 
 namespace opensaml {
     namespace saml2 {
 
 namespace opensaml {
     namespace saml2 {


@@ -146,6 +147,8 @@ namespace opensaml {
 
         BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Assertion);
             XMLOBJECTVALIDATOR_REQUIRE(Assertion,Version);
 
         BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,Assertion);
             XMLOBJECTVALIDATOR_REQUIRE(Assertion,Version);

+            if (!XMLString::equals(samlconstants::SAML20_VERSION, ptr->getVersion()))
+                throw ValidationException("Assertion has wrong SAML Version.");

             XMLOBJECTVALIDATOR_REQUIRE(Assertion,ID);
             XMLOBJECTVALIDATOR_REQUIRE(Assertion,IssueInstant);
             XMLOBJECTVALIDATOR_REQUIRE(Assertion,Issuer);
             XMLOBJECTVALIDATOR_REQUIRE(Assertion,ID);
             XMLOBJECTVALIDATOR_REQUIRE(Assertion,IssueInstant);
             XMLOBJECTVALIDATOR_REQUIRE(Assertion,Issuer);


@@ -159,7 +162,7 @@ namespace opensaml {
         public:
             void operator()(const XMLObject* xmlObject) const {
                 const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();
         public:
             void operator()(const XMLObject* xmlObject) const {
                 const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();

-                if (XMLString::equals(ns,SAMLConstants::SAML20_NS) || !ns || !*ns) {
+                if (XMLString::equals(ns,SAML20_NS) || !ns || !*ns) {

                     throw ValidationException(
                         "Object contains an illegal extension child element ($1).",
                         params(1,xmlObject->getElementQName().toString().c_str())
                     throw ValidationException(
                         "Object contains an illegal extension child element ($1).",
                         params(1,xmlObject->getElementQName().toString().c_str())


@@ -177,21 +180,21 @@ namespace opensaml {
 };
 
 #define REGISTER_ELEMENT(cname) \
 };
 
 #define REGISTER_ELEMENT(cname) \

-    q=QName(SAMLConstants::SAML20_NS,cname::LOCAL_NAME); \
+    q=QName(SAML20_NS,cname::LOCAL_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(cname) \

-    q=QName(SAMLConstants::SAML20_NS,cname::TYPE_NAME); \
+    q=QName(SAML20_NS,cname::TYPE_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(cname) \

-    q=QName(SAMLConstants::SAML20_NS,cname::LOCAL_NAME); \
+    q=QName(SAML20_NS,cname::LOCAL_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
     
 #define REGISTER_TYPE_NOVAL(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
     
 #define REGISTER_TYPE_NOVAL(cname) \

-    q=QName(SAMLConstants::SAML20_NS,cname::TYPE_NAME); \
+    q=QName(SAML20_NS,cname::TYPE_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
 void opensaml::saml2::registerAssertionClasses() {
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
 void opensaml::saml2::registerAssertionClasses() {

diff --git a/saml/saml2/core/impl/Protocols20Impl.cpp b/saml/saml2/core/impl/Protocols20Impl.cpp
index 45b7915..fa407d8 100644 (file)
--- a/saml/saml2/core/impl/Protocols20Impl.cpp
+++ b/saml/saml2/core/impl/Protocols20Impl.cpp
@@ -44,6 +44,11 @@ using namespace xmlsignature;
 using namespace xmlencryption;
 using namespace xmltooling;
 using namespace std;
 using namespace xmlencryption;
 using namespace xmltooling;
 using namespace std;

+using xmlconstants::XMLSIG_NS;
+using xmlconstants::XMLENC_NS;
+using xmlconstants::XML_BOOL_NULL;
+using samlconstants::SAML20_NS;
+using samlconstants::SAML20P_NS;

 
 #if defined (_MSC_VER)
     #pragma warning( push )
 
 #if defined (_MSC_VER)
     #pragma warning( push )


@@ -91,7 +96,7 @@ namespace opensaml {
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
                 // Unknown child.
                 const XMLCh* nsURI=root->getNamespaceURI();
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
                 // Unknown child.
                 const XMLCh* nsURI=root->getNamespaceURI();

-                if (!XMLString::equals(nsURI,SAMLConstants::SAML20P_NS) && nsURI && *nsURI) {
+                if (!XMLString::equals(nsURI,SAML20P_NS) && nsURI && *nsURI) {

                     getXMLObjects().push_back(childXMLObject);
                     return;
                 }
                     getXMLObjects().push_back(childXMLObject);
                     return;
                 }


@@ -139,7 +144,7 @@ namespace opensaml {
                 }
 
                 void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
                 }
 
                 void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                    PROC_TYPED_CHILD(StatusCode,SAMLConstants::SAML20P_NS,false);
+                    PROC_TYPED_CHILD(StatusCode,SAML20P_NS,false);

                     AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
                 }
 
                     AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
                 }
 


@@ -229,9 +234,9 @@ namespace opensaml {
         protected:
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
         protected:
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(StatusCode,SAMLConstants::SAML20P_NS,false);
-                PROC_TYPED_CHILD(StatusMessage,SAMLConstants::SAML20P_NS,false);
-                PROC_TYPED_CHILD(StatusDetail,SAMLConstants::SAML20P_NS,false);
+                PROC_TYPED_CHILD(StatusCode,SAML20P_NS,false);
+                PROC_TYPED_CHILD(StatusMessage,SAML20P_NS,false);
+                PROC_TYPED_CHILD(StatusDetail,SAML20P_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     


@@ -340,9 +345,9 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(Issuer,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLConstants::XMLSIG_NS,false);
-                PROC_TYPED_CHILD(Extensions,SAMLConstants::SAML20P_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Issuer,saml2,SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLSIG_NS,false);
+                PROC_TYPED_CHILD(Extensions,SAML20P_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     


@@ -384,7 +389,7 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILDREN(AssertionIDRef,saml2,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(AssertionIDRef,saml2,SAML20_NS,false);

                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -421,7 +426,7 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(Subject,saml2,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Subject,saml2,SAML20_NS,false);

                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -478,8 +483,8 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILDREN(AuthnContextClassRef,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_FOREIGN_CHILDREN(AuthnContextDeclRef,saml2,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(AuthnContextClassRef,saml2,SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(AuthnContextDeclRef,saml2,SAML20_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     


@@ -536,7 +541,7 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(RequestedAuthnContext,SAMLConstants::SAML20P_NS,false);
+                PROC_TYPED_CHILD(RequestedAuthnContext,SAML20P_NS,false);

                 SubjectQueryImpl::processChildElement(childXMLObject,root);
             }
             void processAttribute(const DOMAttr* attribute) {
                 SubjectQueryImpl::processChildElement(childXMLObject,root);
             }
             void processAttribute(const DOMAttr* attribute) {


@@ -578,7 +583,7 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILDREN(Attribute,saml2,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(Attribute,saml2,SAML20_NS,false);

                 SubjectQueryImpl::processChildElement(childXMLObject,root);
             }
         };
                 SubjectQueryImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -638,8 +643,8 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(Evidence,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_FOREIGN_CHILDREN(Action,saml2,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Evidence,saml2,SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(Action,saml2,SAML20_NS,false);

                 SubjectQueryImpl::processChildElement(childXMLObject,root);
             }
             void processAttribute(const DOMAttr* attribute) {
                 SubjectQueryImpl::processChildElement(childXMLObject,root);
             }
             void processAttribute(const DOMAttr* attribute) {


@@ -657,7 +662,7 @@ namespace opensaml {
             void init() {
                 m_Format=NULL;
                 m_SPNameQualifier=NULL;
             void init() {
                 m_Format=NULL;
                 m_SPNameQualifier=NULL;

-                m_AllowCreate=XMLConstants::XML_BOOL_NULL;
+                m_AllowCreate=XML_BOOL_NULL;

             }
             public:
                 virtual ~NameIDPolicyImpl()
             }
             public:
                 virtual ~NameIDPolicyImpl()


@@ -796,8 +801,8 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(IDPEntry,SAMLConstants::SAML20P_NS,false);
-                PROC_TYPED_CHILD(GetComplete,SAMLConstants::SAML20P_NS,false);
+                PROC_TYPED_CHILDREN(IDPEntry,SAML20P_NS,false);
+                PROC_TYPED_CHILD(GetComplete,SAML20P_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -855,8 +860,8 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(IDPList,SAMLConstants::SAML20P_NS,false);
-                PROC_TYPED_CHILDREN(RequesterID,SAMLConstants::SAML20P_NS,false);
+                PROC_TYPED_CHILD(IDPList,SAML20P_NS,false);
+                PROC_TYPED_CHILDREN(RequesterID,SAML20P_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -869,8 +874,8 @@ namespace opensaml {
         class SAML_DLLLOCAL AuthnRequestImpl : public virtual AuthnRequest, public RequestAbstractTypeImpl
         {
             void init() {
         class SAML_DLLLOCAL AuthnRequestImpl : public virtual AuthnRequest, public RequestAbstractTypeImpl
         {
             void init() {

-                m_ForceAuthn=XMLConstants::XML_BOOL_NULL;
-                m_IsPassive=XMLConstants::XML_BOOL_NULL;
+                m_ForceAuthn=XML_BOOL_NULL;
+                m_IsPassive=XML_BOOL_NULL;

                 m_ProtocolBinding=NULL;
                 m_AssertionConsumerServiceIndex=NULL;
                 m_AssertionConsumerServiceURL=NULL;
                 m_ProtocolBinding=NULL;
                 m_AssertionConsumerServiceIndex=NULL;
                 m_AssertionConsumerServiceURL=NULL;


@@ -969,11 +974,11 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(Subject,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(NameIDPolicy,SAMLConstants::SAML20P_NS,false);
-                PROC_TYPED_FOREIGN_CHILD(Conditions,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(RequestedAuthnContext,SAMLConstants::SAML20P_NS,false);
-                PROC_TYPED_CHILD(Scoping,SAMLConstants::SAML20P_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Subject,saml2,SAML20_NS,false);
+                PROC_TYPED_CHILD(NameIDPolicy,SAML20P_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Conditions,saml2,SAML20_NS,false);
+                PROC_TYPED_CHILD(RequestedAuthnContext,SAML20P_NS,false);
+                PROC_TYPED_CHILD(Scoping,SAML20P_NS,false);

                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
             void processAttribute(const DOMAttr* attribute) {
                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
             void processAttribute(const DOMAttr* attribute) {


@@ -1103,10 +1108,10 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(Issuer,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLConstants::XMLSIG_NS,false);
-                PROC_TYPED_CHILD(Extensions,SAMLConstants::SAML20P_NS,false);
-                PROC_TYPED_CHILD(Status,SAMLConstants::SAML20P_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Issuer,saml2,SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLSIG_NS,false);
+                PROC_TYPED_CHILD(Extensions,SAML20P_NS,false);
+                PROC_TYPED_CHILD(Status,SAML20P_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
     


@@ -1157,8 +1162,8 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILDREN(Assertion,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_FOREIGN_CHILDREN(EncryptedAssertion,saml2,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(Assertion,saml2,SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(EncryptedAssertion,saml2,SAML20_NS,false);

                 StatusResponseTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 StatusResponseTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1195,7 +1200,7 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Artifact,SAMLConstants::SAML20P_NS,false);
+                PROC_TYPED_CHILD(Artifact,SAML20P_NS,false);

                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1236,10 +1241,10 @@ namespace opensaml {
                 // These are valid elements for the parent StatusResponseType, so don't process these.
                 // If not one of these, then it must be the payload.
                 if (
                 // These are valid elements for the parent StatusResponseType, so don't process these.
                 // If not one of these, then it must be the payload.
                 if (

-                    ! XMLHelper::isNodeNamed(root,SAMLConstants::SAML20_NS,saml2::Issuer::LOCAL_NAME) &&
-                    ! XMLHelper::isNodeNamed(root,XMLConstants::XMLSIG_NS,xmlsignature::Signature::LOCAL_NAME) &&
-                    ! XMLHelper::isNodeNamed(root,SAMLConstants::SAML20P_NS,saml2p::Extensions::LOCAL_NAME) &&
-                    ! XMLHelper::isNodeNamed(root,SAMLConstants::SAML20P_NS,saml2p::Status::LOCAL_NAME)
+                    ! XMLHelper::isNodeNamed(root,SAML20_NS,saml2::Issuer::LOCAL_NAME) &&
+                    ! XMLHelper::isNodeNamed(root,XMLSIG_NS,xmlsignature::Signature::LOCAL_NAME) &&
+                    ! XMLHelper::isNodeNamed(root,SAML20P_NS,saml2p::Extensions::LOCAL_NAME) &&
+                    ! XMLHelper::isNodeNamed(root,SAML20P_NS,saml2p::Status::LOCAL_NAME)

                    )
                 {
                     setPayload(childXMLObject);
                    )
                 {
                     setPayload(childXMLObject);


@@ -1318,8 +1323,8 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(EncryptedData,xmlencryption,XMLConstants::XMLENC_NS,false);
-                PROC_TYPED_FOREIGN_CHILDREN(EncryptedKey,xmlencryption,XMLConstants::XMLENC_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(EncryptedData,xmlencryption,XMLENC_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(EncryptedKey,xmlencryption,XMLENC_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
         };


@@ -1409,11 +1414,11 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(NameID,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_FOREIGN_CHILD(EncryptedID,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(NewID,SAMLConstants::SAML20P_NS,false);
-                PROC_TYPED_CHILD(NewEncryptedID,SAMLConstants::SAML20P_NS,false);
-                PROC_TYPED_CHILD(Terminate,SAMLConstants::SAML20P_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(NameID,saml2,SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(EncryptedID,saml2,SAML20_NS,false);
+                PROC_TYPED_CHILD(NewID,SAML20P_NS,false);
+                PROC_TYPED_CHILD(NewEncryptedID,SAML20P_NS,false);
+                PROC_TYPED_CHILD(Terminate,SAML20P_NS,false);

                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1511,10 +1516,10 @@ namespace opensaml {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
     
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(BaseID,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_FOREIGN_CHILD(NameID,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_FOREIGN_CHILD(EncryptedID,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILDREN(SessionIndex,SAMLConstants::SAML20P_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(BaseID,saml2,SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(NameID,saml2,SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(EncryptedID,saml2,SAML20_NS,false);
+                PROC_TYPED_CHILDREN(SessionIndex,SAML20P_NS,false);

                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
             void processAttribute(const DOMAttr* attribute) {
                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
             void processAttribute(const DOMAttr* attribute) {


@@ -1598,10 +1603,10 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(BaseID,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_FOREIGN_CHILD(NameID,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_FOREIGN_CHILD(EncryptedID,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_CHILD(NameIDPolicy,SAMLConstants::SAML20P_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(BaseID,saml2,SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(NameID,saml2,SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(EncryptedID,saml2,SAML20_NS,false);
+                PROC_TYPED_CHILD(NameIDPolicy,SAML20P_NS,false);

                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 RequestAbstractTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1647,8 +1652,8 @@ namespace opensaml {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
     
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(NameID,saml2,SAMLConstants::SAML20_NS,false);
-                PROC_TYPED_FOREIGN_CHILD(EncryptedID,saml2,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(NameID,saml2,SAML20_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(EncryptedID,saml2,SAML20_NS,false);

                 StatusResponseTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 StatusResponseTypeImpl::processChildElement(childXMLObject,root);
             }
         };

diff --git a/saml/saml2/core/impl/Protocols20SchemaValidators.cpp b/saml/saml2/core/impl/Protocols20SchemaValidators.cpp
index 547a116..109f518 100644 (file)
--- a/saml/saml2/core/impl/Protocols20SchemaValidators.cpp
+++ b/saml/saml2/core/impl/Protocols20SchemaValidators.cpp
@@ -31,6 +31,7 @@ using namespace opensaml::saml2;
 using namespace opensaml;
 using namespace xmltooling;
 using namespace std;
 using namespace opensaml;
 using namespace xmltooling;
 using namespace std;

+using samlconstants::SAML20P_NS;

 
 namespace opensaml {
     namespace saml2p {
 
 namespace opensaml {
     namespace saml2p {


@@ -50,7 +51,7 @@ namespace opensaml {
         public:
             void operator()(const XMLObject* xmlObject) const {
                 const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();
         public:
             void operator()(const XMLObject* xmlObject) const {
                 const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();

-                if (XMLString::equals(ns,SAMLConstants::SAML20P_NS) || !ns || !*ns) {
+                if (XMLString::equals(ns,SAML20P_NS) || !ns || !*ns) {

                     throw ValidationException(
                         "Object contains an illegal extension child element ($1).",
                         params(1,xmlObject->getElementQName().toString().c_str())
                     throw ValidationException(
                         "Object contains an illegal extension child element ($1).",
                         params(1,xmlObject->getElementQName().toString().c_str())


@@ -63,7 +64,7 @@ namespace opensaml {
             XMLOBJECTVALIDATOR_REQUIRE(RequestAbstractType,ID);
             XMLOBJECTVALIDATOR_REQUIRE(RequestAbstractType,Version);
             XMLOBJECTVALIDATOR_REQUIRE(RequestAbstractType,IssueInstant);
             XMLOBJECTVALIDATOR_REQUIRE(RequestAbstractType,ID);
             XMLOBJECTVALIDATOR_REQUIRE(RequestAbstractType,Version);
             XMLOBJECTVALIDATOR_REQUIRE(RequestAbstractType,IssueInstant);

-            if (!XMLString::equals(SAMLConstants::SAML20_VERSION, ptr->getVersion()))
+            if (!XMLString::equals(samlconstants::SAML20_VERSION, ptr->getVersion()))

                 throw ValidationException("Request has wrong SAML Version.");
         END_XMLOBJECTVALIDATOR;
 
                 throw ValidationException("Request has wrong SAML Version.");
         END_XMLOBJECTVALIDATOR;
 


@@ -77,7 +78,7 @@ namespace opensaml {
             XMLOBJECTVALIDATOR_REQUIRE(StatusResponseType,Version);
             XMLOBJECTVALIDATOR_REQUIRE(StatusResponseType,IssueInstant);
             XMLOBJECTVALIDATOR_REQUIRE(StatusResponseType,Status);
             XMLOBJECTVALIDATOR_REQUIRE(StatusResponseType,Version);
             XMLOBJECTVALIDATOR_REQUIRE(StatusResponseType,IssueInstant);
             XMLOBJECTVALIDATOR_REQUIRE(StatusResponseType,Status);

-            if (!XMLString::equals(SAMLConstants::SAML20_VERSION, ptr->getVersion()))
+            if (!XMLString::equals(samlconstants::SAML20_VERSION, ptr->getVersion()))

                 throw ValidationException("StatusResponse has wrong SAML Version.");
         END_XMLOBJECTVALIDATOR;
 
                 throw ValidationException("StatusResponse has wrong SAML Version.");
         END_XMLOBJECTVALIDATOR;
 


@@ -98,7 +99,7 @@ namespace opensaml {
             {
                 QName pq = ptr->getParent()->getElementQName();
 
             {
                 QName pq = ptr->getParent()->getElementQName();
 

-                if ( XMLString::equals(pq.getNamespaceURI(), SAMLConstants::SAML20P_NS) &&
+                if ( XMLString::equals(pq.getNamespaceURI(), SAML20P_NS) &&

                         XMLString::equals(pq.getLocalPart(), Status::LOCAL_NAME))
                 {
                     const XMLCh* code = ptr->getValue();
                         XMLString::equals(pq.getLocalPart(), Status::LOCAL_NAME))
                 {
                     const XMLCh* code = ptr->getValue();


@@ -224,21 +225,21 @@ namespace opensaml {
 };
 
 #define REGISTER_ELEMENT(cname) \
 };
 
 #define REGISTER_ELEMENT(cname) \

-    q=QName(SAMLConstants::SAML20P_NS,cname::LOCAL_NAME); \
+    q=QName(SAML20P_NS,cname::LOCAL_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(cname) \

-    q=QName(SAMLConstants::SAML20P_NS,cname::TYPE_NAME); \
+    q=QName(SAML20P_NS,cname::TYPE_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(cname) \

-    q=QName(SAMLConstants::SAML20P_NS,cname::LOCAL_NAME); \
+    q=QName(SAML20P_NS,cname::LOCAL_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
     
 #define REGISTER_TYPE_NOVAL(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
     
 #define REGISTER_TYPE_NOVAL(cname) \

-    q=QName(SAMLConstants::SAML20P_NS,cname::TYPE_NAME); \
+    q=QName(SAML20P_NS,cname::TYPE_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
 void opensaml::saml2p::registerProtocolClasses() {
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
 void opensaml::saml2p::registerProtocolClasses() {


@@ -297,7 +298,7 @@ void opensaml::saml2p::registerProtocolClasses() {
     REGISTER_TYPE_NOVAL(StatusDetail);
     REGISTER_TYPE_NOVAL(Terminate);
 
     REGISTER_TYPE_NOVAL(StatusDetail);
     REGISTER_TYPE_NOVAL(Terminate);
 

-    q=QName(SAMLConstants::SAML20P_THIRDPARTY_EXT_NS,RespondTo::LOCAL_NAME);
+    q=QName(samlconstants::SAML20P_THIRDPARTY_EXT_NS,RespondTo::LOCAL_NAME);

     XMLObjectBuilder::registerBuilder(q,new RespondToBuilder());
     SchemaValidators.registerValidator(q,new RespondToSchemaValidator());
 }
     XMLObjectBuilder::registerBuilder(q,new RespondToBuilder());
     SchemaValidators.registerValidator(q,new RespondToSchemaValidator());
 }

diff --git a/saml/saml2/metadata/Metadata.h b/saml/saml2/metadata/Metadata.h
index 435ad64..ee6863b 100644 (file)
--- a/saml/saml2/metadata/Metadata.h
+++ b/saml/saml2/metadata/Metadata.h
@@ -27,7 +27,7 @@
 #include <ctime>
 
 #define DECL_SAML2MDOBJECTBUILDER(cname) \
 #include <ctime>
 
 #define DECL_SAML2MDOBJECTBUILDER(cname) \

-    DECL_XMLOBJECTBUILDER(SAML_API,cname,opensaml::SAMLConstants::SAML20MD_NS,opensaml::SAMLConstants::SAML20MD_PREFIX)
+    DECL_XMLOBJECTBUILDER(SAML_API,cname,samlconstants::SAML20MD_NS,samlconstants::SAML20MD_PREFIX)

 
 namespace opensaml {
 
 
 namespace opensaml {
 


@@ -419,8 +419,8 @@ namespace opensaml {
         DECL_SAML2MDOBJECTBUILDER(SurName);
         DECL_SAML2MDOBJECTBUILDER(TelephoneNumber);
         
         DECL_SAML2MDOBJECTBUILDER(SurName);
         DECL_SAML2MDOBJECTBUILDER(TelephoneNumber);
         

-        DECL_XMLOBJECTBUILDER(SAML_API,ActionNamespace,opensaml::SAMLConstants::SAML20MD_QUERY_EXT_NS,opensaml::SAMLConstants::SAML20MD_QUERY_EXT_PREFIX);
-        DECL_XMLOBJECTBUILDER(SAML_API,SourceID,opensaml::SAMLConstants::SAML1MD_NS,opensaml::SAMLConstants::SAML1MD_PREFIX);
+        DECL_XMLOBJECTBUILDER(SAML_API,ActionNamespace,samlconstants::SAML20MD_QUERY_EXT_NS,samlconstants::SAML20MD_QUERY_EXT_PREFIX);
+        DECL_XMLOBJECTBUILDER(SAML_API,SourceID,samlconstants::SAML1MD_NS,samlconstants::SAML1MD_PREFIX);

 
         /**
          * Builder for localizedNameType objects.
 
         /**
          * Builder for localizedNameType objects.


@@ -438,10 +438,10 @@ namespace opensaml {
             /** Singleton builder. */
             static localizedNameType* buildlocalizedNameType(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL) {
                 const localizedNameTypeBuilder* b = dynamic_cast<const localizedNameTypeBuilder*>(
             /** Singleton builder. */
             static localizedNameType* buildlocalizedNameType(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL) {
                 const localizedNameTypeBuilder* b = dynamic_cast<const localizedNameTypeBuilder*>(

-                    XMLObjectBuilder::getBuilder(xmltooling::QName(SAMLConstants::SAML20MD_NS,localizedNameType::TYPE_NAME))
+                    XMLObjectBuilder::getBuilder(xmltooling::QName(samlconstants::SAML20MD_NS,localizedNameType::TYPE_NAME))

                     );
                 if (b) {
                     );
                 if (b) {

-                    xmltooling::QName schemaType(SAMLConstants::SAML20MD_NS,localizedNameType::TYPE_NAME,SAMLConstants::SAML20MD_PREFIX);
+                    xmltooling::QName schemaType(samlconstants::SAML20MD_NS,localizedNameType::TYPE_NAME,samlconstants::SAML20MD_PREFIX);

                     return b->buildObject(nsURI, localName, prefix, &schemaType);
                 }
                 throw xmltooling::XMLObjectException("Unable to obtain typed builder for localizedNameType.");
                     return b->buildObject(nsURI, localName, prefix, &schemaType);
                 }
                 throw xmltooling::XMLObjectException("Unable to obtain typed builder for localizedNameType.");


@@ -464,10 +464,10 @@ namespace opensaml {
             /** Singleton builder. */
             static localizedURIType* buildlocalizedURIType(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL) {
                 const localizedURITypeBuilder* b = dynamic_cast<const localizedURITypeBuilder*>(
             /** Singleton builder. */
             static localizedURIType* buildlocalizedURIType(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL) {
                 const localizedURITypeBuilder* b = dynamic_cast<const localizedURITypeBuilder*>(

-                    XMLObjectBuilder::getBuilder(xmltooling::QName(SAMLConstants::SAML20MD_NS,localizedURIType::TYPE_NAME))
+                    XMLObjectBuilder::getBuilder(xmltooling::QName(samlconstants::SAML20MD_NS,localizedURIType::TYPE_NAME))

                     );
                 if (b) {
                     );
                 if (b) {

-                    xmltooling::QName schemaType(SAMLConstants::SAML20MD_NS,localizedURIType::TYPE_NAME,SAMLConstants::SAML20MD_PREFIX);
+                    xmltooling::QName schemaType(samlconstants::SAML20MD_NS,localizedURIType::TYPE_NAME,samlconstants::SAML20MD_PREFIX);

                     return b->buildObject(nsURI, localName, prefix, &schemaType);
                 }
                 throw xmltooling::XMLObjectException("Unable to obtain typed builder for localizedURIType.");
                     return b->buildObject(nsURI, localName, prefix, &schemaType);
                 }
                 throw xmltooling::XMLObjectException("Unable to obtain typed builder for localizedURIType.");


@@ -490,10 +490,10 @@ namespace opensaml {
             /** Singleton builder. */
             static EndpointType* buildEndpointType(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL) {
                 const EndpointTypeBuilder* b = dynamic_cast<const EndpointTypeBuilder*>(
             /** Singleton builder. */
             static EndpointType* buildEndpointType(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL) {
                 const EndpointTypeBuilder* b = dynamic_cast<const EndpointTypeBuilder*>(

-                    XMLObjectBuilder::getBuilder(xmltooling::QName(SAMLConstants::SAML20MD_NS,EndpointType::TYPE_NAME))
+                    XMLObjectBuilder::getBuilder(xmltooling::QName(samlconstants::SAML20MD_NS,EndpointType::TYPE_NAME))

                     );
                 if (b) {
                     );
                 if (b) {

-                    xmltooling::QName schemaType(SAMLConstants::SAML20MD_NS,EndpointType::TYPE_NAME,SAMLConstants::SAML20MD_PREFIX);
+                    xmltooling::QName schemaType(samlconstants::SAML20MD_NS,EndpointType::TYPE_NAME,samlconstants::SAML20MD_PREFIX);

                     return b->buildObject(nsURI, localName, prefix, &schemaType);
                 }
                 throw xmltooling::XMLObjectException("Unable to obtain typed builder for EndpointType.");
                     return b->buildObject(nsURI, localName, prefix, &schemaType);
                 }
                 throw xmltooling::XMLObjectException("Unable to obtain typed builder for EndpointType.");


@@ -516,10 +516,10 @@ namespace opensaml {
             /** Singleton builder. */
             static IndexedEndpointType* buildIndexedEndpointType(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL) {
                 const IndexedEndpointTypeBuilder* b = dynamic_cast<const IndexedEndpointTypeBuilder*>(
             /** Singleton builder. */
             static IndexedEndpointType* buildIndexedEndpointType(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL) {
                 const IndexedEndpointTypeBuilder* b = dynamic_cast<const IndexedEndpointTypeBuilder*>(

-                    XMLObjectBuilder::getBuilder(xmltooling::QName(SAMLConstants::SAML20MD_NS,IndexedEndpointType::TYPE_NAME))
+                    XMLObjectBuilder::getBuilder(xmltooling::QName(samlconstants::SAML20MD_NS,IndexedEndpointType::TYPE_NAME))

                     );
                 if (b) {
                     );
                 if (b) {

-                    xmltooling::QName schemaType(SAMLConstants::SAML20MD_NS,IndexedEndpointType::TYPE_NAME,SAMLConstants::SAML20MD_PREFIX);
+                    xmltooling::QName schemaType(samlconstants::SAML20MD_NS,IndexedEndpointType::TYPE_NAME,samlconstants::SAML20MD_PREFIX);

                     return b->buildObject(nsURI, localName, prefix, &schemaType);
                 }
                 throw xmltooling::XMLObjectException("Unable to obtain typed builder for IndexedEndpointType.");
                     return b->buildObject(nsURI, localName, prefix, &schemaType);
                 }
                 throw xmltooling::XMLObjectException("Unable to obtain typed builder for IndexedEndpointType.");


@@ -538,10 +538,10 @@ namespace opensaml {
             /** Default builder. */
             virtual AuthnQueryDescriptorType* buildObject() const {
                 xmltooling::QName schemaType(
             /** Default builder. */
             virtual AuthnQueryDescriptorType* buildObject() const {
                 xmltooling::QName schemaType(

-                    SAMLConstants::SAML20_NS,AuthnQueryDescriptorType::TYPE_NAME,SAMLConstants::SAML20MD_QUERY_EXT_PREFIX
+                    samlconstants::SAML20_NS,AuthnQueryDescriptorType::TYPE_NAME,samlconstants::SAML20MD_QUERY_EXT_PREFIX

                     );
                 return buildObject(
                     );
                 return buildObject(

-                    SAMLConstants::SAML20_NS,AuthnQueryDescriptorType::LOCAL_NAME,SAMLConstants::SAML20_PREFIX,&schemaType
+                    samlconstants::SAML20_NS,AuthnQueryDescriptorType::LOCAL_NAME,samlconstants::SAML20_PREFIX,&schemaType

                     );
             }
             /** Builder that allows element/type override. */
                     );
             }
             /** Builder that allows element/type override. */


@@ -552,7 +552,7 @@ namespace opensaml {
             /** Singleton builder. */
             static AuthnQueryDescriptorType* buildAuthnQueryDescriptorType() {
                 const AuthnQueryDescriptorTypeBuilder* b = dynamic_cast<const AuthnQueryDescriptorTypeBuilder*>(
             /** Singleton builder. */
             static AuthnQueryDescriptorType* buildAuthnQueryDescriptorType() {
                 const AuthnQueryDescriptorTypeBuilder* b = dynamic_cast<const AuthnQueryDescriptorTypeBuilder*>(

-                    XMLObjectBuilder::getBuilder(xmltooling::QName(SAMLConstants::SAML20MD_QUERY_EXT_NS,AuthnQueryDescriptorType::TYPE_NAME))
+                    XMLObjectBuilder::getBuilder(xmltooling::QName(samlconstants::SAML20MD_QUERY_EXT_NS,AuthnQueryDescriptorType::TYPE_NAME))

                     );
                 if (b)
                     return b->buildObject();
                     );
                 if (b)
                     return b->buildObject();


@@ -572,10 +572,10 @@ namespace opensaml {
             /** Default builder. */
             virtual AttributeQueryDescriptorType* buildObject() const {
                 xmltooling::QName schemaType(
             /** Default builder. */
             virtual AttributeQueryDescriptorType* buildObject() const {
                 xmltooling::QName schemaType(

-                    SAMLConstants::SAML20_NS,AttributeQueryDescriptorType::TYPE_NAME,SAMLConstants::SAML20MD_QUERY_EXT_PREFIX
+                    samlconstants::SAML20_NS,AttributeQueryDescriptorType::TYPE_NAME,samlconstants::SAML20MD_QUERY_EXT_PREFIX

                     );
                 return buildObject(
                     );
                 return buildObject(

-                    SAMLConstants::SAML20_NS,AttributeQueryDescriptorType::LOCAL_NAME,SAMLConstants::SAML20_PREFIX,&schemaType
+                    samlconstants::SAML20_NS,AttributeQueryDescriptorType::LOCAL_NAME,samlconstants::SAML20_PREFIX,&schemaType

                     );
             }
             /** Builder that allows element/type override. */
                     );
             }
             /** Builder that allows element/type override. */


@@ -586,7 +586,7 @@ namespace opensaml {
             /** Singleton builder. */
             static AttributeQueryDescriptorType* buildAttributeQueryDescriptorType() {
                 const AttributeQueryDescriptorTypeBuilder* b = dynamic_cast<const AttributeQueryDescriptorTypeBuilder*>(
             /** Singleton builder. */
             static AttributeQueryDescriptorType* buildAttributeQueryDescriptorType() {
                 const AttributeQueryDescriptorTypeBuilder* b = dynamic_cast<const AttributeQueryDescriptorTypeBuilder*>(

-                    XMLObjectBuilder::getBuilder(xmltooling::QName(SAMLConstants::SAML20MD_QUERY_EXT_NS,AttributeQueryDescriptorType::TYPE_NAME))
+                    XMLObjectBuilder::getBuilder(xmltooling::QName(samlconstants::SAML20MD_QUERY_EXT_NS,AttributeQueryDescriptorType::TYPE_NAME))

                     );
                 if (b)
                     return b->buildObject();
                     );
                 if (b)
                     return b->buildObject();


@@ -606,10 +606,10 @@ namespace opensaml {
             /** Default builder. */
             virtual AuthzDecisionQueryDescriptorType* buildObject() const {
                 xmltooling::QName schemaType(
             /** Default builder. */
             virtual AuthzDecisionQueryDescriptorType* buildObject() const {
                 xmltooling::QName schemaType(

-                    SAMLConstants::SAML20_NS,AuthzDecisionQueryDescriptorType::TYPE_NAME,SAMLConstants::SAML20MD_QUERY_EXT_PREFIX
+                    samlconstants::SAML20_NS,AuthzDecisionQueryDescriptorType::TYPE_NAME,samlconstants::SAML20MD_QUERY_EXT_PREFIX

                     );
                 return buildObject(
                     );
                 return buildObject(

-                    SAMLConstants::SAML20_NS,AuthzDecisionQueryDescriptorType::LOCAL_NAME,SAMLConstants::SAML20_PREFIX,&schemaType
+                    samlconstants::SAML20_NS,AuthzDecisionQueryDescriptorType::LOCAL_NAME,samlconstants::SAML20_PREFIX,&schemaType

                     );
             }
             /** Builder that allows element/type override. */
                     );
             }
             /** Builder that allows element/type override. */


@@ -620,7 +620,7 @@ namespace opensaml {
             /** Singleton builder. */
             static AuthzDecisionQueryDescriptorType* buildAuthzDecisionQueryDescriptorType() {
                 const AuthzDecisionQueryDescriptorTypeBuilder* b = dynamic_cast<const AuthzDecisionQueryDescriptorTypeBuilder*>(
             /** Singleton builder. */
             static AuthzDecisionQueryDescriptorType* buildAuthzDecisionQueryDescriptorType() {
                 const AuthzDecisionQueryDescriptorTypeBuilder* b = dynamic_cast<const AuthzDecisionQueryDescriptorTypeBuilder*>(

-                    XMLObjectBuilder::getBuilder(xmltooling::QName(SAMLConstants::SAML20MD_QUERY_EXT_NS,AuthzDecisionQueryDescriptorType::TYPE_NAME))
+                    XMLObjectBuilder::getBuilder(xmltooling::QName(samlconstants::SAML20MD_QUERY_EXT_NS,AuthzDecisionQueryDescriptorType::TYPE_NAME))

                     );
                 if (b)
                     return b->buildObject();
                     );
                 if (b)
                     return b->buildObject();

diff --git a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
index 6584a3e..e113094 100644 (file)
--- a/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
@@ -80,7 +80,7 @@ void AbstractMetadataProvider::index(EntityDescriptor* site, time_t validUntil)
     const vector<IDPSSODescriptor*>& roles=const_cast<const EntityDescriptor*>(site)->getIDPSSODescriptors();
     for (vector<IDPSSODescriptor*>::const_iterator i=roles.begin(); i!=roles.end(); i++) {
         // SAML 1.x?
     const vector<IDPSSODescriptor*>& roles=const_cast<const EntityDescriptor*>(site)->getIDPSSODescriptors();
     for (vector<IDPSSODescriptor*>::const_iterator i=roles.begin(); i!=roles.end(); i++) {
         // SAML 1.x?

-        if ((*i)->hasSupport(SAMLConstants::SAML10_PROTOCOL_ENUM) || (*i)->hasSupport(SAMLConstants::SAML11_PROTOCOL_ENUM)) {
+        if ((*i)->hasSupport(samlconstants::SAML10_PROTOCOL_ENUM) || (*i)->hasSupport(samlconstants::SAML11_PROTOCOL_ENUM)) {

             // Check for SourceID extension element.
             const Extensions* exts=(*i)->getExtensions();
             if (exts) {
             // Check for SourceID extension element.
             const Extensions* exts=(*i)->getExtensions();
             if (exts) {


@@ -112,7 +112,7 @@ void AbstractMetadataProvider::index(EntityDescriptor* site, time_t validUntil)
         }
         
         // SAML 2.0?
         }
         
         // SAML 2.0?

-        if ((*i)->hasSupport(SAMLConstants::SAML20P_NS)) {
+        if ((*i)->hasSupport(samlconstants::SAML20P_NS)) {

             // Hash the ID.
             m_sources.insert(
                 pair<string,const EntityDescriptor*>(SAMLConfig::getConfig().hashSHA1(id.get(), true),site)
             // Hash the ID.
             m_sources.insert(
                 pair<string,const EntityDescriptor*>(SAMLConfig::getConfig().hashSHA1(id.get(), true),site)

diff --git a/saml/saml2/metadata/impl/FilesystemMetadataProvider.cpp b/saml/saml2/metadata/impl/FilesystemMetadataProvider.cpp
index 8651747..97bc35f 100644 (file)
--- a/saml/saml2/metadata/impl/FilesystemMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/FilesystemMetadataProvider.cpp
@@ -118,7 +118,7 @@ FilesystemMetadataProvider::FilesystemMetadataProvider(const DOMElement* e)
     
     if (source && *source) {
         const XMLCh* valflag=e->getAttributeNS(NULL,validate);
     
     if (source && *source) {
         const XMLCh* valflag=e->getAttributeNS(NULL,validate);

-        m_validate=(XMLString::equals(valflag,XMLConstants::XML_TRUE) || XMLString::equals(valflag,XMLConstants::XML_ONE));
+        m_validate=(XMLString::equals(valflag,xmlconstants::XML_TRUE) || XMLString::equals(valflag,xmlconstants::XML_ONE));

         
         auto_ptr_char temp(source);
         m_source=temp.get();
         
         auto_ptr_char temp(source);
         m_source=temp.get();

diff --git a/saml/saml2/metadata/impl/MetadataImpl.cpp b/saml/saml2/metadata/impl/MetadataImpl.cpp
index 5548964..372a34a 100644 (file)
--- a/saml/saml2/metadata/impl/MetadataImpl.cpp
+++ b/saml/saml2/metadata/impl/MetadataImpl.cpp
@@ -42,6 +42,10 @@ using namespace xmlencryption;
 using namespace xmlsignature;
 using namespace xmltooling;
 using namespace std;
 using namespace xmlsignature;
 using namespace xmltooling;
 using namespace std;

+using xmlconstants::XMLSIG_NS;
+using xmlconstants::XML_BOOL_NULL;
+using samlconstants::SAML20_NS;
+using samlconstants::SAML20MD_NS;

 
 #if defined (_MSC_VER)
     #pragma warning( push )
 
 #if defined (_MSC_VER)
     #pragma warning( push )


@@ -99,11 +103,11 @@ namespace opensaml {
     
         protected:
             void marshallAttributes(DOMElement* domElement) const {
     
         protected:
             void marshallAttributes(DOMElement* domElement) const {

-                MARSHALL_STRING_ATTRIB(Lang,LANG,XMLConstants::XML_NS);
+                MARSHALL_STRING_ATTRIB(Lang,LANG,xmlconstants::XML_NS);

             }
 
             void processAttribute(const DOMAttr* attribute) {
             }
 
             void processAttribute(const DOMAttr* attribute) {

-                PROC_STRING_ATTRIB(Lang,LANG,XMLConstants::XML_NS);
+                PROC_STRING_ATTRIB(Lang,LANG,xmlconstants::XML_NS);

                 AbstractXMLObjectUnmarshaller::processAttribute(attribute);
             }
         };
                 AbstractXMLObjectUnmarshaller::processAttribute(attribute);
             }
         };


@@ -144,11 +148,11 @@ namespace opensaml {
     
         protected:
             void marshallAttributes(DOMElement* domElement) const {
     
         protected:
             void marshallAttributes(DOMElement* domElement) const {

-                MARSHALL_STRING_ATTRIB(Lang,LANG,XMLConstants::XML_NS);
+                MARSHALL_STRING_ATTRIB(Lang,LANG,xmlconstants::XML_NS);

             }
 
             void processAttribute(const DOMAttr* attribute) {
             }
 
             void processAttribute(const DOMAttr* attribute) {

-                PROC_STRING_ATTRIB(Lang,LANG,XMLConstants::XML_NS);
+                PROC_STRING_ATTRIB(Lang,LANG,xmlconstants::XML_NS);

                 AbstractXMLObjectUnmarshaller::processAttribute(attribute);
             }
         };
                 AbstractXMLObjectUnmarshaller::processAttribute(attribute);
             }
         };


@@ -261,7 +265,7 @@ namespace opensaml {
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
                 // Unknown child.
                 const XMLCh* nsURI=root->getNamespaceURI();
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
                 // Unknown child.
                 const XMLCh* nsURI=root->getNamespaceURI();

-                if (!XMLString::equals(nsURI,SAMLConstants::SAML20MD_NS) && nsURI && *nsURI) {
+                if (!XMLString::equals(nsURI,SAML20MD_NS) && nsURI && *nsURI) {

                     getXMLObjects().push_back(childXMLObject);
                     return;
                 }
                     getXMLObjects().push_back(childXMLObject);
                     return;
                 }


@@ -337,10 +341,10 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Extensions,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(OrganizationName,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(OrganizationDisplayName,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(OrganizationURL,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_CHILD(Extensions,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(OrganizationName,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(OrganizationDisplayName,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(OrganizationURL,SAML20MD_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -440,12 +444,12 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILD(Extensions,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILD(Company,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILD(GivenName,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILD(SurName,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(EmailAddress,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(TelephoneNumber,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_CHILD(Extensions,SAML20MD_NS,false);
+                PROC_TYPED_CHILD(Company,SAML20MD_NS,false);
+                PROC_TYPED_CHILD(GivenName,SAML20MD_NS,false);
+                PROC_TYPED_CHILD(SurName,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(EmailAddress,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(TelephoneNumber,SAML20MD_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -540,8 +544,8 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(KeyInfo,xmlsignature,XMLConstants::XMLSIG_NS,false);
-                PROC_TYPED_FOREIGN_CHILDREN(EncryptionMethod,xmlencryption,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(KeyInfo,xmlsignature,XMLSIG_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(EncryptionMethod,xmlencryption,SAML20MD_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -624,7 +628,7 @@ namespace opensaml {
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
                 // Unknown child.
                 const XMLCh* nsURI=root->getNamespaceURI();
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
                 // Unknown child.
                 const XMLCh* nsURI=root->getNamespaceURI();

-                if (!XMLString::equals(nsURI,SAMLConstants::SAML20MD_NS) && nsURI && *nsURI) {
+                if (!XMLString::equals(nsURI,SAML20MD_NS) && nsURI && *nsURI) {

                     getXMLObjects().push_back(childXMLObject);
                     return;
                 }
                     getXMLObjects().push_back(childXMLObject);
                     return;
                 }


@@ -640,7 +644,7 @@ namespace opensaml {
         {
             void init() {
                 m_Index=NULL;
         {
             void init() {
                 m_Index=NULL;

-                m_isDefault=XMLConstants::XML_BOOL_NULL;
+                m_isDefault=XML_BOOL_NULL;

             }
         
         protected:
             }
         
         protected:


@@ -1031,11 +1035,11 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLConstants::XMLSIG_NS,false);
-                PROC_TYPED_CHILD(Extensions,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(KeyDescriptor,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILD(Organization,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(ContactPerson,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLSIG_NS,false);
+                PROC_TYPED_CHILD(Extensions,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(KeyDescriptor,SAML20MD_NS,false);
+                PROC_TYPED_CHILD(Organization,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(ContactPerson,SAML20MD_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -1115,10 +1119,10 @@ namespace opensaml {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(ArtifactResolutionService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(SingleLogoutService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(ManageNameIDService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(NameIDFormat,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(ArtifactResolutionService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(SingleLogoutService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(ManageNameIDService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(NameIDFormat,SAML20MD_NS,false);

                 RoleDescriptorImpl::processChildElement(childXMLObject,root);
             }
         };
                 RoleDescriptorImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1131,7 +1135,7 @@ namespace opensaml {
             list<XMLObject*>::iterator m_pos_AttributeProfile;
             
             void init() {
             list<XMLObject*>::iterator m_pos_AttributeProfile;
             
             void init() {

-                m_WantAuthnRequestsSigned=XMLConstants::XML_BOOL_NULL;
+                m_WantAuthnRequestsSigned=XML_BOOL_NULL;

                 m_children.push_back(NULL);
                 m_children.push_back(NULL);
                 m_children.push_back(NULL);
                 m_children.push_back(NULL);
                 m_children.push_back(NULL);
                 m_children.push_back(NULL);


@@ -1221,11 +1225,11 @@ namespace opensaml {
             }
             
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
             
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(SingleSignOnService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(NameIDMappingService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AssertionIDRequestService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AttributeProfile,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_FOREIGN_CHILDREN(Attribute,saml2,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILDREN(SingleSignOnService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(NameIDMappingService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AssertionIDRequestService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AttributeProfile,SAML20MD_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(Attribute,saml2,SAML20_NS,false);

                 SSODescriptorTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 SSODescriptorTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1239,7 +1243,7 @@ namespace opensaml {
         {
             void init() {
                 m_Name=m_NameFormat=m_FriendlyName=NULL;
         {
             void init() {
                 m_Name=m_NameFormat=m_FriendlyName=NULL;

-                m_isRequired=XMLConstants::XML_BOOL_NULL;
+                m_isRequired=XML_BOOL_NULL;

             }
         public:
             virtual ~RequestedAttributeImpl() {
             }
         public:
             virtual ~RequestedAttributeImpl() {


@@ -1331,7 +1335,7 @@ namespace opensaml {
             
                void init() {
                 m_Index=NULL;
             
                void init() {
                 m_Index=NULL;

-                m_isDefault=XMLConstants::XML_BOOL_NULL;
+                m_isDefault=XML_BOOL_NULL;

                 m_children.push_back(NULL);
                 m_children.push_back(NULL);
                 m_pos_ServiceDescription=m_children.begin();
                 m_children.push_back(NULL);
                 m_children.push_back(NULL);
                 m_pos_ServiceDescription=m_children.begin();


@@ -1388,9 +1392,9 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(ServiceName,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(ServiceDescription,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(RequestedAttribute,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(ServiceName,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(ServiceDescription,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(RequestedAttribute,SAML20MD_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -1406,8 +1410,8 @@ namespace opensaml {
             list<XMLObject*>::iterator m_pos_AssertionConsumerService;
             
             void init() {
             list<XMLObject*>::iterator m_pos_AssertionConsumerService;
             
             void init() {

-                m_AuthnRequestsSigned=XMLConstants::XML_BOOL_NULL;
-                m_WantAssertionsSigned=XMLConstants::XML_BOOL_NULL;
+                m_AuthnRequestsSigned=XML_BOOL_NULL;
+                m_WantAssertionsSigned=XML_BOOL_NULL;

                 m_children.push_back(NULL);
                 m_pos_AssertionConsumerService=m_pos_NameIDFormat;
                 ++m_pos_AssertionConsumerService;
                 m_children.push_back(NULL);
                 m_pos_AssertionConsumerService=m_pos_NameIDFormat;
                 ++m_pos_AssertionConsumerService;


@@ -1474,8 +1478,8 @@ namespace opensaml {
             }
             
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
             
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AssertionConsumerService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AttributeConsumingService,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AssertionConsumerService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AttributeConsumingService,SAML20MD_NS,false);

                 SSODescriptorTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 SSODescriptorTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1535,9 +1539,9 @@ namespace opensaml {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AuthnQueryService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AssertionIDRequestService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(NameIDFormat,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AuthnQueryService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AssertionIDRequestService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(NameIDFormat,SAML20MD_NS,false);

                 RoleDescriptorImpl::processChildElement(childXMLObject,root);
             }
         };
                 RoleDescriptorImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1597,9 +1601,9 @@ namespace opensaml {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AuthzService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AssertionIDRequestService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(NameIDFormat,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AuthzService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AssertionIDRequestService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(NameIDFormat,SAML20MD_NS,false);

                 RoleDescriptorImpl::processChildElement(childXMLObject,root);
             }
         };
                 RoleDescriptorImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1681,11 +1685,11 @@ namespace opensaml {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AttributeService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AssertionIDRequestService,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(NameIDFormat,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AttributeProfile,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_FOREIGN_CHILDREN(Attribute,saml2,SAMLConstants::SAML20_NS,false);
+                PROC_TYPED_CHILDREN(AttributeService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AssertionIDRequestService,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(NameIDFormat,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AttributeProfile,SAML20MD_NS,false);
+                PROC_TYPED_FOREIGN_CHILDREN(Attribute,saml2,SAML20_NS,false);

                 RoleDescriptorImpl::processChildElement(childXMLObject,root);
             }
         };
                 RoleDescriptorImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1693,7 +1697,7 @@ namespace opensaml {
         class SAML_DLLLOCAL QueryDescriptorTypeImpl : public virtual QueryDescriptorType, public RoleDescriptorImpl
         {
             void init() {
         class SAML_DLLLOCAL QueryDescriptorTypeImpl : public virtual QueryDescriptorType, public RoleDescriptorImpl
         {
             void init() {

-                m_WantAssertionsSigned=XMLConstants::XML_BOOL_NULL;
+                m_WantAssertionsSigned=XML_BOOL_NULL;

                 m_children.push_back(NULL);
                 m_pos_NameIDFormat=m_pos_ContactPerson;
                 ++m_pos_NameIDFormat;
                 m_children.push_back(NULL);
                 m_pos_NameIDFormat=m_pos_ContactPerson;
                 ++m_pos_NameIDFormat;


@@ -1745,7 +1749,7 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(NameIDFormat,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(NameIDFormat,SAML20MD_NS,false);

                 RoleDescriptorImpl::processChildElement(childXMLObject,root);
             }
         };
                 RoleDescriptorImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1799,7 +1803,7 @@ namespace opensaml {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(AttributeConsumingService,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AttributeConsumingService,SAML20MD_NS,false);

                 QueryDescriptorTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 QueryDescriptorTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1834,7 +1838,7 @@ namespace opensaml {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
 
         protected:
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_CHILDREN(ActionNamespace,SAMLConstants::SAML20MD_QUERY_EXT_NS,false);
+                PROC_TYPED_CHILDREN(ActionNamespace,samlconstants::SAML20MD_QUERY_EXT_NS,false);

                 QueryDescriptorTypeImpl::processChildElement(childXMLObject,root);
             }
         };
                 QueryDescriptorTypeImpl::processChildElement(childXMLObject,root);
             }
         };


@@ -1964,10 +1968,10 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLConstants::XMLSIG_NS,false);
-                PROC_TYPED_CHILD(Extensions,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AffiliateMember,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(KeyDescriptor,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLSIG_NS,false);
+                PROC_TYPED_CHILD(Extensions,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AffiliateMember,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(KeyDescriptor,SAML20MD_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -2240,7 +2244,7 @@ namespace opensaml {
             const RoleDescriptor* getRoleDescriptor(const xmltooling::QName& qname, const XMLCh* protocol) const {
                 // Check for "known" elements/types.
                 QName q;
             const RoleDescriptor* getRoleDescriptor(const xmltooling::QName& qname, const XMLCh* protocol) const {
                 // Check for "known" elements/types.
                 QName q;

-                q.setNamespaceURI(SAMLConstants::SAML20MD_NS);
+                q.setNamespaceURI(SAML20MD_NS);

                 q.setLocalPart(IDPSSODescriptor::LOCAL_NAME);
                 if (q == qname)
                     return getIDPSSODescriptor(protocol);
                 q.setLocalPart(IDPSSODescriptor::LOCAL_NAME);
                 if (q == qname)
                     return getIDPSSODescriptor(protocol);


@@ -2256,7 +2260,7 @@ namespace opensaml {
                 q.setLocalPart(PDPDescriptor::LOCAL_NAME);
                 if (q == qname)
                     return getPDPDescriptor(protocol);
                 q.setLocalPart(PDPDescriptor::LOCAL_NAME);
                 if (q == qname)
                     return getPDPDescriptor(protocol);

-                q.setNamespaceURI(SAMLConstants::SAML20MD_QUERY_EXT_NS);
+                q.setNamespaceURI(samlconstants::SAML20MD_QUERY_EXT_NS);

                 q.setLocalPart(AuthnQueryDescriptorType::TYPE_NAME);
                 if (q == qname)
                     return getAuthnQueryDescriptorType(protocol);
                 q.setLocalPart(AuthnQueryDescriptorType::TYPE_NAME);
                 if (q == qname)
                     return getAuthnQueryDescriptorType(protocol);


@@ -2284,21 +2288,21 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLConstants::XMLSIG_NS,false);
-                PROC_TYPED_CHILD(Extensions,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(IDPSSODescriptor,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(SPSSODescriptor,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AuthnAuthorityDescriptor,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AttributeAuthorityDescriptor,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(PDPDescriptor,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AuthnQueryDescriptorType,SAMLConstants::SAML20MD_QUERY_EXT_NS,false);
-                PROC_TYPED_CHILDREN(AttributeQueryDescriptorType,SAMLConstants::SAML20MD_QUERY_EXT_NS,false);
-                PROC_TYPED_CHILDREN(AuthzDecisionQueryDescriptorType,SAMLConstants::SAML20MD_QUERY_EXT_NS,false);
-                PROC_TYPED_CHILDREN(RoleDescriptor,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILD(AffiliationDescriptor,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILD(Organization,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(ContactPerson,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(AdditionalMetadataLocation,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLSIG_NS,false);
+                PROC_TYPED_CHILD(Extensions,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(IDPSSODescriptor,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(SPSSODescriptor,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AuthnAuthorityDescriptor,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AttributeAuthorityDescriptor,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(PDPDescriptor,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AuthnQueryDescriptorType,samlconstants::SAML20MD_QUERY_EXT_NS,false);
+                PROC_TYPED_CHILDREN(AttributeQueryDescriptorType,samlconstants::SAML20MD_QUERY_EXT_NS,false);
+                PROC_TYPED_CHILDREN(AuthzDecisionQueryDescriptorType,samlconstants::SAML20MD_QUERY_EXT_NS,false);
+                PROC_TYPED_CHILDREN(RoleDescriptor,SAML20MD_NS,false);
+                PROC_TYPED_CHILD(AffiliationDescriptor,SAML20MD_NS,false);
+                PROC_TYPED_CHILD(Organization,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(ContactPerson,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(AdditionalMetadataLocation,SAML20MD_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 


@@ -2406,10 +2410,10 @@ namespace opensaml {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
             }
 
             void processChildElement(XMLObject* childXMLObject, const DOMElement* root) {

-                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLConstants::XMLSIG_NS,false);
-                PROC_TYPED_CHILD(Extensions,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(EntityDescriptor,SAMLConstants::SAML20MD_NS,false);
-                PROC_TYPED_CHILDREN(EntitiesDescriptor,SAMLConstants::SAML20MD_NS,false);
+                PROC_TYPED_FOREIGN_CHILD(Signature,xmlsignature,XMLSIG_NS,false);
+                PROC_TYPED_CHILD(Extensions,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(EntityDescriptor,SAML20MD_NS,false);
+                PROC_TYPED_CHILDREN(EntitiesDescriptor,SAML20MD_NS,false);

                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 
                 AbstractXMLObjectUnmarshaller::processChildElement(childXMLObject,root);
             }
 

diff --git a/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp b/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
index 5516158..179dd76 100644 (file)
--- a/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
+++ b/saml/saml2/metadata/impl/MetadataSchemaValidators.cpp
@@ -31,6 +31,8 @@ using namespace opensaml::saml2;
 using namespace opensaml;
 using namespace xmltooling;
 using namespace std;
 using namespace opensaml;
 using namespace xmltooling;
 using namespace std;

+using samlconstants::SAML20MD_NS;
+using samlconstants::SAML20MD_QUERY_EXT_NS;

 
 namespace opensaml {
     namespace saml2md {
 
 namespace opensaml {
     namespace saml2md {


@@ -72,7 +74,7 @@ namespace opensaml {
         public:
             void operator()(const XMLObject* xmlObject) const {
                 const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();
         public:
             void operator()(const XMLObject* xmlObject) const {
                 const XMLCh* ns=xmlObject->getElementQName().getNamespaceURI();

-                if (XMLString::equals(ns,SAMLConstants::SAML20MD_NS) || !ns || !*ns) {
+                if (XMLString::equals(ns,SAML20MD_NS) || !ns || !*ns) {

                     throw ValidationException(
                         "Object contains an illegal extension child element ($1).",
                         params(1,xmlObject->getElementQName().toString().c_str())
                     throw ValidationException(
                         "Object contains an illegal extension child element ($1).",
                         params(1,xmlObject->getElementQName().toString().c_str())


@@ -247,21 +249,21 @@ namespace opensaml {
 };
 
 #define REGISTER_ELEMENT(cname) \
 };
 
 #define REGISTER_ELEMENT(cname) \

-    q=QName(SAMLConstants::SAML20MD_NS,cname::LOCAL_NAME); \
+    q=QName(SAML20MD_NS,cname::LOCAL_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(cname) \

-    q=QName(SAMLConstants::SAML20MD_NS,cname::TYPE_NAME); \
+    q=QName(SAML20MD_NS,cname::TYPE_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
     SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(cname) \

-    q=QName(SAMLConstants::SAML20MD_NS,cname::LOCAL_NAME); \
+    q=QName(SAML20MD_NS,cname::LOCAL_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
     
 #define REGISTER_TYPE_NOVAL(cname) \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
     
 #define REGISTER_TYPE_NOVAL(cname) \

-    q=QName(SAMLConstants::SAML20MD_NS,cname::TYPE_NAME); \
+    q=QName(SAML20MD_NS,cname::TYPE_NAME); \

     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
 void opensaml::saml2md::registerMetadataClasses() {
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
 void opensaml::saml2md::registerMetadataClasses() {


@@ -324,23 +326,23 @@ void opensaml::saml2md::registerMetadataClasses() {
     REGISTER_TYPE(RequestedAttribute);
     REGISTER_TYPE(SPSSODescriptor);
 
     REGISTER_TYPE(RequestedAttribute);
     REGISTER_TYPE(SPSSODescriptor);
 

-    q=QName(SAMLConstants::SAML1MD_NS,SourceID::LOCAL_NAME);
+    q=QName(samlconstants::SAML1MD_NS,SourceID::LOCAL_NAME);

     XMLObjectBuilder::registerBuilder(q,new SourceIDBuilder());
     SchemaValidators.registerValidator(q,new SourceIDSchemaValidator());
 
     XMLObjectBuilder::registerBuilder(q,new SourceIDBuilder());
     SchemaValidators.registerValidator(q,new SourceIDSchemaValidator());
 

-    q=QName(SAMLConstants::SAML20MD_QUERY_EXT_NS,ActionNamespace::LOCAL_NAME);
+    q=QName(SAML20MD_QUERY_EXT_NS,ActionNamespace::LOCAL_NAME);

     XMLObjectBuilder::registerBuilder(q,new ActionNamespaceBuilder());
     SchemaValidators.registerValidator(q,new ActionNamespaceSchemaValidator());
 
     XMLObjectBuilder::registerBuilder(q,new ActionNamespaceBuilder());
     SchemaValidators.registerValidator(q,new ActionNamespaceSchemaValidator());
 

-    q=QName(SAMLConstants::SAML20MD_QUERY_EXT_NS,AuthnQueryDescriptorType::TYPE_NAME);
+    q=QName(SAML20MD_QUERY_EXT_NS,AuthnQueryDescriptorType::TYPE_NAME);

     XMLObjectBuilder::registerBuilder(q,new AuthnQueryDescriptorTypeBuilder());
     SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
 
     XMLObjectBuilder::registerBuilder(q,new AuthnQueryDescriptorTypeBuilder());
     SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
 

-    q=QName(SAMLConstants::SAML20MD_QUERY_EXT_NS,AttributeQueryDescriptorType::TYPE_NAME);
+    q=QName(SAML20MD_QUERY_EXT_NS,AttributeQueryDescriptorType::TYPE_NAME);

     XMLObjectBuilder::registerBuilder(q,new AttributeQueryDescriptorTypeBuilder());
     SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
 
     XMLObjectBuilder::registerBuilder(q,new AttributeQueryDescriptorTypeBuilder());
     SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
 

-    q=QName(SAMLConstants::SAML20MD_QUERY_EXT_NS,AuthzDecisionQueryDescriptorType::TYPE_NAME);
+    q=QName(SAML20MD_QUERY_EXT_NS,AuthzDecisionQueryDescriptorType::TYPE_NAME);

     XMLObjectBuilder::registerBuilder(q,new AuthzDecisionQueryDescriptorTypeBuilder());
     SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
 }
     XMLObjectBuilder::registerBuilder(q,new AuthzDecisionQueryDescriptorTypeBuilder());
     SchemaValidators.registerValidator(q,new RoleDescriptorSchemaValidator());
 }

diff --git a/saml/util/SAMLConstants.cpp b/saml/util/SAMLConstants.cpp
index 08dfdd9..7c790d9 100644 (file)
--- a/saml/util/SAMLConstants.cpp
+++ b/saml/util/SAMLConstants.cpp
@@ -15,87 +15,87 @@
  */
 
 /**
  */
 
 /**

- * SAMLConstants.cpp
+ * samlconstants.cpp

  * 
  * SAML XML namespace constants 
  */
 
 
 #include "internal.h"
  * 
  * SAML XML namespace constants 
  */
 
 
 #include "internal.h"

-#include "util/SAMLConstants.h"
+#include "util/samlconstants.h"

 #include <xercesc/util/XMLUniDefs.hpp>
 
 using namespace xercesc;
 #include <xercesc/util/XMLUniDefs.hpp>
 
 using namespace xercesc;

-using namespace opensaml;
+using namespace samlconstants;

 
 

-const XMLCh SAMLConstants::PAOS_NS[] = // urn:liberty:paos:2003-08
+const XMLCh samlconstants::PAOS_NS[] = // urn:liberty:paos:2003-08

 { chLatin_u, chLatin_r, chLatin_n, chColon,
   chLatin_l, chLatin_i, chLatin_b, chLatin_e, chLatin_r, chLatin_t, chLatin_y, chColon,
   chLatin_p, chLatin_a, chLatin_o, chLatin_s, chColon,
   chDigit_2, chDigit_0, chDigit_0, chDigit_3, chDash, chDigit_0, chDigit_8, chNull
 };
 
 { chLatin_u, chLatin_r, chLatin_n, chColon,
   chLatin_l, chLatin_i, chLatin_b, chLatin_e, chLatin_r, chLatin_t, chLatin_y, chColon,
   chLatin_p, chLatin_a, chLatin_o, chLatin_s, chColon,
   chDigit_2, chDigit_0, chDigit_0, chDigit_3, chDash, chDigit_0, chDigit_8, chNull
 };
 

-const XMLCh SAMLConstants::PAOS_PREFIX[] = UNICODE_LITERAL_4(p,a,o,s);
+const XMLCh samlconstants::PAOS_PREFIX[] = UNICODE_LITERAL_4(p,a,o,s);

 
 

-const XMLCh SAMLConstants::SAML1_NS[] = // urn:oasis:names:tc:SAML:1.0:assertion
+const XMLCh samlconstants::SAML1_NS[] = // urn:oasis:names:tc:SAML:1.0:assertion

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_1, chPeriod, chDigit_0, chColon,
   chLatin_a, chLatin_s, chLatin_s, chLatin_e, chLatin_r, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
 };
 
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_1, chPeriod, chDigit_0, chColon,
   chLatin_a, chLatin_s, chLatin_s, chLatin_e, chLatin_r, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
 };
 

-const XMLCh SAMLConstants::SAML1P_NS[] = // urn:oasis:names:tc:SAML:1.0:protocol
+const XMLCh samlconstants::SAML1P_NS[] = // urn:oasis:names:tc:SAML:1.0:protocol

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_1, chPeriod, chDigit_0, chColon,
   chLatin_p, chLatin_r, chLatin_o, chLatin_t, chLatin_o, chLatin_c, chLatin_o, chLatin_l, chNull
 };
 
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_1, chPeriod, chDigit_0, chColon,
   chLatin_p, chLatin_r, chLatin_o, chLatin_t, chLatin_o, chLatin_c, chLatin_o, chLatin_l, chNull
 };
 

-const XMLCh SAMLConstants::SAML1_PREFIX[] = UNICODE_LITERAL_4(s,a,m,l);
+const XMLCh samlconstants::SAML1_PREFIX[] = UNICODE_LITERAL_4(s,a,m,l);

 
 

-const XMLCh SAMLConstants::SAML1P_PREFIX[] = UNICODE_LITERAL_5(s,a,m,l,p);
+const XMLCh samlconstants::SAML1P_PREFIX[] = UNICODE_LITERAL_5(s,a,m,l,p);

 
 

-const XMLCh SAMLConstants::SAML20_VERSION[] = // 2.0
+const XMLCh samlconstants::SAML20_VERSION[] = // 2.0

 { chDigit_2, chPeriod, chDigit_0, chNull
 };
 
 { chDigit_2, chPeriod, chDigit_0, chNull
 };
 

-const XMLCh SAMLConstants::SAML20_NS[] = // urn:oasis:names:tc:SAML:2.0:assertion
+const XMLCh samlconstants::SAML20_NS[] = // urn:oasis:names:tc:SAML:2.0:assertion

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
   chLatin_a, chLatin_s, chLatin_s, chLatin_e, chLatin_r, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
 };
 
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
   chLatin_a, chLatin_s, chLatin_s, chLatin_e, chLatin_r, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
 };
 

-const XMLCh SAMLConstants::SAML20P_NS[] = // urn:oasis:names:tc:SAML:2.0:protocol
+const XMLCh samlconstants::SAML20P_NS[] = // urn:oasis:names:tc:SAML:2.0:protocol

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
   chLatin_p, chLatin_r, chLatin_o, chLatin_t, chLatin_o, chLatin_c, chLatin_o, chLatin_l, chNull
 };
 
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
   chLatin_p, chLatin_r, chLatin_o, chLatin_t, chLatin_o, chLatin_c, chLatin_o, chLatin_l, chNull
 };
 

-const XMLCh SAMLConstants::SAML20MD_NS[] = // urn:oasis:names:tc:SAML:2.0:metadata
+const XMLCh samlconstants::SAML20MD_NS[] = // urn:oasis:names:tc:SAML:2.0:metadata

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
   chLatin_m, chLatin_e, chLatin_t, chLatin_a, chLatin_d, chLatin_a, chLatin_t, chLatin_a, chNull
 };
 
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
   chLatin_m, chLatin_e, chLatin_t, chLatin_a, chLatin_d, chLatin_a, chLatin_t, chLatin_a, chNull
 };
 

-const XMLCh SAMLConstants::SAML20AC_NS[] = // urn:oasis:names:tc:SAML:2.0:ac
+const XMLCh samlconstants::SAML20AC_NS[] = // urn:oasis:names:tc:SAML:2.0:ac

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
   chLatin_a, chLatin_c, chNull
 };
 
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
   chLatin_a, chLatin_c, chNull
 };
 

-const XMLCh SAMLConstants::SAML20_PREFIX[] = UNICODE_LITERAL_4(s,a,m,l);
+const XMLCh samlconstants::SAML20_PREFIX[] = UNICODE_LITERAL_4(s,a,m,l);

 
 

-const XMLCh SAMLConstants::SAML20P_PREFIX[] = UNICODE_LITERAL_5(s,a,m,l,p);
+const XMLCh samlconstants::SAML20P_PREFIX[] = UNICODE_LITERAL_5(s,a,m,l,p);

 
 

-const XMLCh SAMLConstants::SAML20MD_PREFIX[] = UNICODE_LITERAL_2(m,d);
+const XMLCh samlconstants::SAML20MD_PREFIX[] = UNICODE_LITERAL_2(m,d);

 
 

-const XMLCh SAMLConstants::SAML20AC_PREFIX[] = UNICODE_LITERAL_2(a,c);
+const XMLCh samlconstants::SAML20AC_PREFIX[] = UNICODE_LITERAL_2(a,c);

 
 

-const XMLCh SAMLConstants::SAML20ECP_NS[] = // urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp
+const XMLCh samlconstants::SAML20ECP_NS[] = // urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,


@@ -103,9 +103,9 @@ const XMLCh SAMLConstants::SAML20ECP_NS[] = // urn:oasis:names:tc:SAML:2.0:profi
   chLatin_S, chLatin_S, chLatin_O, chColon, chLatin_e, chLatin_c, chLatin_p, chNull
 };
 
   chLatin_S, chLatin_S, chLatin_O, chColon, chLatin_e, chLatin_c, chLatin_p, chNull
 };
 

-const XMLCh SAMLConstants::SAML20ECP_PREFIX[] = UNICODE_LITERAL_3(e,c,p);
+const XMLCh samlconstants::SAML20ECP_PREFIX[] = UNICODE_LITERAL_3(e,c,p);

 
 

-const XMLCh SAMLConstants::SAML20DCE_NS[] = // urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE
+const XMLCh samlconstants::SAML20DCE_NS[] = // urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,


@@ -114,9 +114,9 @@ const XMLCh SAMLConstants::SAML20DCE_NS[] = // urn:oasis:names:tc:SAML:2.0:profi
   chLatin_D, chLatin_C, chLatin_E, chNull
 };
 
   chLatin_D, chLatin_C, chLatin_E, chNull
 };
 

-const XMLCh SAMLConstants::SAML20DCE_PREFIX[] = UNICODE_LITERAL_3(D,C,E);
+const XMLCh samlconstants::SAML20DCE_PREFIX[] = UNICODE_LITERAL_3(D,C,E);

 
 

-const XMLCh SAMLConstants::SAML20X500_NS[] = // urn:oasis:names:tc:SAML:2.0:profiles:attribute:X500
+const XMLCh samlconstants::SAML20X500_NS[] = // urn:oasis:names:tc:SAML:2.0:profiles:attribute:X500

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,


@@ -125,9 +125,9 @@ const XMLCh SAMLConstants::SAML20X500_NS[] = // urn:oasis:names:tc:SAML:2.0:prof
   chLatin_X, chDigit_5, chDigit_0, chDigit_0, chNull
 };
 
   chLatin_X, chDigit_5, chDigit_0, chDigit_0, chNull
 };
 

-const XMLCh SAMLConstants::SAML20X500_PREFIX[] = { chLatin_x, chDigit_5, chDigit_0, chDigit_0 };
+const XMLCh samlconstants::SAML20X500_PREFIX[] = { chLatin_x, chDigit_5, chDigit_0, chDigit_0 };

 
 

-const XMLCh SAMLConstants::SAML20XACML_NS[] = // urn:oasis:names:tc:SAML:2.0:profiles:attribute:XACML
+const XMLCh samlconstants::SAML20XACML_NS[] = // urn:oasis:names:tc:SAML:2.0:profiles:attribute:XACML

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,


@@ -136,9 +136,9 @@ const XMLCh SAMLConstants::SAML20XACML_NS[] = // urn:oasis:names:tc:SAML:2.0:pro
   chLatin_X, chLatin_A, chLatin_C, chLatin_M, chLatin_L, chNull
 };
 
   chLatin_X, chLatin_A, chLatin_C, chLatin_M, chLatin_L, chNull
 };
 

-const XMLCh SAMLConstants::SAML20XACML_PREFIX[] = UNICODE_LITERAL_9(x,a,c,m,l,p,r,o,f);
+const XMLCh samlconstants::SAML20XACML_PREFIX[] = UNICODE_LITERAL_9(x,a,c,m,l,p,r,o,f);

 
 

-const XMLCh SAMLConstants::SAML1MD_NS[] = // urn:oasis:names:tc:SAML:profiles:v1metadata
+const XMLCh samlconstants::SAML1MD_NS[] = // urn:oasis:names:tc:SAML:profiles:v1metadata

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon,
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon,


@@ -146,17 +146,17 @@ const XMLCh SAMLConstants::SAML1MD_NS[] = // urn:oasis:names:tc:SAML:profiles:v1
   chLatin_v, chDigit_1, chLatin_m, chLatin_e, chLatin_t, chLatin_a, chLatin_d, chLatin_a, chLatin_t, chLatin_a, chNull
 };
 
   chLatin_v, chDigit_1, chLatin_m, chLatin_e, chLatin_t, chLatin_a, chLatin_d, chLatin_a, chLatin_t, chLatin_a, chNull
 };
 

-const XMLCh SAMLConstants::SAML1MD_PREFIX[] =
+const XMLCh samlconstants::SAML1MD_PREFIX[] =

 { chLatin_s, chLatin_a, chLatin_m, chLatin_l, chDigit_1, chLatin_m, chLatin_d, chNull };
 
 { chLatin_s, chLatin_a, chLatin_m, chLatin_l, chDigit_1, chLatin_m, chLatin_d, chNull };
 

-const XMLCh SAMLConstants::SAML11_PROTOCOL_ENUM[] = // urn:oasis:names:tc:SAML:1.1:protocol
+const XMLCh samlconstants::SAML11_PROTOCOL_ENUM[] = // urn:oasis:names:tc:SAML:1.1:protocol

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_1, chPeriod, chDigit_1, chColon,
   chLatin_p, chLatin_r, chLatin_o, chLatin_t, chLatin_o, chLatin_c, chLatin_o, chLatin_l, chNull
 };
 
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_1, chPeriod, chDigit_1, chColon,
   chLatin_p, chLatin_r, chLatin_o, chLatin_t, chLatin_o, chLatin_c, chLatin_o, chLatin_l, chNull
 };
 

-const XMLCh SAMLConstants::SAML20MD_QUERY_EXT_NS[] = // urn:oasis:names:tc:SAML:metadata:ext:query
+const XMLCh samlconstants::SAML20MD_QUERY_EXT_NS[] = // urn:oasis:names:tc:SAML:metadata:ext:query

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon,
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon,


@@ -164,9 +164,9 @@ const XMLCh SAMLConstants::SAML20MD_QUERY_EXT_NS[] = // urn:oasis:names:tc:SAML:
   chLatin_e, chLatin_x, chLatin_t, chColon, chLatin_q, chLatin_u, chLatin_e, chLatin_r, chLatin_y, chNull
 };
 
   chLatin_e, chLatin_x, chLatin_t, chColon, chLatin_q, chLatin_u, chLatin_e, chLatin_r, chLatin_y, chNull
 };
 

-const XMLCh SAMLConstants::SAML20MD_QUERY_EXT_PREFIX[] = UNICODE_LITERAL_5(q,u,e,r,y);
+const XMLCh samlconstants::SAML20MD_QUERY_EXT_PREFIX[] = UNICODE_LITERAL_5(q,u,e,r,y);

 
 

-const XMLCh SAMLConstants::SAML20P_THIRDPARTY_EXT_NS[] = // urn:oasis:names:tc:SAML:protocol:ext:third-party
+const XMLCh samlconstants::SAML20P_THIRDPARTY_EXT_NS[] = // urn:oasis:names:tc:SAML:protocol:ext:third-party

 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon,
 { chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
   chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
   chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon,


@@ -175,14 +175,14 @@ const XMLCh SAMLConstants::SAML20P_THIRDPARTY_EXT_NS[] = // urn:oasis:names:tc:S
   chLatin_t, chLatin_h, chLatin_i, chLatin_r, chLatin_d, chDash, chLatin_p, chLatin_a, chLatin_r, chLatin_t, chLatin_y, chNull
 };
 
   chLatin_t, chLatin_h, chLatin_i, chLatin_r, chLatin_d, chDash, chLatin_p, chLatin_a, chLatin_r, chLatin_t, chLatin_y, chNull
 };
 

-const XMLCh SAMLConstants::SAML20P_THIRDPARTY_EXT_PREFIX[] = UNICODE_LITERAL_6(t,h,r,p,t,y);
+const XMLCh samlconstants::SAML20P_THIRDPARTY_EXT_PREFIX[] = UNICODE_LITERAL_6(t,h,r,p,t,y);

 
 

-const char SAMLConstants::SAML1_PROFILE_BROWSER_ARTIFACT[] = "urn:oasis:names:tc:SAML:1.0:profiles:artifact-01";
+const char samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT[] = "urn:oasis:names:tc:SAML:1.0:profiles:artifact-01";

 
 

-const char SAMLConstants::SAML1_PROFILE_BROWSER_POST[] = "urn:oasis:names:tc:SAML:1.0:profiles:browser-post";
+const char samlconstants::SAML1_PROFILE_BROWSER_POST[] = "urn:oasis:names:tc:SAML:1.0:profiles:browser-post";

 
 

-const char SAMLConstants::SAML20_BINDING_HTTP_ARTIFACT[] = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact";
+const char samlconstants::SAML20_BINDING_HTTP_ARTIFACT[] = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact";

 
 

-const char SAMLConstants::SAML20_BINDING_HTTP_POST[] = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST";
+const char samlconstants::SAML20_BINDING_HTTP_POST[] = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST";

 
 

-const char SAMLConstants::SAML20_BINDING_HTTP_REDIRECT[] = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect";
+const char samlconstants::SAML20_BINDING_HTTP_REDIRECT[] = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect";

diff --git a/saml/util/SAMLConstants.h b/saml/util/SAMLConstants.h
index 81b558a..17eade2 100644 (file)
--- a/saml/util/SAMLConstants.h
+++ b/saml/util/SAMLConstants.h
@@ -25,122 +25,118 @@
 
 #include <xmltooling/util/XMLConstants.h>
 
 
 #include <xmltooling/util/XMLConstants.h>
 

-namespace opensaml {
+/**
+ * SAML related constants.
+ */
+namespace samlconstants {
+    
+    /**  Liberty PAOS XML Namespace ("urn:liberty:paos:2003-08") */
+    extern SAML_API const XMLCh PAOS_NS[];
+    
+    /**  Liberty PAOS QName prefix ("paos") */
+    extern SAML_API const XMLCh PAOS_PREFIX[];
+
+    /**  SAML 1.X Assertion XML namespace ("urn:oasis:names:tc:SAML:1.0:assertion") */
+    extern SAML_API const XMLCh SAML1_NS[];
+
+    /**  SAML 1.X Protocol XML namespace ("urn:oasis:names:tc:SAML:1.0:protocol") */
+    extern SAML_API const XMLCh SAML1P_NS[];

     
     

-    /**
-     * SAML related constants.
-     */
-    struct SAML_API SAMLConstants : public xmltooling::XMLConstants
-    {
-        /**  Liberty PAOS XML Namespace ("urn:liberty:paos:2003-08") */
-        static const XMLCh PAOS_NS[];
-        
-        /**  Liberty PAOS QName prefix ("paos") */
-        static const XMLCh PAOS_PREFIX[];
+    /** SAML 1.X Assertion QName prefix ("saml") */
+    extern SAML_API const XMLCh SAML1_PREFIX[];
+
+    /** SAML 1.X Protocol QName prefix ("samlp") */
+    extern SAML_API const XMLCh SAML1P_PREFIX[];
+    
+    /**  SAML 2.0 Version ("2.0") */
+    extern SAML_API const XMLCh SAML20_VERSION[];
+    
+    /**  SAML 2.0 Assertion XML namespace ("urn:oasis:names:tc:SAML:2.0:assertion") */
+    extern SAML_API const XMLCh SAML20_NS[];
+
+    /**  SAML 2.0 Protocol XML namespace ("urn:oasis:names:tc:SAML:2.0:protocol") */
+    extern SAML_API const XMLCh SAML20P_NS[];
+
+    /**  SAML 2.0 Metadata XML namespace ("urn:oasis:names:tc:SAML:2.0:metadata") */
+    extern SAML_API const XMLCh SAML20MD_NS[];
+
+    /**  SAML 2.0 AuthnContext XML namespace ("urn:oasis:names:tc:SAML:2.0:ac") */
+    extern SAML_API const XMLCh SAML20AC_NS[];

     
     

-        /**  SAML 1.X Assertion XML namespace ("urn:oasis:names:tc:SAML:1.0:assertion") */
-        static const XMLCh SAML1_NS[];
-
-        /**  SAML 1.X Protocol XML namespace ("urn:oasis:names:tc:SAML:1.0:protocol") */
-        static const XMLCh SAML1P_NS[];
-        
-        /** SAML 1.X Assertion QName prefix ("saml") */
-        static const XMLCh SAML1_PREFIX[];
+    /** SAML 2.0 Assertion QName prefix ("saml") */
+    extern SAML_API const XMLCh SAML20_PREFIX[];
+
+    /** SAML 2.0 Protocol QName prefix ("samlp") */
+    extern SAML_API const XMLCh SAML20P_PREFIX[];
+
+    /** SAML 2.0 Metadata QName prefix ("md") */
+    extern SAML_API const XMLCh SAML20MD_PREFIX[];
+
+    /** SAML 2.0 AuthnContext QName prefix ("ac") */
+    extern SAML_API const XMLCh SAML20AC_PREFIX[];
+
+    /** SAML 2.0 Enhanced Client/Proxy SSO Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp") */
+    extern SAML_API const XMLCh SAML20ECP_NS[];

     
     

-        /** SAML 1.X Protocol QName prefix ("samlp") */
-        static const XMLCh SAML1P_PREFIX[];
-        
-        /**  SAML 2.0 Version ("2.0") */
-        static const XMLCh SAML20_VERSION[];
-        
-        /**  SAML 2.0 Assertion XML namespace ("urn:oasis:names:tc:SAML:2.0:assertion") */
-        static const XMLCh SAML20_NS[];
-
-        /**  SAML 2.0 Protocol XML namespace ("urn:oasis:names:tc:SAML:2.0:protocol") */
-        static const XMLCh SAML20P_NS[];
-
-        /**  SAML 2.0 Metadata XML namespace ("urn:oasis:names:tc:SAML:2.0:metadata") */
-        static const XMLCh SAML20MD_NS[];
-
-        /**  SAML 2.0 AuthnContext XML namespace ("urn:oasis:names:tc:SAML:2.0:ac") */
-        static const XMLCh SAML20AC_NS[];
-        
-        /** SAML 2.0 Assertion QName prefix ("saml") */
-        static const XMLCh SAML20_PREFIX[];
+    /** SAML 2.0 Enhanced Client/Proxy SSO Profile QName prefix ("ecp") */
+    extern SAML_API const XMLCh SAML20ECP_PREFIX[];
+
+    /** SAML 2.0 DCE PAC Attribute Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE") */
+    extern SAML_API const XMLCh SAML20DCE_NS[];

     
     

-        /** SAML 2.0 Protocol QName prefix ("samlp") */
-        static const XMLCh SAML20P_PREFIX[];
+    /** SAML 2.0 DCE PAC Attribute Profile QName prefix ("DCE") */
+    extern SAML_API const XMLCh SAML20DCE_PREFIX[];

 
 

-        /** SAML 2.0 Metadata QName prefix ("md") */
-        static const XMLCh SAML20MD_PREFIX[];
+    /** SAML 2.0 X.500 Attribute Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:attribute:X500") */
+    extern SAML_API const XMLCh SAML20X500_NS[];
+    
+    /** SAML 2.0 X.500 Attribute Profile QName prefix ("x500") */
+    extern SAML_API const XMLCh SAML20X500_PREFIX[];

 
 

-        /** SAML 2.0 AuthnContext QName prefix ("ac") */
-        static const XMLCh SAML20AC_PREFIX[];
+    /** SAML 2.0 XACML Attribute Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:attribute:XACML") */
+    extern SAML_API const XMLCh SAML20XACML_NS[];
+    
+    /** SAML 2.0 XACML Attribute Profile QName prefix ("xacmlprof") */
+    extern SAML_API const XMLCh SAML20XACML_PREFIX[];

 
 

-        /** SAML 2.0 Enhanced Client/Proxy SSO Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp") */
-        static const XMLCh SAML20ECP_NS[];
-        
-        /** SAML 2.0 Enhanced Client/Proxy SSO Profile QName prefix ("ecp") */
-        static const XMLCh SAML20ECP_PREFIX[];
+    /** SAML 1.x Metadata Profile XML Namespace ("urn:oasis:names:tc:SAML:profiles:v1metadata") */
+    extern SAML_API const XMLCh SAML1MD_NS[];

     
     

-        /** SAML 2.0 DCE PAC Attribute Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE") */
-        static const XMLCh SAML20DCE_NS[];
-        
-        /** SAML 2.0 DCE PAC Attribute Profile QName prefix ("DCE") */
-        static const XMLCh SAML20DCE_PREFIX[];
+    /** SAML 1.x Metadata Profile QName prefix ("saml1md") */
+    extern SAML_API const XMLCh SAML1MD_PREFIX[];
+
+    /** SAML 1.0 Protocol Enumeration constant ("urn:oasis:names:tc:SAML:1.0:protocol") */
+    #define SAML10_PROTOCOL_ENUM SAML1P_NS

     
     

-        /** SAML 2.0 X.500 Attribute Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:attribute:X500") */
-        static const XMLCh SAML20X500_NS[];
-        
-        /** SAML 2.0 X.500 Attribute Profile QName prefix ("x500") */
-        static const XMLCh SAML20X500_PREFIX[];
+    /** SAML 1.1 Protocol Enumeration constant ("urn:oasis:names:tc:SAML:1.1:protocol") */
+    extern SAML_API const XMLCh SAML11_PROTOCOL_ENUM[];
+
+    /** SAML Query Requester Metadata Extension XML Namespace ("urn:oasis:names:tc:SAML:metadata:ext:query") */
+    extern SAML_API const XMLCh SAML20MD_QUERY_EXT_NS[];

     
     

-        /** SAML 2.0 XACML Attribute Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:attribute:XACML") */
-        static const XMLCh SAML20XACML_NS[];
-        
-        /** SAML 2.0 XACML Attribute Profile QName prefix ("xacmlprof") */
-        static const XMLCh SAML20XACML_PREFIX[];
-
-        /** SAML 1.x Metadata Profile XML Namespace ("urn:oasis:names:tc:SAML:profiles:v1metadata") */
-        static const XMLCh SAML1MD_NS[];
-        
-        /** SAML 1.x Metadata Profile QName prefix ("saml1md") */
-        static const XMLCh SAML1MD_PREFIX[];
-
-        /** SAML 1.0 Protocol Enumeration constant ("urn:oasis:names:tc:SAML:1.0:protocol") */
-        #define SAML10_PROTOCOL_ENUM SAML1P_NS
-        
-        /** SAML 1.1 Protocol Enumeration constant ("urn:oasis:names:tc:SAML:1.1:protocol") */
-        static const XMLCh SAML11_PROTOCOL_ENUM[];
-
-        /** SAML Query Requester Metadata Extension XML Namespace ("urn:oasis:names:tc:SAML:metadata:ext:query") */
-        static const XMLCh SAML20MD_QUERY_EXT_NS[];
-        
-        /** SAML Query Requester Metadata Extension QName prefix ("query") */
-        static const XMLCh SAML20MD_QUERY_EXT_PREFIX[];
-
-        /** SAML Third-Party Request Protocol Extension XML Namespace ("urn:oasis:names:tc:SAML:protocol:ext:third-party") */
-        static const XMLCh SAML20P_THIRDPARTY_EXT_NS[];
-        
-        /** SAML Third-Party Request Protocol Extension QName prefix ("query") */
-        static const XMLCh SAML20P_THIRDPARTY_EXT_PREFIX[];
-
-        /** SAML 1.x Browser Artifact profile ("urn:oasis:names:tc:SAML:1.0:profiles:artifact-01")*/
-        static const char SAML1_PROFILE_BROWSER_ARTIFACT[];
+    /** SAML Query Requester Metadata Extension QName prefix ("query") */
+    extern SAML_API const XMLCh SAML20MD_QUERY_EXT_PREFIX[];
+
+    /** SAML Third-Party Request Protocol Extension XML Namespace ("urn:oasis:names:tc:SAML:protocol:ext:third-party") */
+    extern SAML_API const XMLCh SAML20P_THIRDPARTY_EXT_NS[];

     
     

-        /** SAML 1.x Browser POST profile ("urn:oasis:names:tc:SAML:1.0:profiles:browser-post") */
-        static const char SAML1_PROFILE_BROWSER_POST[];
-        
-        /** SAML 2.0 HTTP-Artifact binding ("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact") */
-        static const char SAML20_BINDING_HTTP_ARTIFACT[];
+    /** SAML Third-Party Request Protocol Extension QName prefix ("query") */
+    extern SAML_API const XMLCh SAML20P_THIRDPARTY_EXT_PREFIX[];
+
+    /** SAML 1.x Browser Artifact profile ("urn:oasis:names:tc:SAML:1.0:profiles:artifact-01")*/
+    extern SAML_API const char SAML1_PROFILE_BROWSER_ARTIFACT[];
+
+    /** SAML 1.x Browser POST profile ("urn:oasis:names:tc:SAML:1.0:profiles:browser-post") */
+    extern SAML_API const char SAML1_PROFILE_BROWSER_POST[];

     
     

-        /** SAML 2.0 HTTP-POST binding ("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST") */
-        static const char SAML20_BINDING_HTTP_POST[];
+    /** SAML 2.0 HTTP-Artifact binding ("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact") */
+    extern SAML_API const char SAML20_BINDING_HTTP_ARTIFACT[];

 
 

-        /** SAML 2.0 HTTP-Redirect binding ("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect") */
-        static const char SAML20_BINDING_HTTP_REDIRECT[];
-    };
+    /** SAML 2.0 HTTP-POST binding ("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST") */
+    extern SAML_API const char SAML20_BINDING_HTTP_POST[];

 
 

+    /** SAML 2.0 HTTP-Redirect binding ("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect") */
+    extern SAML_API const char SAML20_BINDING_HTTP_REDIRECT[];

 };
 
 #endif /* __saml_xmlconstants_h__ */
 };
 
 #endif /* __saml_xmlconstants_h__ */

diff --git a/samltest/saml1/binding/SAML1ArtifactTest.h b/samltest/saml1/binding/SAML1ArtifactTest.h
index 68edcfc..e3628aa 100644 (file)
--- a/samltest/saml1/binding/SAML1ArtifactTest.h
+++ b/samltest/saml1/binding/SAML1ArtifactTest.h
@@ -50,7 +50,7 @@ public:
 
             // Encode message.
             auto_ptr<MessageEncoder> encoder(
 
             // Encode message.
             auto_ptr<MessageEncoder> encoder(

-                SAMLConfig::getConfig().MessageEncoderManager.newPlugin(SAMLConstants::SAML1_PROFILE_BROWSER_ARTIFACT, NULL)
+                SAMLConfig::getConfig().MessageEncoderManager.newPlugin(samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, NULL)

                 );
             encoder->setArtifactGenerator(this);
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/Artifact","https://sp.example.org/","state",m_creds);
                 );
             encoder->setArtifactGenerator(this);
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/Artifact","https://sp.example.org/","state",m_creds);


@@ -60,9 +60,9 @@ public:
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;

-            QName idprole(SAMLConstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);
+            QName idprole(samlconstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);

             auto_ptr<MessageDecoder> decoder(
             auto_ptr<MessageDecoder> decoder(

-                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(SAMLConstants::SAML1_PROFILE_BROWSER_ARTIFACT, NULL)
+                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, NULL)

                 );
             decoder->setArtifactResolver(this);
             Locker locker(m_metadata);
                 );
             decoder->setArtifactResolver(this);
             Locker locker(m_metadata);

diff --git a/samltest/saml1/binding/SAML1POSTTest.h b/samltest/saml1/binding/SAML1POSTTest.h
index 73a17ec..23593a0 100644 (file)
--- a/samltest/saml1/binding/SAML1POSTTest.h
+++ b/samltest/saml1/binding/SAML1POSTTest.h
@@ -57,7 +57,7 @@ public:
             encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get());
             auto_ptr<MessageEncoder> encoder(
                 SAMLConfig::getConfig().MessageEncoderManager.newPlugin(
             encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get());
             auto_ptr<MessageEncoder> encoder(
                 SAMLConfig::getConfig().MessageEncoderManager.newPlugin(

-                    SAMLConstants::SAML1_PROFILE_BROWSER_POST, encoder_config->getDocumentElement()
+                    samlconstants::SAML1_PROFILE_BROWSER_POST, encoder_config->getDocumentElement()

                     )
                 );
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/POST","https://sp.example.org/","state",m_creds);
                     )
                 );
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/POST","https://sp.example.org/","state",m_creds);


@@ -67,9 +67,9 @@ public:
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;

-            QName idprole(SAMLConstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);
+            QName idprole(samlconstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);

             auto_ptr<MessageDecoder> decoder(
             auto_ptr<MessageDecoder> decoder(

-                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(SAMLConstants::SAML1_PROFILE_BROWSER_POST, NULL)
+                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML1_PROFILE_BROWSER_POST, NULL)

                 );
             Locker locker(m_metadata);
             auto_ptr<Response> response(
                 );
             Locker locker(m_metadata);
             auto_ptr<Response> response(


@@ -119,7 +119,7 @@ public:
             encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get());
             auto_ptr<MessageEncoder> encoder(
                 SAMLConfig::getConfig().MessageEncoderManager.newPlugin(
             encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get());
             auto_ptr<MessageEncoder> encoder(
                 SAMLConfig::getConfig().MessageEncoderManager.newPlugin(

-                    SAMLConstants::SAML1_PROFILE_BROWSER_POST, encoder_config->getDocumentElement()
+                    samlconstants::SAML1_PROFILE_BROWSER_POST, encoder_config->getDocumentElement()

                     )
                 );
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/POST","https://sp.example.org/","state");
                     )
                 );
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/POST","https://sp.example.org/","state");


@@ -129,9 +129,9 @@ public:
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;

-            QName idprole(SAMLConstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);
+            QName idprole(samlconstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);

             auto_ptr<MessageDecoder> decoder(
             auto_ptr<MessageDecoder> decoder(

-                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(SAMLConstants::SAML1_PROFILE_BROWSER_POST, NULL)
+                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML1_PROFILE_BROWSER_POST, NULL)

                 );
             Locker locker(m_metadata);
             auto_ptr<Response> response(
                 );
             Locker locker(m_metadata);
             auto_ptr<Response> response(

diff --git a/samltest/saml1/core/impl/AttributeTest.h b/samltest/saml1/core/impl/AttributeTest.h
index 1047d83..9dd5704 100644 (file)
--- a/samltest/saml1/core/impl/AttributeTest.h
+++ b/samltest/saml1/core/impl/AttributeTest.h
@@ -76,11 +76,11 @@ public:
         
         const XMLCh xsdstring[] = UNICODE_LITERAL_6(s,t,r,i,n,g);
        
         
         const XMLCh xsdstring[] = UNICODE_LITERAL_6(s,t,r,i,n,g);
        

-        const XMLObjectBuilder* builder=XMLObjectBuilder::getBuilder(QName(SAMLConstants::SAML1_NS,AttributeValue::LOCAL_NAME));
+        const XMLObjectBuilder* builder=XMLObjectBuilder::getBuilder(QName(samlconstants::SAML1_NS,AttributeValue::LOCAL_NAME));

         TS_ASSERT(builder!=NULL);
         TS_ASSERT(builder!=NULL);

-        QName xsitype(XMLConstants::XSD_NS,xsdstring,XMLConstants::XSD_PREFIX);
+        QName xsitype(xmlconstants::XSD_NS,xsdstring,xmlconstants::XSD_PREFIX);

         for (int i=0; i<4; i++)
         for (int i=0; i<4; i++)

-            a->getAttributeValues().push_back(builder->buildObject(SAMLConstants::SAML1_NS, AttributeValue::LOCAL_NAME, SAMLConstants::SAML1_PREFIX, &xsitype)); 
+            a->getAttributeValues().push_back(builder->buildObject(samlconstants::SAML1_NS, AttributeValue::LOCAL_NAME, samlconstants::SAML1_PREFIX, &xsitype)); 

 
         assertEquals(expectedChildElementsDOM, a);
     }
 
         assertEquals(expectedChildElementsDOM, a);
     }

diff --git a/samltest/saml2/binding/SAML2ArtifactTest.h b/samltest/saml2/binding/SAML2ArtifactTest.h
index c8764cd..d0189e5 100644 (file)
--- a/samltest/saml2/binding/SAML2ArtifactTest.h
+++ b/samltest/saml2/binding/SAML2ArtifactTest.h
@@ -52,7 +52,7 @@ public:
 
             // Encode message.
             auto_ptr<MessageEncoder> encoder(
 
             // Encode message.
             auto_ptr<MessageEncoder> encoder(

-                SAMLConfig::getConfig().MessageEncoderManager.newPlugin(SAMLConstants::SAML20_BINDING_HTTP_ARTIFACT, NULL)
+                SAMLConfig::getConfig().MessageEncoderManager.newPlugin(samlconstants::SAML20_BINDING_HTTP_ARTIFACT, NULL)

                 );
             encoder->setArtifactGenerator(this);
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/Artifact","https://sp.example.org/","state",m_creds);
                 );
             encoder->setArtifactGenerator(this);
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/Artifact","https://sp.example.org/","state",m_creds);


@@ -62,9 +62,9 @@ public:
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;

-            QName idprole(SAMLConstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);
+            QName idprole(samlconstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);

             auto_ptr<MessageDecoder> decoder(
             auto_ptr<MessageDecoder> decoder(

-                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(SAMLConstants::SAML20_BINDING_HTTP_ARTIFACT, NULL)
+                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML20_BINDING_HTTP_ARTIFACT, NULL)

                 );
             decoder->setArtifactResolver(this);
             Locker locker(m_metadata);
                 );
             decoder->setArtifactResolver(this);
             Locker locker(m_metadata);

diff --git a/samltest/saml2/binding/SAML2POSTTest.h b/samltest/saml2/binding/SAML2POSTTest.h
index b52b228..6b6018b 100644 (file)
--- a/samltest/saml2/binding/SAML2POSTTest.h
+++ b/samltest/saml2/binding/SAML2POSTTest.h
@@ -57,7 +57,7 @@ public:
             encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get());
             auto_ptr<MessageEncoder> encoder(
                 SAMLConfig::getConfig().MessageEncoderManager.newPlugin(
             encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get());
             auto_ptr<MessageEncoder> encoder(
                 SAMLConfig::getConfig().MessageEncoderManager.newPlugin(

-                    SAMLConstants::SAML20_BINDING_HTTP_POST, encoder_config->getDocumentElement()
+                    samlconstants::SAML20_BINDING_HTTP_POST, encoder_config->getDocumentElement()

                     )
                 );
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/POST","https://sp.example.org/","state",m_creds);
                     )
                 );
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/POST","https://sp.example.org/","state",m_creds);


@@ -67,9 +67,9 @@ public:
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;

-            QName idprole(SAMLConstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);
+            QName idprole(samlconstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);

             auto_ptr<MessageDecoder> decoder(
             auto_ptr<MessageDecoder> decoder(

-                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(SAMLConstants::SAML20_BINDING_HTTP_POST, NULL)
+                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML20_BINDING_HTTP_POST, NULL)

                 );
             Locker locker(m_metadata);
             auto_ptr<Response> response(
                 );
             Locker locker(m_metadata);
             auto_ptr<Response> response(


@@ -119,7 +119,7 @@ public:
             encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get());
             auto_ptr<MessageEncoder> encoder(
                 SAMLConfig::getConfig().MessageEncoderManager.newPlugin(
             encoder_config->getDocumentElement()->setAttributeNS(NULL,lit2.get(),lit3.get());
             auto_ptr<MessageEncoder> encoder(
                 SAMLConfig::getConfig().MessageEncoderManager.newPlugin(

-                    SAMLConstants::SAML20_BINDING_HTTP_POST, encoder_config->getDocumentElement()
+                    samlconstants::SAML20_BINDING_HTTP_POST, encoder_config->getDocumentElement()

                     )
                 );
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/POST","https://sp.example.org/","state");
                     )
                 );
             encoder->encode(*this,toSend.get(),"https://sp.example.org/SAML/POST","https://sp.example.org/","state");


@@ -129,9 +129,9 @@ public:
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;
             string relayState;
             const RoleDescriptor* issuer=NULL;
             bool trusted=false;

-            QName idprole(SAMLConstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);
+            QName idprole(samlconstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);

             auto_ptr<MessageDecoder> decoder(
             auto_ptr<MessageDecoder> decoder(

-                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(SAMLConstants::SAML20_BINDING_HTTP_POST, NULL)
+                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML20_BINDING_HTTP_POST, NULL)

                 );
             Locker locker(m_metadata);
             auto_ptr<Response> response(
                 );
             Locker locker(m_metadata);
             auto_ptr<Response> response(

diff --git a/samltest/saml2/core/impl/ArtifactResolve20Test.h b/samltest/saml2/core/impl/ArtifactResolve20Test.h
index 25f6977..0e05b68 100644 (file)
--- a/samltest/saml2/core/impl/ArtifactResolve20Test.h
+++ b/samltest/saml2/core/impl/ArtifactResolve20Test.h
@@ -112,7 +112,7 @@ public:
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->setArtifact(ArtifactBuilder::buildArtifact());
         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->setArtifact(ArtifactBuilder::buildArtifact());

diff --git a/samltest/saml2/core/impl/ArtifactResponse20Test.h b/samltest/saml2/core/impl/ArtifactResponse20Test.h
index 23a0017..9a77389 100644 (file)
--- a/samltest/saml2/core/impl/ArtifactResponse20Test.h
+++ b/samltest/saml2/core/impl/ArtifactResponse20Test.h
@@ -138,7 +138,7 @@ public:
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         response->addNamespace(*ns);
         response->setIssuer(IssuerBuilder::buildIssuer());
         response->setStatus(StatusBuilder::buildStatus());
         response->addNamespace(*ns);
         response->setIssuer(IssuerBuilder::buildIssuer());
         response->setStatus(StatusBuilder::buildStatus());

diff --git a/samltest/saml2/core/impl/Assertion20Test.h b/samltest/saml2/core/impl/Assertion20Test.h
index 0f28e4d..1561188 100644 (file)
--- a/samltest/saml2/core/impl/Assertion20Test.h
+++ b/samltest/saml2/core/impl/Assertion20Test.h
@@ -27,7 +27,7 @@ class Assertion20Test : public CxxTest::TestSuite, public SAMLObjectBaseTestCase
 
 public:
     void setUp() {
 
 public:
     void setUp() {

-        expectedVersion = SAMLConstants::SAML20_VERSION;
+        expectedVersion = samlconstants::SAML20_VERSION;

         expectedID = XMLString::transcode("abc123");
         expectedIssueInstant = new DateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
         expectedIssueInstant->parseDateTime();
         expectedID = XMLString::transcode("abc123");
         expectedIssueInstant = new DateTime(XMLString::transcode("1984-08-26T10:01:30.043Z"));
         expectedIssueInstant->parseDateTime();

diff --git a/samltest/saml2/core/impl/AssertionIDRequest20Test.h b/samltest/saml2/core/impl/AssertionIDRequest20Test.h
index 6ec4172..749857e 100644 (file)
--- a/samltest/saml2/core/impl/AssertionIDRequest20Test.h
+++ b/samltest/saml2/core/impl/AssertionIDRequest20Test.h
@@ -112,7 +112,7 @@ public:
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->getAssertionIDRefs().push_back(AssertionIDRefBuilder::buildAssertionIDRef());
         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->getAssertionIDRefs().push_back(AssertionIDRefBuilder::buildAssertionIDRef());

diff --git a/samltest/saml2/core/impl/AttributeQuery20Test.h b/samltest/saml2/core/impl/AttributeQuery20Test.h
index 4d2645e..edd39fe 100644 (file)
--- a/samltest/saml2/core/impl/AttributeQuery20Test.h
+++ b/samltest/saml2/core/impl/AttributeQuery20Test.h
@@ -113,7 +113,7 @@ public:
         query->setID(expectedID);
         query->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         query->setID(expectedID);
         query->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         query->addNamespace(*ns);
         query->setIssuer(IssuerBuilder::buildIssuer());
         query->setSubject(SubjectBuilder::buildSubject());
         query->addNamespace(*ns);
         query->setIssuer(IssuerBuilder::buildIssuer());
         query->setSubject(SubjectBuilder::buildSubject());

diff --git a/samltest/saml2/core/impl/AuthnQuery20Test.h b/samltest/saml2/core/impl/AuthnQuery20Test.h
index 400de42..f1da011 100644 (file)
--- a/samltest/saml2/core/impl/AuthnQuery20Test.h
+++ b/samltest/saml2/core/impl/AuthnQuery20Test.h
@@ -120,7 +120,7 @@ public:
         query->setID(expectedID);
         query->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         query->setID(expectedID);
         query->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         query->addNamespace(*ns);
         query->setIssuer(IssuerBuilder::buildIssuer());
         query->setSubject(SubjectBuilder::buildSubject());
         query->addNamespace(*ns);
         query->setIssuer(IssuerBuilder::buildIssuer());
         query->setSubject(SubjectBuilder::buildSubject());

diff --git a/samltest/saml2/core/impl/AuthnRequest20Test.h b/samltest/saml2/core/impl/AuthnRequest20Test.h
index 1c0482a..189f66e 100644 (file)
--- a/samltest/saml2/core/impl/AuthnRequest20Test.h
+++ b/samltest/saml2/core/impl/AuthnRequest20Test.h
@@ -76,8 +76,8 @@ public:
         assertEquals("ID attribute", expectedID, request->getID());
         assertEquals("Version attribute", expectedVersion, request->getVersion());
         TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch());
         assertEquals("ID attribute", expectedID, request->getID());
         assertEquals("Version attribute", expectedVersion, request->getVersion());
         TSM_ASSERT_EQUALS("IssueInstant attribute", expectedIssueInstant->getEpoch(), request->getIssueInstant()->getEpoch());

-        TSM_ASSERT_EQUALS("ForceAuthn attribute presence", XMLConstants::XML_BOOL_NULL, request->getForceAuthn());
-        TSM_ASSERT_EQUALS("IsPassive attribute presence", XMLConstants::XML_BOOL_NULL, request->getIsPassive());
+        TSM_ASSERT_EQUALS("ForceAuthn attribute presence", xmlconstants::XML_BOOL_NULL, request->getForceAuthn());
+        TSM_ASSERT_EQUALS("IsPassive attribute presence", xmlconstants::XML_BOOL_NULL, request->getIsPassive());

         TSM_ASSERT_EQUALS("AssertionConsumerServiceIndex attribute presence",false, request->getAssertionConsumerServiceIndex().first);
         TSM_ASSERT_EQUALS("AttributeConsumingServiceIndex attribute presence", false, request->getAttributeConsumingServiceIndex().first);
 
         TSM_ASSERT_EQUALS("AssertionConsumerServiceIndex attribute presence",false, request->getAssertionConsumerServiceIndex().first);
         TSM_ASSERT_EQUALS("AttributeConsumingServiceIndex attribute presence", false, request->getAttributeConsumingServiceIndex().first);
 


@@ -130,8 +130,8 @@ public:
         TS_ASSERT(request->getConditions()!=NULL);
         TS_ASSERT(request->getRequestedAuthnContext()!=NULL);
         TS_ASSERT(request->getScoping()!=NULL);
         TS_ASSERT(request->getConditions()!=NULL);
         TS_ASSERT(request->getRequestedAuthnContext()!=NULL);
         TS_ASSERT(request->getScoping()!=NULL);

-        TSM_ASSERT_EQUALS("ForceAuthn attribute presence", XMLConstants::XML_BOOL_NULL, request->getForceAuthn());
-        TSM_ASSERT_EQUALS("IsPassive attribute presence", XMLConstants::XML_BOOL_NULL, request->getIsPassive());
+        TSM_ASSERT_EQUALS("ForceAuthn attribute presence", xmlconstants::XML_BOOL_NULL, request->getForceAuthn());
+        TSM_ASSERT_EQUALS("IsPassive attribute presence", xmlconstants::XML_BOOL_NULL, request->getIsPassive());

         TSM_ASSERT_EQUALS("AssertionConsumerServiceIndex attribute presence",false, request->getAssertionConsumerServiceIndex().first);
         TSM_ASSERT_EQUALS("AttributeConsumingServiceIndex attribute presence", false, request->getAttributeConsumingServiceIndex().first);
     }
         TSM_ASSERT_EQUALS("AssertionConsumerServiceIndex attribute presence",false, request->getAssertionConsumerServiceIndex().first);
         TSM_ASSERT_EQUALS("AttributeConsumingServiceIndex attribute presence", false, request->getAttributeConsumingServiceIndex().first);
     }


@@ -166,7 +166,7 @@ public:
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->setSubject(SubjectBuilder::buildSubject());
         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->setSubject(SubjectBuilder::buildSubject());

diff --git a/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h b/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h
index 2f6232d..eb0e861 100644 (file)
--- a/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h
+++ b/samltest/saml2/core/impl/AuthzDecisionQuery20Test.h
@@ -124,7 +124,7 @@ public:
         query->setID(expectedID);
         query->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         query->setID(expectedID);
         query->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         query->addNamespace(*ns);
         query->setIssuer(IssuerBuilder::buildIssuer());
         query->setSubject(SubjectBuilder::buildSubject());
         query->addNamespace(*ns);
         query->setIssuer(IssuerBuilder::buildIssuer());
         query->setSubject(SubjectBuilder::buildSubject());

diff --git a/samltest/saml2/core/impl/LogoutRequest20Test.h b/samltest/saml2/core/impl/LogoutRequest20Test.h
index 198be35..00ba961 100644 (file)
--- a/samltest/saml2/core/impl/LogoutRequest20Test.h
+++ b/samltest/saml2/core/impl/LogoutRequest20Test.h
@@ -133,7 +133,7 @@ public:
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->setNameID(NameIDBuilder::buildNameID());
         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->setNameID(NameIDBuilder::buildNameID());

diff --git a/samltest/saml2/core/impl/LogoutResponse20Test.h b/samltest/saml2/core/impl/LogoutResponse20Test.h
index 034d245..dc22d52 100644 (file)
--- a/samltest/saml2/core/impl/LogoutResponse20Test.h
+++ b/samltest/saml2/core/impl/LogoutResponse20Test.h
@@ -127,7 +127,7 @@ public:
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         response->addNamespace(*ns);
         response->setIssuer(IssuerBuilder::buildIssuer());
         response->setStatus(StatusBuilder::buildStatus());
         response->addNamespace(*ns);
         response->setIssuer(IssuerBuilder::buildIssuer());
         response->setStatus(StatusBuilder::buildStatus());

diff --git a/samltest/saml2/core/impl/ManageNameIDRequest20Test.h b/samltest/saml2/core/impl/ManageNameIDRequest20Test.h
index 288baf4..0474121 100644 (file)
--- a/samltest/saml2/core/impl/ManageNameIDRequest20Test.h
+++ b/samltest/saml2/core/impl/ManageNameIDRequest20Test.h
@@ -125,7 +125,7 @@ public:
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->setNameID(NameIDBuilder::buildNameID());
         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->setNameID(NameIDBuilder::buildNameID());

diff --git a/samltest/saml2/core/impl/ManageNameIDResponse20Test.h b/samltest/saml2/core/impl/ManageNameIDResponse20Test.h
index c1e0533..d3d2f8f 100644 (file)
--- a/samltest/saml2/core/impl/ManageNameIDResponse20Test.h
+++ b/samltest/saml2/core/impl/ManageNameIDResponse20Test.h
@@ -127,7 +127,7 @@ public:
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         response->addNamespace(*ns);
         response->setIssuer(IssuerBuilder::buildIssuer());
         response->setStatus(StatusBuilder::buildStatus());
         response->addNamespace(*ns);
         response->setIssuer(IssuerBuilder::buildIssuer());
         response->setStatus(StatusBuilder::buildStatus());

diff --git a/samltest/saml2/core/impl/NameIDMappingRequest20Test.h b/samltest/saml2/core/impl/NameIDMappingRequest20Test.h
index 6489852..5d5df06 100644 (file)
--- a/samltest/saml2/core/impl/NameIDMappingRequest20Test.h
+++ b/samltest/saml2/core/impl/NameIDMappingRequest20Test.h
@@ -122,7 +122,7 @@ public:
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         request->setID(expectedID);
         request->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->setNameID(NameIDBuilder::buildNameID());
         request->addNamespace(*ns);
         request->setIssuer(IssuerBuilder::buildIssuer());
         request->setNameID(NameIDBuilder::buildNameID());

diff --git a/samltest/saml2/core/impl/NameIDMappingResponse20Test.h b/samltest/saml2/core/impl/NameIDMappingResponse20Test.h
index 5eb94b6..9b30782 100644 (file)
--- a/samltest/saml2/core/impl/NameIDMappingResponse20Test.h
+++ b/samltest/saml2/core/impl/NameIDMappingResponse20Test.h
@@ -133,7 +133,7 @@ public:
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         response->addNamespace(*ns);
         response->setIssuer(IssuerBuilder::buildIssuer());
         response->setStatus(StatusBuilder::buildStatus());
         response->addNamespace(*ns);
         response->setIssuer(IssuerBuilder::buildIssuer());
         response->setStatus(StatusBuilder::buildStatus());

diff --git a/samltest/saml2/core/impl/NameIDPolicy20Test.h b/samltest/saml2/core/impl/NameIDPolicy20Test.h
index a8f3a3a..a064229 100644 (file)
--- a/samltest/saml2/core/impl/NameIDPolicy20Test.h
+++ b/samltest/saml2/core/impl/NameIDPolicy20Test.h
@@ -47,7 +47,7 @@ public:
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         NameIDPolicy* policy = dynamic_cast<NameIDPolicy*>(xo.get());
         TS_ASSERT(policy!=NULL);
         auto_ptr<XMLObject> xo(unmarshallElement(singleElementFile));
         NameIDPolicy* policy = dynamic_cast<NameIDPolicy*>(xo.get());
         TS_ASSERT(policy!=NULL);

-        TSM_ASSERT_EQUALS("AllowCreate attribute presence", XMLConstants::XML_BOOL_NULL, policy->getAllowCreate());
+        TSM_ASSERT_EQUALS("AllowCreate attribute presence", xmlconstants::XML_BOOL_NULL, policy->getAllowCreate());

     }
 
     void testSingleElementOptionalAttributesUnmarshall() {
     }
 
     void testSingleElementOptionalAttributesUnmarshall() {


@@ -56,7 +56,7 @@ public:
         TS_ASSERT(policy!=NULL);
         assertEquals("Format attribute", expectedFormat, policy->getFormat());
         assertEquals("SPNameQualifier attribute", expectedSPNameQualifier, policy->getSPNameQualifier());
         TS_ASSERT(policy!=NULL);
         assertEquals("Format attribute", expectedFormat, policy->getFormat());
         assertEquals("SPNameQualifier attribute", expectedSPNameQualifier, policy->getSPNameQualifier());

-        TSM_ASSERT_DIFFERS("AllowCreate attribute presence", XMLConstants::XML_BOOL_NULL, policy->getAllowCreate());
+        TSM_ASSERT_DIFFERS("AllowCreate attribute presence", xmlconstants::XML_BOOL_NULL, policy->getAllowCreate());

         TSM_ASSERT_EQUALS("AllowCreate attribute value", expectedAllowCreate, policy->AllowCreate());
     }
 
         TSM_ASSERT_EQUALS("AllowCreate attribute value", expectedAllowCreate, policy->AllowCreate());
     }
 

diff --git a/samltest/saml2/core/impl/NameIDType20Test.h b/samltest/saml2/core/impl/NameIDType20Test.h
index d464805..7acb3a2 100644 (file)
--- a/samltest/saml2/core/impl/NameIDType20Test.h
+++ b/samltest/saml2/core/impl/NameIDType20Test.h
@@ -51,8 +51,8 @@ public:
         elementNS = XMLString::transcode("http://www.example.org/test");
         elementPrefix = XMLString::transcode("test");;
         typeName = NameIDType::TYPE_NAME;
         elementNS = XMLString::transcode("http://www.example.org/test");
         elementPrefix = XMLString::transcode("test");;
         typeName = NameIDType::TYPE_NAME;

-        typeNS = SAMLConstants::SAML20_NS;
-        typePrefix = SAMLConstants::SAML20_PREFIX;
+        typeNS = samlconstants::SAML20_NS;
+        typePrefix = samlconstants::SAML20_PREFIX;

 
         singleElementFile = data_path + "saml2/core/impl/NameIDType.xml";
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/NameIDTypeOptionalAttributes.xml";
 
         singleElementFile = data_path + "saml2/core/impl/NameIDType.xml";
         singleElementOptionalAttributesFile = data_path + "saml2/core/impl/NameIDTypeOptionalAttributes.xml";

diff --git a/samltest/saml2/core/impl/NewEncryptedID20Test.h b/samltest/saml2/core/impl/NewEncryptedID20Test.h
index 54bbea3..4f6435d 100644 (file)
--- a/samltest/saml2/core/impl/NewEncryptedID20Test.h
+++ b/samltest/saml2/core/impl/NewEncryptedID20Test.h
@@ -60,7 +60,7 @@ public:
     void testChildElementsMarshall() {
         NewEncryptedID* encID=NewEncryptedIDBuilder::buildNewEncryptedID();
         // Do this just so don't have to redeclare the xenc namespace prefix on every child element in the control XML file
     void testChildElementsMarshall() {
         NewEncryptedID* encID=NewEncryptedIDBuilder::buildNewEncryptedID();
         // Do this just so don't have to redeclare the xenc namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(xmltooling::XMLConstants::XMLENC_NS, xmltooling::XMLConstants::XMLENC_PREFIX);
+        Namespace* ns = new Namespace(xmlconstants::XMLENC_NS, xmlconstants::XMLENC_PREFIX);

         encID->addNamespace(*ns);
         encID->setEncryptedData(EncryptedDataBuilder::buildEncryptedData());
         encID->getEncryptedKeys().push_back(EncryptedKeyBuilder::buildEncryptedKey());
         encID->addNamespace(*ns);
         encID->setEncryptedData(EncryptedDataBuilder::buildEncryptedData());
         encID->getEncryptedKeys().push_back(EncryptedKeyBuilder::buildEncryptedKey());

diff --git a/samltest/saml2/core/impl/RequestedAuthnContext20Test.h b/samltest/saml2/core/impl/RequestedAuthnContext20Test.h
index 4a6a57c..b1eb3c6 100644 (file)
--- a/samltest/saml2/core/impl/RequestedAuthnContext20Test.h
+++ b/samltest/saml2/core/impl/RequestedAuthnContext20Test.h
@@ -83,7 +83,7 @@ public:
     void testChildElementsMarshall() {
         RequestedAuthnContext* rac=RequestedAuthnContextBuilder::buildRequestedAuthnContext();
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
     void testChildElementsMarshall() {
         RequestedAuthnContext* rac=RequestedAuthnContextBuilder::buildRequestedAuthnContext();
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         rac->addNamespace(*ns);
         rac->getAuthnContextClassRefs().push_back(AuthnContextClassRefBuilder::buildAuthnContextClassRef());
         rac->getAuthnContextClassRefs().push_back(AuthnContextClassRefBuilder::buildAuthnContextClassRef());
         rac->addNamespace(*ns);
         rac->getAuthnContextClassRefs().push_back(AuthnContextClassRefBuilder::buildAuthnContextClassRef());
         rac->getAuthnContextClassRefs().push_back(AuthnContextClassRefBuilder::buildAuthnContextClassRef());

diff --git a/samltest/saml2/core/impl/Response20Test.h b/samltest/saml2/core/impl/Response20Test.h
index 92dbe0c..c833a6a 100644 (file)
--- a/samltest/saml2/core/impl/Response20Test.h
+++ b/samltest/saml2/core/impl/Response20Test.h
@@ -145,7 +145,7 @@ public:
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file
         response->setID(expectedID);
         response->setIssueInstant(expectedIssueInstant);
         // Do this just so don't have to redeclare the saml namespace prefix on every child element in the control XML file

-        Namespace* ns = new Namespace(opensaml::SAMLConstants::SAML20_NS, opensaml::SAMLConstants::SAML20_PREFIX);
+        Namespace* ns = new Namespace(samlconstants::SAML20_NS, samlconstants::SAML20_PREFIX);

         response->addNamespace(*ns);
         response->setIssuer(IssuerBuilder::buildIssuer());
         // If the form of the default, basic, empty signature that is emittted changes wrt whitespace, etc,
         response->addNamespace(*ns);
         response->setIssuer(IssuerBuilder::buildIssuer());
         // If the form of the default, basic, empty signature that is emittted changes wrt whitespace, etc,