Evolving macros, reduce casting in accessors, add const collection access.

[shibboleth/xmltooling.git] / xmltooling / signature / impl / XMLSecSignatureImpl.cpp

diff --git a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
index d320a3d..b561814 100644 (file)
--- a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
+++ b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
@@ -23,7 +23,7 @@
 #include "internal.h"\r
 #include "exceptions.h"\r
 #include "impl/UnknownElement.h"\r
-#include "signature/impl/XMLSecSignatureImpl.h"\r
+#include "signature/Signature.h"\r
 #include "util/NDC.h"\r
 #include "util/XMLConstants.h"\r
 #include "util/XMLHelper.h"\r
@@ -31,6 +31,7 @@
 #include <log4cpp/Category.hh>\r
 #include <xercesc/framework/MemBufInputSource.hpp>\r
 #include <xercesc/framework/Wrapper4InputSource.hpp>\r
+#include <xercesc/util/XMLUniDefs.hpp>\r
 #include <xsec/dsig/DSIGKeyInfoX509.hpp>\r
 #include <xsec/enc/XSECCryptoException.hpp>\r
 #include <xsec/framework/XSECException.hpp>\r
@@ -236,7 +237,7 @@ DOMElement* XMLSecSignatureImpl::marshall(DOMDocument* document, MarshallingCont
             bindDocument=true;\r
         }\r
         m_signature=XMLToolingInternalConfig::getInternalConfig().m_xsecProvider->newSignature();\r
-        m_signature->setDSIGNSPrefix(Signature::PREFIX);\r
+        m_signature->setDSIGNSPrefix(XMLConstants::XMLSIG_PREFIX);\r
         cachedDOM=m_signature->createBlankSignature(document, getCanonicalizationMethod(), getSignatureAlgorithm());\r
     }\r
     else {\r
@@ -339,7 +340,7 @@ DOMElement* XMLSecSignatureImpl::marshall(DOMElement* parentElement, Marshalling
         // Fresh signature, so we just create an empty one.\r
         log.debug("creating empty Signature element");\r
         m_signature=XMLToolingInternalConfig::getInternalConfig().m_xsecProvider->newSignature();\r
-        m_signature->setDSIGNSPrefix(Signature::PREFIX);\r
+        m_signature->setDSIGNSPrefix(XMLConstants::XMLSIG_PREFIX);\r
         cachedDOM=m_signature->createBlankSignature(\r
             parentElement->getOwnerDocument(), getCanonicalizationMethod(), getSignatureAlgorithm()\r
             );\r
@@ -401,7 +402,7 @@ XMLObject* XMLSecSignatureImpl::unmarshall(DOMElement* element, bool bindDocumen
     return this;\r
 }\r
 \r
-Signature* XMLSecSignatureBuilder::buildObject(\r
+Signature* SignatureBuilder::buildObject(\r
     const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType\r
     ) const\r
 {\r
@@ -410,7 +411,9 @@ Signature* XMLSecSignatureBuilder::buildObject(
     return buildObject();\r
 }\r
 \r
-Signature* XMLSecSignatureBuilder::buildObject() const\r
+Signature* SignatureBuilder::buildObject() const\r
 {\r
     return new XMLSecSignatureImpl();\r
 }\r
+\r
+const XMLCh Signature::LOCAL_NAME[] = UNICODE_LITERAL_9(S,i,g,n,a,t,u,r,e);\r