X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2Fsoap%2FSOAP.h;h=01b7fe9b7a96da9c86551b6b65c128f01cc42634;hb=a0d768778a8f5f539b909baf5b115e70ea765f0f;hp=3c79da4aaf28e4bf5d5458a39488cb03864f3faa;hpb=f17283e764500702b70a2f63bcca545bccc60d34;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/soap/SOAP.h b/xmltooling/soap/SOAP.h
index 3c79da4..01b7fe9 100644
--- a/xmltooling/soap/SOAP.h
+++ b/xmltooling/soap/SOAP.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,9 @@
 #ifndef __xmltooling_soap_h__
 #define __xmltooling_soap_h__
 
+#include <xmltooling/ConcreteXMLObjectBuilder.h>
 #include <xmltooling/ElementProxy.h>
-#include <xmltooling/XMLObjectBuilder.h>
 #include <xmltooling/util/XMLConstants.h>
-#include <xercesc/util/XMLUniDefs.hpp>
 
 /**
  * Macro for declaring SOAP builders.
@@ -51,13 +50,13 @@ namespace soap11 {
         /** Sets the QName content of the element. */
         virtual void setCode(const xmltooling::QName* qname)=0;
         /** Client Fault code. **/
-        static xmltooling::QName CLIENT;
-        /** Server Fault code. **/
-        static xmltooling::QName SERVER;
-        /** MustUnderstand Fault code. **/
-        static xmltooling::QName MUSTUNDERSTAND;
-        /** Version Mismatch Fault code. **/
-        static xmltooling::QName VERSIONMISMATCH;
+        static xmltooling::QName CLIENT;
+        /** Server Fault code. **/
+        static xmltooling::QName SERVER;
+        /** MustUnderstand Fault code. **/
+        static xmltooling::QName MUSTUNDERSTAND;
+        /** Version Mismatch Fault code. **/
+        static xmltooling::QName VERSIONMISMATCH;
     END_XMLOBJECT;
 
     BEGIN_XMLOBJECT(XMLTOOL_API,Detail,xmltooling::ElementProxy,SOAP 1.1 detail element);
@@ -75,14 +74,17 @@ namespace soap11 {
     END_XMLOBJECT;
 
     BEGIN_XMLOBJECT(XMLTOOL_API,Body,xmltooling::ElementProxy,SOAP 1.1 Body element);
-        DECL_STRING_ATTRIB(EncodingStyle,ENCODINGSTYLE);
+        /** encodingStyle attribute name */
+        static const XMLCh ENCODINGSTYLE_ATTRIB_NAME[];
         /** Body (type) local name */
         static const XMLCh TYPE_NAME[];
     END_XMLOBJECT;
 
     BEGIN_XMLOBJECT(XMLTOOL_API,Header,xmltooling::ElementProxy,SOAP 1.1 Header element);
-        DECL_BOOLEAN_ATTRIB(MustUnderstand,MUSTUNDERSTAND,false);
-        DECL_STRING_ATTRIB(Actor,ACTOR);
+        /** Actor header block attribute name */
+        static const XMLCh ACTOR_ATTRIB_NAME[];
+        /** mustUnderstand header block attribute name */
+        static const XMLCh MUSTUNDERSTAND_ATTRIB_NAME[];
         /** Header (type) local name */
         static const XMLCh TYPE_NAME[];
     END_XMLOBJECT;
@@ -98,10 +100,10 @@ namespace soap11 {
     DECL_SOAP11OBJECTBUILDER(Envelope);
     DECL_SOAP11OBJECTBUILDER(Fault);
     DECL_SOAP11OBJECTBUILDER(Header);
-    DECL_XMLOBJECTBUILDER(XMLTOOL_API,Detail,NULL,NULL);
-    DECL_XMLOBJECTBUILDER(XMLTOOL_API,Faultactor,NULL,NULL);
-    DECL_XMLOBJECTBUILDER(XMLTOOL_API,Faultcode,NULL,NULL);
-    DECL_XMLOBJECTBUILDER(XMLTOOL_API,Faultstring,NULL,NULL);
+    DECL_XMLOBJECTBUILDER(XMLTOOL_API,Detail,nullptr,nullptr);
+    DECL_XMLOBJECTBUILDER(XMLTOOL_API,Faultactor,nullptr,nullptr);
+    DECL_XMLOBJECTBUILDER(XMLTOOL_API,Faultcode,nullptr,nullptr);
+    DECL_XMLOBJECTBUILDER(XMLTOOL_API,Faultstring,nullptr,nullptr);
 
     /**
      * Registers builders and validators for SOAP 1.1 classes into the runtime.