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

[shibboleth/cpp-opensaml.git] / saml / saml2 / core / Assertions.h

diff --git a/saml/saml2/core/Assertions.h b/saml/saml2/core/Assertions.h
index a21444d..c48a323 100644 (file)
--- a/saml/saml2/core/Assertions.h
+++ b/saml/saml2/core/Assertions.h
@@ -28,13 +28,11 @@
 
 #include <xmltooling/AttributeExtensibleXMLObject.h>
 #include <xmltooling/ElementProxy.h>
-#include <xmltooling/SimpleElement.h>
 #include <xmltooling/XMLObjectBuilder.h>
 #include <xmltooling/encryption/Encryption.h>
 #include <xmltooling/signature/KeyResolver.h>
 #include <xmltooling/signature/Signature.h>
 #include <xmltooling/util/DateTime.h>
-#include <xmltooling/validation/ValidatorSuite.h>
 
 #define DECL_SAML2OBJECTBUILDER(cname) \
     DECL_XMLOBJECTBUILDER(SAML_API,cname,opensaml::SAMLConstants::SAML20_NS,opensaml::SAMLConstants::SAML20_PREFIX)
@@ -86,30 +84,30 @@ namespace opensaml {
             DECL_STRING_ATTRIB(SPNameQualifier,SPNAMEQUALIFIER);
         END_XMLOBJECT;
 
-        BEGIN_XMLOBJECT(SAML_API,NameIDType,xmltooling::SimpleElement,SAML 2.0 NameIDType type);
+        BEGIN_XMLOBJECT(SAML_API,NameIDType,xmltooling::XMLObject,SAML 2.0 NameIDType type);
             DECL_STRING_ATTRIB(NameQualifier,NAMEQUALIFIER);
             DECL_STRING_ATTRIB(SPNameQualifier,SPNAMEQUALIFIER);
             DECL_STRING_ATTRIB(Format,FORMAT);
             DECL_STRING_ATTRIB(SPProvidedID,SPPROVIDEDID);
-            DECL_XMLOBJECT_CONTENT(Name);
+            DECL_SIMPLE_CONTENT(Name);
             /** NameIDType local name */
             static const XMLCh TYPE_NAME[];
-            /** Unspecified name format ID */\r
-            static const XMLCh UNSPECIFIED[];\r
-            /** Email address name format ID */\r
-            static const XMLCh EMAIL[];\r
-            /** X.509 subject name format ID */\r
-            static const XMLCh X509_SUBJECT[];\r
-            /** Windows domain qualified name format ID */\r
-            static const XMLCh WIN_DOMAIN_QUALIFIED[];\r
-            /** Kerberos principal name format ID */\r
-            static const XMLCh KERBEROS[];\r
-            /** Entity identifier name format ID */\r
-            static const XMLCh ENTITY[];\r
-            /** Persistent identifier name format ID */\r
-            static const XMLCh PERSISTENT[];\r
-            /** Transient identifier name format ID */\r
-            static const XMLCh TRANSIENT[];\r
+            /** Unspecified name format ID */
+            static const XMLCh UNSPECIFIED[];
+            /** Email address name format ID */
+            static const XMLCh EMAIL[];
+            /** X.509 subject name format ID */
+            static const XMLCh X509_SUBJECT[];
+            /** Windows domain qualified name format ID */
+            static const XMLCh WIN_DOMAIN_QUALIFIED[];
+            /** Kerberos principal name format ID */
+            static const XMLCh KERBEROS[];
+            /** Entity identifier name format ID */
+            static const XMLCh ENTITY[];
+            /** Persistent identifier name format ID */
+            static const XMLCh PERSISTENT[];
+            /** Transient identifier name format ID */
+            static const XMLCh TRANSIENT[];
         END_XMLOBJECT;
 
         BEGIN_XMLOBJECT(SAML_API,NameID,NameIDType,SAML 2.0 NameID element);
@@ -156,7 +154,7 @@ namespace opensaml {
             DECL_STRING_ATTRIB(Recipient,RECIPIENT);
             DECL_STRING_ATTRIB(InResponseTo,INRESPONSETO);
             DECL_STRING_ATTRIB(Address,ADDRESS);
-            DECL_XMLOBJECT_CONTENT(Data);
+            DECL_SIMPLE_CONTENT(Data);
         END_XMLOBJECT;
 
         BEGIN_XMLOBJECT(SAML_API,KeyInfoConfirmationDataType,xmltooling::AttributeExtensibleXMLObject,SAML 2.0 KeyInfoConfirmationDataType type);
@@ -180,11 +178,11 @@ namespace opensaml {
             /** SubjectConfirmationType local name */
             static const XMLCh TYPE_NAME[];
             /** Bearer confirmation method */
-            static const XMLCh BEARER[];\r
-            /** Holder of key confirmation method */\r
-            static const XMLCh HOLDER_KEY[];\r
-            /** Sender vouches confirmation method */\r
-            static const XMLCh SENDER_VOUCHES[];\r
+            static const XMLCh BEARER[];
+            /** Holder of key confirmation method */
+            static const XMLCh HOLDER_KEY[];
+            /** Sender vouches confirmation method */
+            static const XMLCh SENDER_VOUCHES[];
         END_XMLOBJECT;
 
         BEGIN_XMLOBJECT(SAML_API,Subject,xmltooling::XMLObject,SAML 2.0 Subject element);
@@ -228,19 +226,19 @@ namespace opensaml {
             static const XMLCh TYPE_NAME[];
         END_XMLOBJECT;
 
-        BEGIN_XMLOBJECT(SAML_API,Action,xmltooling::SimpleElement,SAML 2.0 Action element);
+        BEGIN_XMLOBJECT(SAML_API,Action,xmltooling::XMLObject,SAML 2.0 Action element);
             DECL_STRING_ATTRIB(Namespace,NAMESPACE);
-            DECL_XMLOBJECT_CONTENT(Action);
+            DECL_SIMPLE_CONTENT(Action);
             /** ActionType local name */
             static const XMLCh TYPE_NAME[];
             /** Read/Write/Execute/Delete/Control Action Namespace */
-            static const XMLCh RWEDC_NEG_ACTION_NAMESPACE[];\r
+            static const XMLCh RWEDC_NEG_ACTION_NAMESPACE[];
             /** Read/Write/Execute/Delete/Control with Negation Action Namespace */
-            static const XMLCh RWEDC_ACTION_NAMESPACE[];\r
+            static const XMLCh RWEDC_ACTION_NAMESPACE[];
             /** Get/Head/Put/Post Action Namespace */
-            static const XMLCh GHPP_ACTION_NAMESPACE[];\r
+            static const XMLCh GHPP_ACTION_NAMESPACE[];
             /** UNIX File Permissions Action Namespace */
-            static const XMLCh UNIX_ACTION_NAMESPACE[];\r
+            static const XMLCh UNIX_ACTION_NAMESPACE[];
         END_XMLOBJECT;
 
         BEGIN_XMLOBJECT(SAML_API,Evidence,xmltooling::XMLObject,SAML 2.0 Evidence element);
@@ -277,12 +275,12 @@ namespace opensaml {
             DECL_XMLOBJECT_CHILDREN(AttributeValue);
             /** AttributeType local name */
             static const XMLCh TYPE_NAME[];
-            /** Unspecified attribute name format ID */\r
-            static const XMLCh UNSPECIFIED[];\r
-            /** URI reference attribute name format ID */\r
-            static const XMLCh URI_REFERENCE[];\r
-            /** Basic attribute name format ID */\r
-            static const XMLCh BASIC[];\r
+            /** Unspecified attribute name format ID */
+            static const XMLCh UNSPECIFIED[];
+            /** URI reference attribute name format ID */
+            static const XMLCh URI_REFERENCE[];
+            /** Basic attribute name format ID */
+            static const XMLCh BASIC[];
         END_XMLOBJECT;
 
         BEGIN_XMLOBJECT(SAML_API,EncryptedAttribute,EncryptedElementType,SAML 2.0 EncryptedAttribute element);