Refactored Signature signing/validation, various Validator bugs fixed.

[shibboleth/cpp-xmltooling.git] / xmltooling / XMLObject.h

diff --git a/xmltooling/XMLObject.h b/xmltooling/XMLObject.h
index 09e72c9..ed750ce 100644 (file)
--- a/xmltooling/XMLObject.h
+++ b/xmltooling/XMLObject.h
@@ -20,7 +20,7 @@
  * Abstract interface to objects that can be manipulated in and out of XML form. \r
  */\r
 \r
-#if !defined(__xmltooling_xmlobj_h__)\r
+#ifndef __xmltooling_xmlobj_h__\r
 #define __xmltooling_xmlobj_h__\r
 \r
 #include <set>\r
@@ -32,6 +32,12 @@
 \r
 using namespace xercesc;\r
 \r
+#ifndef XMLTOOLING_NO_XMLSEC\r
+namespace xmlsignature {\r
+    class XMLTOOL_API Signature;\r
+};\r
+#endif\r
+\r
 #if defined (_MSC_VER)\r
     #pragma warning( push )\r
     #pragma warning( disable : 4250 4251 )\r
@@ -39,41 +45,6 @@ using namespace xercesc;
 \r
 namespace xmltooling {\r
 \r
-#ifndef XMLTOOLING_NO_XMLSEC\r
-    class XMLTOOL_API Signature;\r
-    class XMLTOOL_API SigningContext;\r
-#endif\r
-\r
-    /**\r
-     * Supplies additional information to the marshalling process.\r
-     * Currently this only consists of signature related information.\r
-     */\r
-    class XMLTOOL_API MarshallingContext\r
-    {\r
-        MAKE_NONCOPYABLE(MarshallingContext);\r
-    public:\r
-        /**\r
-         * Default constructor.\r
-         */\r
-        MarshallingContext() {}\r
-        ~MarshallingContext() {}\r
-\r
-#ifndef XMLTOOLING_NO_XMLSEC\r
-        /**\r
-         * Builds a marshalling context with an initial signature/context pair.\r
-         * \r
-         * @param sig   a signature object\r
-         * @param ctx   the signing context to associate with the signature \r
-         */\r
-        MarshallingContext(Signature* sig, const SigningContext* ctx) {\r
-            m_signingContexts.push_back(std::make_pair(sig,ctx));\r
-        }\r
-        \r
-        /** Array of signing contexts, keyed off of the associated Signature */\r
-        std::vector< std::pair<Signature*,const SigningContext*> > m_signingContexts;\r
-#endif\r
-    };\r
-\r
     /**\r
      * Object that represents an XML Element that has been unmarshalled into this C++ object.\r
      */\r
@@ -133,14 +104,6 @@ namespace xmltooling {
         virtual const QName* getSchemaType() const=0;\r
         \r
         /**\r
-         * Sets the XML schema type of this element.  This translates to contents the xsi:type\r
-         * attribute for the element.\r
-         * \r
-         * @param type XML schema type of this element\r
-         */\r
-        virtual void setSchemaType(const QName* type)=0;\r
-        \r
-        /**\r
          * Checks to see if this object has a parent.\r
          * \r
          * @return true if the object has a parent, false if not\r
@@ -250,13 +213,18 @@ namespace xmltooling {
          * marshalled, unless an existing DOM can be reused without creating a new document. \r
          * \r
          * @param document  the DOM document the marshalled element will be placed in, or NULL\r
-         * @param ctx       optional marshalling context\r
+         * @param sigs      ordered array of signatures to create after marshalling is complete\r
          * @return the DOM element representing this XMLObject\r
          * \r
          * @throws MarshallingException thrown if there is a problem marshalling the given object\r
          * @throws SignatureException thrown if a problem occurs during signature creation \r
          */\r
-        virtual DOMElement* marshall(DOMDocument* document=NULL, MarshallingContext* ctx=NULL) const=0;\r
+        virtual DOMElement* marshall(\r
+            DOMDocument* document=NULL\r
+#ifndef XMLTOOLING_NO_XMLSEC\r
+            ,const std::vector<xmlsignature::Signature*>* sigs=NULL\r
+#endif\r
+            ) const=0;\r
         \r
         /**\r
          * Marshalls the XMLObject and appends it as a child of the given parent element.\r
@@ -265,13 +233,18 @@ namespace xmltooling {
          * the Document owning the given Element.\r
          * \r
          * @param parentElement the parent element to append the resulting DOM tree\r
-         * @param ctx       optional marshalling context\r
+         * @param sigs          ordered array of signatures to create after marshalling is complete\r
          * @return the marshalled element tree\r
 \r
          * @throws MarshallingException thrown if the given XMLObject can not be marshalled.\r
          * @throws SignatureException thrown if a problem occurs during signature creation \r
          */\r
-        virtual DOMElement* marshall(DOMElement* parentElement, MarshallingContext* ctx=NULL) const=0;\r
+        virtual DOMElement* marshall(\r
+            DOMElement* parentElement\r
+#ifndef XMLTOOLING_NO_XMLSEC\r
+            ,const std::vector<xmlsignature::Signature*>* sigs=NULL\r
+#endif\r
+            ) const=0;\r
 \r
         /**\r
          * Unmarshalls the given W3C DOM element into the XMLObject.\r