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 su...@apache.org on 2003/10/21 17:09:43 UTC
cvs commit: ws-axis/c/include/axis/soap SoapDeSerializer.h SoapSerializer.h
susantha 2003/10/21 08:09:43
Modified: c/include/axis/client Call.h
c/include/axis/common BasicTypeSerializer.h
IWrapperSoapDeSerializer.h IWrapperSoapSerializer.h
c/include/axis/engine AxisEngine.h
c/include/axis/soap SoapDeSerializer.h SoapSerializer.h
Log:
some improvements/changes/bug fixes found when writing interop test samples
Revision Changes Path
1.2 +13 -13 ws-axis/c/include/axis/client/Call.h
Index: Call.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/client/Call.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Call.h 20 Oct 2003 03:18:18 -0000 1.1
+++ Call.h 21 Oct 2003 15:09:42 -0000 1.2
@@ -101,19 +101,19 @@
void AddParameter(Axis_Array* pArray, XSDTYPE nType, const char* pchName);
/* Methods for adding parameters of basic types */
- void AddParameter(int nValue,const char* pchName);
- void AddParameter(unsigned int unValue,const char* pchName);
- void AddParameter(short sValue,const char* pchName);
- void AddParameter(unsigned short usValue,const char* pchName);
- void AddParameter(long lValue,const char* pchName);
- void AddParameter(unsigned long ulValue,const char* pchName);
- void AddParameter(char cValue,const char* pchName);
- void AddParameter(unsigned char ucValue,const char* pchName);
- void AddParameter(float fValue,const char* pchName);
- void AddParameter(double dValue,const char* pchName);
- void AddParameter(struct tm tValue,const char* pchName);
- void AddParameter(const AxisChar* pStrValue,const char* pchName);
- void AddParameter(const AxisString& sStrValue,const char* pchName);
+ void AddParameter(int nValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(unsigned int unValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(short sValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(unsigned short usValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(long lValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(unsigned long ulValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(char cValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(unsigned char ucValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(float fValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(double dValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(struct tm tValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(const AxisChar* pStrValue,const char* pchName, XSDTYPE nType);
+ void AddParameter(const AxisString& sStrValue,const char* pchName, XSDTYPE nType);
/* Method that set the remote method name */
void SetOperation(const char* pchOperation, const char* pchNamespace);
1.2 +11 -11 ws-axis/c/include/axis/common/BasicTypeSerializer.h
Index: BasicTypeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/BasicTypeSerializer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicTypeSerializer.h 20 Oct 2003 03:18:19 -0000 1.1
+++ BasicTypeSerializer.h 21 Oct 2003 15:09:42 -0000 1.2
@@ -84,17 +84,17 @@
{
public:
const AxisString& GetEntityReferenced(const AxisString& str);
- const AxisChar* serialize(const AxisChar* sName, const AxisChar* sValue, XSDTYPE type=XSD_STRING);
- const AxisChar* serialize(const AxisChar* sName, float fValue);
- const AxisChar* serialize(const AxisChar* sName, double dValue, XSDTYPE type=XSD_DOUBLE);
- const AxisChar* serialize(const AxisChar* sName, int nValue);
- const AxisChar* serialize(const AxisChar* sName, unsigned int unValue);
- const AxisChar* serialize(const AxisChar* sName, short sValue);
- const AxisChar* serialize(const AxisChar* sName, unsigned short usValue);
- const AxisChar* serialize(const AxisChar* sName, char cValue);
- const AxisChar* serialize(const AxisChar* sName, unsigned char ucValue);
- const AxisChar* serialize(const AxisChar* sName, long lValue, XSDTYPE type=XSD_LONG);
- const AxisChar* serialize(const AxisChar* sName, unsigned long ulValue);
+ const AxisChar* serialize(const AxisChar* sName, const AxisChar* sValue, XSDTYPE type);
+ const AxisChar* serialize(const AxisChar* sName, float fValue, XSDTYPE type);
+ const AxisChar* serialize(const AxisChar* sName, double dValue, XSDTYPE type);
+ const AxisChar* serialize(const AxisChar* sName, int nValue, XSDTYPE type);
+ const AxisChar* serialize(const AxisChar* sName, unsigned int unValue, XSDTYPE type);
+ const AxisChar* serialize(const AxisChar* sName, short sValue, XSDTYPE type);
+ const AxisChar* serialize(const AxisChar* sName, unsigned short usValue, XSDTYPE type);
+ const AxisChar* serialize(const AxisChar* sName, char cValue, XSDTYPE type);
+ const AxisChar* serialize(const AxisChar* sName, unsigned char ucValue, XSDTYPE type);
+ const AxisChar* serialize(const AxisChar* sName, long lValue, XSDTYPE type);
+ const AxisChar* serialize(const AxisChar* sName, unsigned long ulValue, XSDTYPE type);
const AxisChar* serialize(const AxisChar* sName, tm datetime, XSDTYPE type);
const AxisChar* BasicTypeStr(XSDTYPE type);
1.2 +2 -3 ws-axis/c/include/axis/common/IWrapperSoapDeSerializer.h
Index: IWrapperSoapDeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/IWrapperSoapDeSerializer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IWrapperSoapDeSerializer.h 20 Oct 2003 03:18:19 -0000 1.1
+++ IWrapperSoapDeSerializer.h 21 Oct 2003 15:09:42 -0000 1.2
@@ -87,6 +87,8 @@
virtual Axis_Array GetArray(void* pDZFunct, void* pCreFunct, void* pDelFunct, void* pSizeFunct, const AxisChar* pchTypeName, const AxisChar* pchURI)=0;
/* Method used by wrappers to get a deserialized Array of basic types */
virtual Axis_Array GetArray(XSDTYPE nType)=0;
+ virtual int GetArraySize()=0;
+ virtual int GetArray(Axis_Array* pArray, XSDTYPE nType)=0;
/* Method used by wrappers to get a deserialized single object of complex type */
virtual void* GetObject(void* pDZFunct, void* pCreFunct, void* pDelFunct, const AxisChar* pchTypeName, const AxisChar* pchURI)=0;
@@ -116,9 +118,6 @@
/*return a tm struct which contain years-months-dates-hours-
minutes-seconds which represents a duration*/
virtual long GetDuration() = 0;
- virtual void* CreateArray(XSDTYPE nType, int nSize)=0;
- virtual void DeleteArray(void* pArray, XSDTYPE nType)=0;
-
};
#endif // !defined(AFX_IWRAPPERSOAPDESERIALIZER_H__A6C89D23_4098_4A73_BFD7_D8F115AD9BA0__INCLUDED_)
1.2 +26 -27 ws-axis/c/include/axis/common/IWrapperSoapSerializer.h
Index: IWrapperSoapSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/IWrapperSoapSerializer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IWrapperSoapSerializer.h 20 Oct 2003 03:18:19 -0000 1.1
+++ IWrapperSoapSerializer.h 21 Oct 2003 15:09:42 -0000 1.2
@@ -79,21 +79,20 @@
class IWrapperSoapSerializer : public virtual ISoapSerializer
{
public:
- virtual int AddOutputParam(const AxisChar* pchName, XSDTYPE nType, long lValue)=0;
//for basic types
- virtual int AddOutputParam(const AxisChar* pchName, int nValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, unsigned int unValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, short sValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, unsigned short usValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, long lValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, unsigned long ulValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, char cValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, unsigned char ucValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, float fValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, double dValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, struct tm tValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, const AxisChar* pStrValue)=0;
- virtual int AddOutputParam(const AxisChar* pchName, const string& sStrValue)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, int nValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, unsigned int unValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, short sValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, unsigned short usValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, long lValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, unsigned long ulValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, char cValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, unsigned char ucValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, float fValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, double dValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, struct tm tValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, const AxisChar* pStrValue, XSDTYPE type)=0;
+ virtual int AddOutputParam(const AxisChar* pchName, const string& sStrValue, XSDTYPE type)=0;
//for arrays
virtual int AddOutputParam(const AxisChar* pchName, const Axis_Array* pArray, void* pSZFunct, void* pDelFunct, void* pSizeFunct, const AxisChar* pchTypeName, const AxisChar* pchURI)=0;
virtual int AddOutputParam(const AxisChar* pchName, const Axis_Array* pArray, XSDTYPE nType)=0;
@@ -108,19 +107,19 @@
virtual int SerializeArray(const Axis_Array* pArray, XSDTYPE nType, const AxisChar* pchArrayName)=0;
public: //Basic Type Serializing methods
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, const AxisChar* sValue, XSDTYPE type=XSD_STRING)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, const string sValue, XSDTYPE type=XSD_STRING)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, struct tm tValue)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, int nValue)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned int unValue)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, short sValue)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned short usValue)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, char cValue)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned char ucValue)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, long lValue, XSDTYPE type=XSD_LONG)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned long ulValue)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, float fValue)=0;
- virtual const AxisChar* SerializeBasicType(const AxisChar* sName, double dValue, XSDTYPE type=XSD_DOUBLE)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, const AxisChar* sValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, const string sValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, struct tm tValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, int nValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned int unValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, short sValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned short usValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, char cValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned char ucValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, long lValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned long ulValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, float fValue, XSDTYPE type)=0;
+ virtual const AxisChar* SerializeBasicType(const AxisChar* sName, double dValue, XSDTYPE type)=0;
};
#endif // !defined(AFX_IWRAPPERSOAPSERIALIZER_H__D3E794EC_8A67_4E0E_BE28_583DCDCE1C42__INCLUDED_)
1.2 +1 -1 ws-axis/c/include/axis/engine/AxisEngine.h
Index: AxisEngine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/engine/AxisEngine.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AxisEngine.h 20 Oct 2003 03:18:19 -0000 1.1
+++ AxisEngine.h 21 Oct 2003 15:09:42 -0000 1.2
@@ -89,7 +89,7 @@
HandlerChain* m_pSResFChain;
MessageData* m_pMsgData;
public:
- static bool m_bServer;
+ static int m_bServer;
public:
AxisEngine();
virtual ~AxisEngine();
1.2 +5 -2 ws-axis/c/include/axis/soap/SoapDeSerializer.h
Index: SoapDeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/soap/SoapDeSerializer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoapDeSerializer.h 20 Oct 2003 03:18:20 -0000 1.1
+++ SoapDeSerializer.h 21 Oct 2003 15:09:42 -0000 1.2
@@ -57,7 +57,7 @@
*
*
*
- * @author Susantha Kumara (skumara@virtusa.com)
+ * @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
*
*/
// SoapDeSerializer.h: interface for the SoapDeSerializer class.
@@ -86,6 +86,7 @@
SAX2XMLReader* m_pParser;
const Ax_soapstream* m_pInputStream;
char m_hugebuffer[HUGE_BUFFER_SIZE];
+ Param* m_pLastArrayParam;
public:
int GetVersion();
const AxisChar* GetMethodName();
@@ -104,6 +105,8 @@
Axis_Array GetArray(void* pDZFunct, void* pCreFunct, void* pDelFunct, void* pSizeFunct, const AxisChar* pchTypeName, const AxisChar* pchURI);
/* Method used by wrappers to get a deserialized Array of basic types */
Axis_Array GetArray(XSDTYPE nType);
+ int GetArraySize();
+ int GetArray(Axis_Array* pArray, XSDTYPE nType);
/* Method used by wrappers to get a deserialized single object of complex type */
void* GetObject(void* pDZFunct, void* pCreFunct, void* pDelFunct, const AxisChar* pchTypeName, const AxisChar* pchURI);
@@ -134,7 +137,7 @@
minutes-seconds which represents a duration*/
long GetDuration();
void* CreateArray(XSDTYPE nType, int nSize);
- void DeleteArray(void* pArray, XSDTYPE nType);
+ void DeleteArray(Axis_Array* pArray , XSDTYPE nType);
};
#endif // !defined(AFX_SOAPDESERIALIZER_H__FD0E7C3B_B887_480A_9E2A_20736A88B09B__INCLUDED_)
1.2 +27 -27 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoapSerializer.h 20 Oct 2003 03:18:20 -0000 1.1
+++ SoapSerializer.h 21 Oct 2003 15:09:42 -0000 1.2
@@ -58,6 +58,7 @@
*
*
* @author Roshan Weerasuriya (roshan@jkcs.slt.lk, roshan@opensource.lk)
+ * @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
*
*/
@@ -109,21 +110,20 @@
int setSoapEnvelope(SoapEnvelope* pSoapEnvelope);
SoapSerializer();
virtual ~SoapSerializer();
- int AddOutputParam(const AxisChar* pchName, XSDTYPE nType, long lValue);
//for basic types
- int AddOutputParam(const AxisChar* pchName, int nValue);
- int AddOutputParam(const AxisChar* pchName, unsigned int unValue);
- int AddOutputParam(const AxisChar* pchName, short sValue);
- int AddOutputParam(const AxisChar* pchName, unsigned short usValue);
- int AddOutputParam(const AxisChar* pchName, long lValue);
- int AddOutputParam(const AxisChar* pchName, unsigned long ulValue);
- int AddOutputParam(const AxisChar* pchName, char cValue);
- int AddOutputParam(const AxisChar* pchName, unsigned char ucValue);
- int AddOutputParam(const AxisChar* pchName, float fValue);
- int AddOutputParam(const AxisChar* pchName, double dValue);
- int AddOutputParam(const AxisChar* pchName, struct tm tValue);
- int AddOutputParam(const AxisChar* pchName, const AxisChar* pStrValue);
- int AddOutputParam(const AxisChar* pchName, const string& sStrValue);
+ int AddOutputParam(const AxisChar* pchName, int nValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, unsigned int unValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, short sValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, unsigned short usValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, long lValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, unsigned long ulValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, char cValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, unsigned char ucValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, float fValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, double dValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, struct tm tValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, const AxisChar* pStrValue, XSDTYPE type);
+ int AddOutputParam(const AxisChar* pchName, const string& sStrValue, XSDTYPE type);
//for arrays of basic types
int AddOutputParam(const AxisChar* pchName, const Axis_Array* pArray, XSDTYPE nType);
//for arrays of complex types
@@ -144,19 +144,19 @@
int setHeaderBlock(HeaderBlock* pHeaderBlock);
IHeaderBlock* createHeaderBlock();
- const AxisChar* SerializeBasicType(const AxisChar* sName, const AxisChar* sValue, XSDTYPE type=XSD_STRING);
- const AxisChar* SerializeBasicType(const AxisChar* sName, const string sValue, XSDTYPE type=XSD_STRING);
- const AxisChar* SerializeBasicType(const AxisChar* sName, int nValue);
- const AxisChar* SerializeBasicType(const AxisChar* sName, struct tm tValue);
- const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned int unValue);
- const AxisChar* SerializeBasicType(const AxisChar* sName, short sValue);
- const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned short usValue);
- const AxisChar* SerializeBasicType(const AxisChar* sName, char cValue);
- const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned char ucValue);
- const AxisChar* SerializeBasicType(const AxisChar* sName, long lValue, XSDTYPE type=XSD_LONG);
- const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned long ulValue);
- const AxisChar* SerializeBasicType(const AxisChar* sName, float fValue);
- const AxisChar* SerializeBasicType(const AxisChar* sName, double dValue, XSDTYPE type=XSD_DOUBLE);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, const AxisChar* sValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, const string sValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, int nValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, struct tm tValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned int unValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, short sValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned short usValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, char cValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned char ucValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, long lValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, unsigned long ulValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, float fValue, XSDTYPE type);
+ const AxisChar* SerializeBasicType(const AxisChar* sName, double dValue, XSDTYPE type);
private:
BasicTypeSerializer m_BTSZ;