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 2004/01/28 11:23:22 UTC
cvs commit: ws-axis/c/vc/server/samples/interoptests/cbase cbase.dsp
susantha 2004/01/28 02:23:21
Modified: c/include/axis/common IHandlerSoapDeSerializer.h
IWrapperSoapDeSerializer.h IWrapperSoapSerializer.h
c/vc/client/samples/interoptests/cbase cbase.dsp
c/vc/server/samples/interoptests/cbase cbase.dsp
Log:
WSDL2WS modifications to generate RPC style services and client in C
Revision Changes Path
1.4 +12 -0 ws-axis/c/include/axis/common/IHandlerSoapDeSerializer.h
Index: IHandlerSoapDeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/common/IHandlerSoapDeSerializer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IHandlerSoapDeSerializer.h 14 Jan 2004 12:57:09 -0000 1.3
+++ IHandlerSoapDeSerializer.h 28 Jan 2004 10:23:11 -0000 1.4
@@ -73,6 +73,8 @@
@author Roshan Weerasuriya (roshan@jkcs.slt.lk, roshan@opensource.lk)
*/
+#ifdef __cplusplus
+
class IHandlerSoapDeSerializer : public IWrapperSoapDeSerializer
{
public:
@@ -92,5 +94,15 @@
virtual xsd__base64Binary AXISCALL GetBodyAsBase64Binary()=0;
virtual int AXISCALL SetNewSoapBody(AxisChar* pNewSoapBody)=0;
};
+
+#else
+
+typedef struct {
+ void* unused; /* this corresponds to C++ virtual function pointer which is ignored in C */
+ void* unused_; /* this corresponds to IWrapperSoapDeSerializerFunctions pointer */
+ IHandlerSoapDeSerializerFunctions* __vfptr;
+} IHandlerSoapDeSerializer;
+
+#endif
#endif // !defined(AFX_IHANDLERSOAPDESERIALIZER_H__EAD744F9_FEB3_4885_9510_D7BAD8C5AD1C__INCLUDED_)
1.7 +0 -6 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IWrapperSoapDeSerializer.h 20 Jan 2004 14:05:15 -0000 1.6
+++ IWrapperSoapDeSerializer.h 28 Jan 2004 10:23:11 -0000 1.7
@@ -139,12 +139,6 @@
IWrapperSoapDeSerializerFunctions* __vfptr;
} IWrapperSoapDeSerializer;
-typedef struct {
- void* unused; /* this corresponds to C++ virtual function pointer which is ignored in C */
- void* unused_; /* this corresponds to IWrapperSoapDeSerializerFunctions pointer */
- IHandlerSoapDeSerializerFunctions* __vfptr;
-} IHandlerSoapDeSerializer;
-
#else
/**
@class IWrapperSoapDeSerializer
1.6 +4 -4 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IWrapperSoapSerializer.h 19 Jan 2004 07:44:12 -0000 1.5
+++ IWrapperSoapSerializer.h 28 Jan 2004 10:23:11 -0000 1.6
@@ -82,7 +82,7 @@
int (AXISCALL* AddOutputCmplxArrayParam)(void* pObj, const Axis_Array* pArray, void* pSZFunct, void* pDelFunct, void* pSizeFunct, const AxisChar* pName, const AxisChar* pNamespace);
int (AXISCALL* AddOutputBasicArrayParam)(void* pObj, const Axis_Array* pArray, XSDTYPE nType, const AxisChar* pName);
/* for complex types */
- int (AXISCALL* AddOutputCmplxParam)(void* pObj, void* pObject, void* pDZFunct, void* pDelFunct, const AxisChar* pName, const AxisChar* pNamespace);
+ int (AXISCALL* AddOutputCmplxParam)(void* pObj, void* pObject, void* pSZFunct, void* pDelFunct, const AxisChar* pName, const AxisChar* pNamespace);
/* Methods used to serialize arrays */
int (AXISCALL* SerializeCmplxArray)(void* pObj, const Axis_Array* pArray, void* pSZFunct, void* pDelFunct, void* pSizeFunct, const AxisChar* pName, const AxisChar* pNamespace);
int (AXISCALL* SerializeBasicArray)(void* pObj, const Axis_Array* pArray, XSDTYPE nType, const AxisChar* pName);
@@ -126,7 +126,7 @@
virtual int AXISCALL AddOutputCmplxArrayParam(const Axis_Array* pArray, void* pSZFunct, void* pDelFunct, void* pSizeFunct, const AxisChar* pName, const AxisChar* pNamespace)=0;
virtual int AXISCALL AddOutputBasicArrayParam(const Axis_Array* pArray, XSDTYPE nType, const AxisChar* pName)=0;
/* for complex types */
- virtual int AXISCALL AddOutputCmplxParam(void* pObject, void* pDZFunct, void* pDelFunct, const AxisChar* pName, const AxisChar* pNamespace)=0;
+ virtual int AXISCALL AddOutputCmplxParam(void* pObject, void* pSZFunct, void* pDelFunct, const AxisChar* pName, const AxisChar* pNamespace)=0;
/* Methods used to serialize arrays */
virtual int AXISCALL SerializeCmplxArray(const Axis_Array* pArray, void* pSZFunct, void* pDelFunct, void* pSizeFunct, const AxisChar* pName, const AxisChar* pNamespace)=0;
virtual int AXISCALL SerializeBasicArray(const Axis_Array* pArray, XSDTYPE nType, const AxisChar* pName)=0;
@@ -152,8 +152,8 @@
{ return ((IWrapperSoapSerializer*)pObj)->AddOutputCmplxArrayParam(pArray, pSZFunct, pDelFunct, pSizeFunct, pName, pNamespace);};
static int AXISCALL s_AddOutputBasicArrayParam(void* pObj, const Axis_Array* pArray, XSDTYPE nType, const AxisChar* pName)
{ return ((IWrapperSoapSerializer*)pObj)->AddOutputBasicArrayParam(pArray, nType, pName);};
- static int AXISCALL s_AddOutputCmplxParam(void* pObj, void* pObject, void* pDZFunct, void* pDelFunct, const AxisChar* pName, const AxisChar* pNamespace)
- { return ((IWrapperSoapSerializer*)pObj)->AddOutputCmplxParam(pObject, pDZFunct, pDelFunct, pName, pNamespace);};
+ static int AXISCALL s_AddOutputCmplxParam(void* pObj, void* pObject, void* pSZFunct, void* pDelFunct, const AxisChar* pName, const AxisChar* pNamespace)
+ { return ((IWrapperSoapSerializer*)pObj)->AddOutputCmplxParam(pObject, pSZFunct, pDelFunct, pName, pNamespace);};
static int AXISCALL s_SerializeCmplxArray(void* pObj, const Axis_Array* pArray, void* pSZFunct, void* pDelFunct, void* pSizeFunct, const AxisChar* pName, const AxisChar* pNamespace)
{ return ((IWrapperSoapSerializer*)pObj)->SerializeCmplxArray(pArray, pSZFunct, pDelFunct, pSizeFunct, pName, pNamespace);};
static int AXISCALL s_SerializeBasicArray(void* pObj, const Axis_Array* pArray, XSDTYPE nType, const AxisChar* pName)
1.2 +27 -2 ws-axis/c/vc/client/samples/interoptests/cbase/cbase.dsp
Index: cbase.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/client/samples/interoptests/cbase/cbase.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cbase.dsp 12 Jan 2004 12:39:56 -0000 1.1
+++ cbase.dsp 28 Jan 2004 10:23:13 -0000 1.2
@@ -41,7 +41,8 @@
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -65,7 +66,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_EXPAT_PARSER" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_EXPAT_PARSER" /FD /GZ /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -85,10 +86,34 @@
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\client\samples\interoptests\cbase\InteropBaseClient.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\client\samples\interoptests\cbase\InteropTestPortType.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\client\samples\interoptests\cbase\SOAPStruct.c
+# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\client\samples\interoptests\cbase\InteropTestPortType.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\client\samples\interoptests\cbase\SOAPStruct.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\client\samples\interoptests\cbase\SOAPStruct_Array.h
+# End Source File
# End Group
# Begin Group "Resource Files"
1.3 +28 -0 ws-axis/c/vc/server/samples/interoptests/cbase/cbase.dsp
Index: cbase.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/server/samples/interoptests/cbase/cbase.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cbase.dsp 14 Jan 2004 04:53:38 -0000 1.2
+++ cbase.dsp 28 Jan 2004 10:23:19 -0000 1.3
@@ -90,10 +90,38 @@
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\server\samples\interoptests\cbase\InteropTestPortType.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\server\samples\interoptests\cbase\InteropTestPortTypeService.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\server\samples\interoptests\cbase\InteropTestPortTypeWrapper.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\server\samples\interoptests\cbase\SOAPStruct.c
+# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\server\samples\interoptests\cbase\InteropTestPortTypeWrapper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\server\samples\interoptests\cbase\SOAPStruct.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\server\samples\interoptests\cbase\SOAPStruct_Array.h
+# End Source File
# End Group
# Begin Group "Resource Files"