Removed ChildlessElement class references, ensure ComplexElement gets copied during...

[shibboleth/cpp-opensaml.git] / saml / saml2 / core / impl / Protocols20Impl.cpp

diff --git a/saml/saml2/core/impl/Protocols20Impl.cpp b/saml/saml2/core/impl/Protocols20Impl.cpp
index f01c7fe..f43d38d 100644 (file)
--- a/saml/saml2/core/impl/Protocols20Impl.cpp
+++ b/saml/saml2/core/impl/Protocols20Impl.cpp
@@ -25,7 +25,6 @@
 #include "saml/encryption/EncryptedKeyResolver.h"\r
 #include "saml2/core/Protocols.h"\r
 \r
-#include <xmltooling/AbstractChildlessElement.h>\r
 #include <xmltooling/AbstractComplexElement.h>\r
 #include <xmltooling/AbstractElementProxy.h>\r
 #include <xmltooling/AbstractSimpleElement.h>\r
@@ -122,7 +121,8 @@ namespace opensaml {
                         init();\r
                 }\r
 \r
-                StatusCodeImpl(const StatusCodeImpl& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src) {\r
+                StatusCodeImpl(const StatusCodeImpl& src)\r
+                        : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {\r
                     init();\r
                     setValue(src.getValue());\r
                     if (src.getStatusCode())\r
@@ -162,14 +162,15 @@ namespace opensaml {
                 StatusDetailImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)\r
                     : AbstractXMLObject(nsURI, localName, prefix, schemaType) { }\r
 \r
-                StatusDetailImpl(const StatusDetailImpl& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src) {\r
-                        VectorOf(XMLObject) v=getDetails();\r
-                        for (vector<XMLObject*>::const_iterator i=src.m_Details.begin(); i!=src.m_Details.end(); i++) {\r
-                            if (*i) {\r
-                                v.push_back((*i)->clone());\r
-                            }\r
+                StatusDetailImpl(const StatusDetailImpl& src)\r
+                        : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {\r
+                    VectorOf(XMLObject) v=getDetails();\r
+                    for (vector<XMLObject*>::const_iterator i=src.m_Details.begin(); i!=src.m_Details.end(); i++) {\r
+                        if (*i) {\r
+                            v.push_back((*i)->clone());\r
                         }\r
                     }\r
+                }\r
 \r
                 IMPL_XMLOBJECT_CLONE(StatusDetail);\r
                 IMPL_XMLOBJECT_CHILDREN(Detail,m_children.end());\r
@@ -205,12 +206,12 @@ namespace opensaml {
             virtual ~StatusImpl() { }\r
     \r
             StatusImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)\r
-                : AbstractXMLObject(nsURI, localName, prefix, schemaType)\r
-            {\r
-                    init();\r
+                    : AbstractXMLObject(nsURI, localName, prefix, schemaType) {\r
+                init();\r
             }\r
                 \r
-            StatusImpl(const StatusImpl& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src) {\r
+            StatusImpl(const StatusImpl& src)\r
+                    : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {\r
                 init();\r
                 if (src.getStatusCode())\r
                     setStatusCode(src.getStatusCode()->cloneStatusCode());\r
@@ -279,7 +280,8 @@ namespace opensaml {
                 init();\r
             }\r
                 \r
-            RequestAbstractTypeImpl(const RequestAbstractTypeImpl& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src) {\r
+            RequestAbstractTypeImpl(const RequestAbstractTypeImpl& src)\r
+                    : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {\r
                 init();\r
                 setID(src.getID());\r
                 setVersion(src.getVersion());\r
@@ -440,12 +442,12 @@ namespace opensaml {
             }\r
     \r
             RequestedAuthnContextImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)\r
-                : AbstractXMLObject(nsURI, localName, prefix, schemaType)\r
-            {\r
+                    : AbstractXMLObject(nsURI, localName, prefix, schemaType) {\r
                 init();\r
             }\r
                 \r
-            RequestedAuthnContextImpl(const RequestedAuthnContextImpl& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src) {\r
+            RequestedAuthnContextImpl(const RequestedAuthnContextImpl& src)\r
+                    : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {\r
                 init();\r
                 setComparison(src.getComparison());\r
                 for (list<XMLObject*>::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) {\r
@@ -597,8 +599,7 @@ namespace opensaml {
             }\r
     \r
             AuthzDecisionQueryImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)\r
-                : AbstractXMLObject(nsURI, localName, prefix, schemaType)\r
-            {\r
+                    : AbstractXMLObject(nsURI, localName, prefix, schemaType) {\r
                 init();\r
             }\r
                 \r
@@ -648,7 +649,7 @@ namespace opensaml {
         };\r
 \r
         class SAML_DLLLOCAL NameIDPolicyImpl : public virtual NameIDPolicy,\r
-            public AbstractChildlessElement,\r
+            public AbstractSimpleElement,\r
             public AbstractDOMCachingXMLObject,\r
             public AbstractXMLObjectMarshaller,\r
             public AbstractXMLObjectUnmarshaller\r
@@ -671,7 +672,8 @@ namespace opensaml {
                         init();\r
                 }\r
 \r
-                NameIDPolicyImpl(const NameIDPolicyImpl& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src) {\r
+                NameIDPolicyImpl(const NameIDPolicyImpl& src)\r
+                        : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) {\r
                     init();\r
                     setFormat(src.getFormat());\r
                     setSPNameQualifier(src.getSPNameQualifier());\r
@@ -699,7 +701,7 @@ namespace opensaml {
         };\r
 \r
         class SAML_DLLLOCAL IDPEntryImpl : public virtual IDPEntry,\r
-            public AbstractChildlessElement,\r
+            public AbstractSimpleElement,\r
             public AbstractDOMCachingXMLObject,\r
             public AbstractXMLObjectMarshaller,\r
             public AbstractXMLObjectUnmarshaller\r
@@ -723,7 +725,8 @@ namespace opensaml {
                         init();\r
                 }\r
 \r
-                IDPEntryImpl(const IDPEntryImpl& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src) {\r
+                IDPEntryImpl(const IDPEntryImpl& src)\r
+                        : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) {\r
                     init();\r
                     setProviderID(src.getProviderID());\r
                     setName(src.getName());\r
@@ -1034,7 +1037,8 @@ namespace opensaml {
                 init();\r
             }\r
                 \r
-            StatusResponseTypeImpl(const StatusResponseTypeImpl& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src) {\r
+            StatusResponseTypeImpl(const StatusResponseTypeImpl& src)\r
+                    : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {\r
                 init();\r
                 setID(src.getID());\r
                 setInResponseTo(src.getInResponseTo());\r
@@ -1273,7 +1277,8 @@ namespace opensaml {
                 init();\r
             }\r
                 \r
-            NewEncryptedIDImpl(const NewEncryptedIDImpl& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src) {\r
+            NewEncryptedIDImpl(const NewEncryptedIDImpl& src)\r
+                    : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {\r
                 init();\r
                 if (src.getEncryptedData())\r
                     setEncryptedData(src.getEncryptedData()->cloneEncryptedData());\r
@@ -1320,7 +1325,7 @@ namespace opensaml {
         };\r
 \r
         class SAML_DLLLOCAL TerminateImpl : public virtual Terminate,\r
-            public AbstractChildlessElement,\r
+            public AbstractSimpleElement,\r
             public AbstractDOMCachingXMLObject,\r
             public AbstractXMLObjectMarshaller,\r
             public AbstractXMLObjectUnmarshaller\r
@@ -1331,7 +1336,8 @@ namespace opensaml {
                 TerminateImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType)\r
                     : AbstractXMLObject(nsURI, localName, prefix, schemaType) { }\r
 \r
-                TerminateImpl(const TerminateImpl& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src) {\r
+                TerminateImpl(const TerminateImpl& src)\r
+                    : AbstractXMLObject(src), AbstractSimpleElement(src), AbstractDOMCachingXMLObject(src) {\r
                 }\r
 \r
                 IMPL_XMLOBJECT_CLONE(Terminate);\r