You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ro...@apache.org on 2004/02/03 05:45:54 UTC
cvs commit: ws-axis/c/include/axis/soap SoapSerializer.h SoapHeader.h HeaderBlock.h ComplexElement.h CharacterElement.h BasicNode.h Attribute.h
roshan 2004/02/02 20:45:54
Modified: c/include/axis/soap SoapSerializer.h SoapHeader.h
HeaderBlock.h ComplexElement.h CharacterElement.h
BasicNode.h Attribute.h
Log:
changes for header support
Revision Changes Path
1.7 +17 -0 ws-axis/c/include/axis/soap/SoapSerializer.h
Index: SoapSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/soap/SoapSerializer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SoapSerializer.h 19 Jan 2004 07:44:12 -0000 1.6
+++ SoapSerializer.h 3 Feb 2004 04:45:53 -0000 1.7
@@ -119,10 +119,27 @@
map<AxisXMLString, AxisXMLString> m_NsStack;
public:
+ int setOutputStreamForTesting(const Ax_soapstream* pStream);
int AXISCALL CreateSoapMethod(const AxisChar* sLocalName, const AxisChar* sURI);
+
// IWrapperSoapSerializer& operator<<(const char* cSerialized);
IWrapperSoapSerializer& operator<<(const AxisChar* cSerialized);
+ /**
+ * Returns the corrosponding namespace prefix.
+ * @param pNamespace The namespace.
+ * @return The corrosponding prefix.
+ */
const AxisChar* AXISCALL GetNamespacePrefix(const AxisChar* pNamespace);
+ /**
+ * Returns the corrosponding namespace prefix. This method is called when the
+ * caller also wants to know whether this is a new namespace or not as appose
+ * to its overloaded other member.
+ * @param pNamespace The namespace.
+ * @param blnIsNewPrefix The boolean which behaves as a out parameter to indicate
+ * whether this is a new namespace or not.
+ * @return The corrosponding prefix.
+ */
+ const AxisChar* AXISCALL GetNamespacePrefix(const AxisChar* pNamespace, bool& blnIsNewPrefix);
void AXISCALL RemoveNamespacePrefix(const AxisChar* pNamespace);
int setSoapVersion(SOAP_VERSION);
int Init();
1.3 +8 -0 ws-axis/c/include/axis/soap/SoapHeader.h
Index: SoapHeader.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/soap/SoapHeader.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SoapHeader.h 14 Jan 2004 12:57:10 -0000 1.2
+++ SoapHeader.h 3 Feb 2004 04:45:53 -0000 1.3
@@ -85,6 +85,8 @@
@author Roshan Weerasuriya (roshan@jkcs.slt.lk, roshan@opensource.lk)
*/
+typedef enum { HEADER_LEVEL=0, HEADER_BLOCK_LEVEL, HEADER_BLOCK_INSIDE_LEVEL} HEADER_LEVELS;
+
class SoapHeader : public ISoapHeader
{
private:
@@ -96,7 +98,13 @@
list<Attribute*> m_namespaceDecls;
list<HeaderBlock*> m_headerBlocks;
//string m_strHeaderSerialized;
+ const char* m_pcPrefix;
public:
+ int setPrefix(const char* pcPrefix);
+ /**
+ * Removes the next HeaderBlock from the list and returns it. But will not delete it.
+ * @return The removed HeaderBlock of the list.
+ */
IHeaderBlock* getHeaderBlock();
int addNamespaceDecl(Attribute* pAttribute);
int addAttribute(Attribute* pAttribute);
1.3 +4 -2 ws-axis/c/include/axis/soap/HeaderBlock.h
Index: HeaderBlock.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/soap/HeaderBlock.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HeaderBlock.h 14 Jan 2004 12:57:10 -0000 1.2
+++ HeaderBlock.h 3 Feb 2004 04:45:53 -0000 1.3
@@ -106,11 +106,11 @@
private:
int serializeNamespaceDecl(SoapSerializer& pSZ);
- int serializeChildren(SoapSerializer& pSZ);
+ int serializeChildren(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack);
//int serializeChildren(string& sSerialized);
list<BasicNode*> m_children;
bool isSerializable();
- int attrSerialize(SoapSerializer& pSZ);
+ int attrSerialize(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack);
//int attrSerialize(string&);
AxisString m_localname;
AxisString m_prefix;
@@ -121,6 +121,8 @@
//string m_strSerialized;
public:
+ bool operator ==( const HeaderBlock &objHeaderBlock);
+ int initializeForTesting();
BasicNode* createChild(NODE_TYPE eNODE_TYPE);
BasicNode* getFirstChild();
int addNamespaceDecl(Attribute *pAttribute);
1.4 +2 -0 ws-axis/c/include/axis/soap/ComplexElement.h
Index: ComplexElement.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/soap/ComplexElement.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComplexElement.h 14 Jan 2004 12:57:10 -0000 1.3
+++ ComplexElement.h 3 Feb 2004 04:45:53 -0000 1.4
@@ -88,6 +88,7 @@
NODE_TYPE getNodeType();
int setURI(const AxisChar* sURI);
int serialize(SoapSerializer& pSZ);
+ int serialize(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack);
int addChild(BasicNode* pBasicNode);
int setLocalName(const AxisChar* sLocalName);
int setPrefix(const AxisChar* sPrefix);
@@ -96,6 +97,7 @@
private:
int serializeChildren(SoapSerializer& pSZ);
+ int serializeChildren(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack);
//int serializeChildren(string& sSerialized);
bool isSerializable();
list<BasicNode*> m_children;
1.4 +6 -0 ws-axis/c/include/axis/soap/CharacterElement.h
Index: CharacterElement.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/soap/CharacterElement.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CharacterElement.h 14 Jan 2004 12:57:10 -0000 1.3
+++ CharacterElement.h 3 Feb 2004 04:45:53 -0000 1.4
@@ -79,9 +79,15 @@
class CharacterElement : public BasicNode
{
public:
+ bool operator ==( const CharacterElement &objChEle);
int setValue(const AxisChar* sValue);
const AxisString& getValue();
int serialize(SoapSerializer& pSZ);
+ /**
+ * This method is actualy not used in this class. This method was just
+ * included to adhere its interface.
+ */
+ int serialize(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack) {return AXIS_SUCCESS;}
NODE_TYPE getNodeType();
CharacterElement(const AxisChar* sValue);
CharacterElement();
1.3 +4 -0 ws-axis/c/include/axis/soap/BasicNode.h
Index: BasicNode.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/soap/BasicNode.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasicNode.h 14 Jan 2004 12:57:10 -0000 1.2
+++ BasicNode.h 3 Feb 2004 04:45:53 -0000 1.3
@@ -69,6 +69,7 @@
#define AFX_BASICNODE_H__623900B8_2737_4E36_8F26_97898C5BD47D__INCLUDED_
#include <string>
+#include <list>
#include "../common/GDefine.h"
using namespace std;
@@ -86,14 +87,17 @@
class BasicNode
{
public:
+ //virtual bool operator ==( const BasicNode &objChEle)=0;
virtual const AxisString& getValue()=0;
virtual int setValue(const AxisChar* sValue)=0;
virtual NODE_TYPE getNodeType()=0;
virtual int serialize(SoapSerializer& pSZ) =0;
+ virtual int serialize(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack) =0;
virtual ~BasicNode() {};
protected:
NODE_TYPE m_iNodeType;
+ string m_sPrefix;
AxisString m_sValue;
};
1.3 +3 -0 ws-axis/c/include/axis/soap/Attribute.h
Index: Attribute.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/soap/Attribute.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Attribute.h 14 Jan 2004 12:57:10 -0000 1.2
+++ Attribute.h 3 Feb 2004 04:45:53 -0000 1.3
@@ -65,6 +65,7 @@
#define AFX_ATTRIBUTE_H__10ABD25E_AF15_4DE7_AA27_6AB96102087C__INCLUDED_
#include <string>
+#include <list>
#include "../common/GDefine.h"
using namespace std;
@@ -89,7 +90,9 @@
AxisString m_value;
//string m_strAttrSerialized;
public:
+ int initializeForTesting();
int serialize(SoapSerializer& pSZ) const;
+ int serialize(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack);
//int serialize(string&);
Attribute();
Attribute(const AxisChar* localname, const AxisChar* prefix, const AxisChar* uri, const AxisChar* value);