You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ro...@apache.org on 2004/08/16 08:14:26 UTC
cvs commit: ws-axis/c/samples/server/interoptests/groupB InteropTestPortTypeB.cpp Makefile.am SOAPArrayStruct.cpp SOAPArrayStruct.h SOAPStruct.cpp SOAPStruct.h SOAPStructStruct.cpp SOAPStructStruct.h deploy.wsdd undeploy.wsdd
roshan 2004/08/15 23:14:25
Modified: c/samples/server/interoptests/base InteropTestPortType.cpp
Makefile.am SOAPStruct.cpp SOAPStruct.h deploy.wsdd
undeploy.wsdd
c/samples/server/interoptests/cbase InteropTestPortType.c
SOAPStruct.c SOAPStruct.h
c/samples/server/interoptests/cgroupB InteropTestPortTypeB.c
SOAPArrayStruct.c SOAPArrayStruct.h SOAPStruct.c
SOAPStruct.h SOAPStructStruct.c SOAPStructStruct.h
c/samples/server/interoptests/groupB
InteropTestPortTypeB.cpp Makefile.am
SOAPArrayStruct.cpp SOAPArrayStruct.h
SOAPStruct.cpp SOAPStruct.h SOAPStructStruct.cpp
SOAPStructStruct.h deploy.wsdd undeploy.wsdd
Log:
modified hand written interop samples except doclit ones to conform to variable name changes
Revision Changes Path
1.5 +13 -13 ws-axis/c/samples/server/interoptests/base/InteropTestPortType.cpp
Index: InteropTestPortType.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/base/InteropTestPortType.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InteropTestPortType.cpp 12 Aug 2004 13:23:23 -0000 1.4
+++ InteropTestPortType.cpp 16 Aug 2004 06:14:20 -0000 1.5
@@ -33,44 +33,44 @@
{
}
xsd__string InteropTestPortType::echoString(xsd__string Value0)
-{ return Value0;
+{ return Value0;
}
xsd__string_Array InteropTestPortType::echoStringArray(xsd__string_Array Value0)
-{ return Value0;
+{ return Value0;
}
int InteropTestPortType::echoInteger(int Value0)
-{ return Value0;
+{ return Value0;
}
xsd__int_Array InteropTestPortType::echoIntegerArray(xsd__int_Array Value0)
-{ return Value0;
+{ return Value0;
}
float InteropTestPortType::echoFloat(float Value0)
-{ return Value0;
+{ return Value0;
}
xsd__float_Array InteropTestPortType::echoFloatArray(xsd__float_Array Value0)
-{ return Value0;
+{ return Value0;
}
SOAPStruct* InteropTestPortType::echoStruct(SOAPStruct* Value0)
-{ return Value0;
+{ return Value0;
}
SOAPStruct_Array InteropTestPortType::echoStructArray(SOAPStruct_Array Value0)
-{ return Value0;
+{ return Value0;
}
void InteropTestPortType::echoVoid()
{
}
xsd__base64Binary InteropTestPortType::echoBase64(xsd__base64Binary Value0)
-{ return Value0;
+{ return Value0;
}
xsd__dateTime InteropTestPortType::echoDate(xsd__dateTime Value0)
-{ return Value0;
+{ return Value0;
}
xsd__hexBinary InteropTestPortType::echoHexBinary(xsd__hexBinary Value0)
-{ return Value0;
+{ return Value0;
}
xsd__decimal InteropTestPortType::echoDecimal(xsd__decimal Value0)
-{ return Value0;
+{ return Value0;
}
xsd__boolean InteropTestPortType::echoBoolean(xsd__boolean Value0)
-{ return Value0;
+{ return Value0;
}
1.8 +3 -3 ws-axis/c/samples/server/interoptests/base/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/base/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 12 Aug 2004 13:23:24 -0000 1.7
+++ Makefile.am 16 Aug 2004 06:14:20 -0000 1.8
@@ -1,5 +1,5 @@
-lib_LTLIBRARIES = libInteropBase.la
+lib_LTLIBRARIES = libbase.la
SUBDIRS =
-libInteropBase_la_SOURCES = SOAPStruct.cpp AxisServiceException.cpp InteropTestPortTypeService.cpp InteropTestPortType.cpp InteropTestPortTypeWrapper.cpp
-libInteropBase_la_LIBADD = $(LDFLAGS)
+libbase_la_SOURCES = SOAPStruct.cpp AxisServiceException.cpp InteropTestPortTypeService.cpp InteropTestPortType.cpp InteropTestPortTypeWrapper.cpp
+libbase_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(AXISCPP_HOME)/include
1.7 +6 -6 ws-axis/c/samples/server/interoptests/base/SOAPStruct.cpp
Index: SOAPStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/base/SOAPStruct.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SOAPStruct.cpp 12 Aug 2004 13:23:24 -0000 1.6
+++ SOAPStruct.cpp 16 Aug 2004 06:14:20 -0000 1.7
@@ -24,9 +24,9 @@
Axis_URI_SOAPStruct, "\">", NULL);
}
- pSZ->serializeAsElement("SOAPStruct_varString", (void*)&(param->SOAPStruct_varString), XSD_STRING);
- pSZ->serializeAsElement("SOAPStruct_varInt", (void*)&(param->SOAPStruct_varInt), XSD_INT);
- pSZ->serializeAsElement("SOAPStruct_varFloat", (void*)&(param->SOAPStruct_varFloat), XSD_FLOAT);
+ pSZ->serializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
+ pSZ->serializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
+ pSZ->serializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
pSZ->serialize("</", Axis_TypeName_SOAPStruct, ">", NULL);
return AXIS_SUCCESS;
@@ -37,9 +37,9 @@
*/
int Axis_DeSerialize_SOAPStruct(SOAPStruct* param, IWrapperSoapDeSerializer* pIWSDZ)
{
- param->SOAPStruct_varString = pIWSDZ->getElementAsString("SOAPStruct_varString",0);
- param->SOAPStruct_varInt = pIWSDZ->getElementAsInt("SOAPStruct_varInt",0);
- param->SOAPStruct_varFloat = pIWSDZ->getElementAsFloat("SOAPStruct_varFloat",0);
+ param->varString = pIWSDZ->getElementAsString("varString",0);
+ param->varInt = pIWSDZ->getElementAsInt("varInt",0);
+ param->varFloat = pIWSDZ->getElementAsFloat("varFloat",0);
return pIWSDZ->getStatus();
}
void* Axis_Create_SOAPStruct(SOAPStruct* pObj, bool bArray = false, int nSize=0)
1.8 +3 -3 ws-axis/c/samples/server/interoptests/base/SOAPStruct.h
Index: SOAPStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/base/SOAPStruct.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SOAPStruct.h 12 Aug 2004 13:23:24 -0000 1.7
+++ SOAPStruct.h 16 Aug 2004 06:14:20 -0000 1.8
@@ -16,9 +16,9 @@
class SOAPStruct
{
public:
- xsd__string SOAPStruct_varString;
- int SOAPStruct_varInt;
- float SOAPStruct_varFloat;
+ xsd__string varString;
+ int varInt;
+ float varFloat;
SOAPStruct();
virtual ~SOAPStruct();
};
1.2 +2 -2 ws-axis/c/samples/server/interoptests/base/deploy.wsdd
Index: deploy.wsdd
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/base/deploy.wsdd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deploy.wsdd 1 Apr 2004 15:10:17 -0000 1.1
+++ deploy.wsdd 16 Aug 2004 06:14:20 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:CPP="http://xml.apache.org/axis/wsdd/providers/CPP">
- <service name="InteropBase" provider="CPP:RPC" description="Axis C++ web service">
- <parameter name="className" value="/user/local/apache/axis/InteropBase.so"/>
+ <service name="base" provider="CPP:RPC" description="Axis C++ web service">
+ <parameter name="className" value="/user/local/apache/axis/base.so"/>
<parameter name="allowedMethods" value="echoString echoStringArray echoInteger echoIntegerArray echoFloat echoFloatArray echoStruct echoStructArray echoVoid echoBase64 echoDate echoHexBinary echoDecimal echoBoolean "/>
</service>
</deployment>
1.2 +1 -1 ws-axis/c/samples/server/interoptests/base/undeploy.wsdd
Index: undeploy.wsdd
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/base/undeploy.wsdd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- undeploy.wsdd 1 Apr 2004 15:10:17 -0000 1.1
+++ undeploy.wsdd 16 Aug 2004 06:14:20 -0000 1.2
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<undeployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:CPP="http://xml.apache.org/axis/wsdd/providers/CPP">
- <service name="InteropBase"/>
+ <service name="base"/>
</undeployment>
1.6 +14 -14 ws-axis/c/samples/server/interoptests/cbase/InteropTestPortType.c
Index: InteropTestPortType.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cbase/InteropTestPortType.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InteropTestPortType.c 12 Aug 2004 13:23:40 -0000 1.5
+++ InteropTestPortType.c 16 Aug 2004 06:14:21 -0000 1.6
@@ -9,44 +9,44 @@
xsd__string echoString(xsd__string Value0)
-{ return Value0;
+{ return Value0;
}
xsd__string_Array echoStringArray(xsd__string_Array Value0)
-{ return Value0;
+{ return Value0;
}
int echoInteger(int Value0)
-{ return Value0;
+{ return Value0;
}
xsd__int_Array echoIntegerArray(xsd__int_Array Value0)
-{ return Value0;
+{ return Value0;
}
float echoFloat(float Value0)
-{ return Value0;
+{ return Value0;
}
xsd__float_Array echoFloatArray(xsd__float_Array Value0)
-{ return Value0;
+{ return Value0;
}
SOAPStruct* echoStruct(SOAPStruct* Value0)
-{ return Value0;
+{ return Value0;
}
SOAPStruct_Array echoStructArray(SOAPStruct_Array Value0)
-{ return Value0;
+{ return Value0;
}
void echoVoid()
-{
+{
}
xsd__base64Binary echoBase64(xsd__base64Binary Value0)
-{ return Value0;
+{ return Value0;
}
xsd__dateTime echoDate(xsd__dateTime Value0)
-{ return Value0;
+{ return Value0;
}
xsd__hexBinary echoHexBinary(xsd__hexBinary Value0)
-{ return Value0;
+{ return Value0;
}
xsd__decimal echoDecimal(xsd__decimal Value0)
-{ return Value0;
+{ return Value0;
}
xsd__boolean echoBoolean(xsd__boolean Value0)
-{ return Value0;
+{ return Value0;
}
1.6 +8 -8 ws-axis/c/samples/server/interoptests/cbase/SOAPStruct.c
Index: SOAPStruct.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cbase/SOAPStruct.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SOAPStruct.c 12 Aug 2004 13:23:41 -0000 1.5
+++ SOAPStruct.c 16 Aug 2004 06:14:21 -0000 1.6
@@ -23,9 +23,9 @@
pSZ->_functions->serializeStartElementOfType(pSZ->_object, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct, sPrefix);
}
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPStruct_varString", (void*)&(param->SOAPStruct_varString), XSD_STRING);
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPStruct_varInt", (void*)&(param->SOAPStruct_varInt), XSD_INT);
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPStruct_varFloat", (void*)&(param->SOAPStruct_varFloat), XSD_FLOAT);
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varString", (void*)&(param->varString), XSD_STRING);
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varInt", (void*)&(param->varInt), XSD_INT);
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varFloat", (void*)&(param->varFloat), XSD_FLOAT);
pSZ->_functions->serializeEndElementOfType(pSZ->_object, Axis_TypeName_SOAPStruct);
return AXIS_SUCCESS;
@@ -36,9 +36,9 @@
*/
int Axis_DeSerialize_SOAPStruct(SOAPStruct* param, IWrapperSoapDeSerializer* pDZ)
{
- param->SOAPStruct_varString = pDZ->_functions->getElementAsString(pDZ->_object,0,0);
- param->SOAPStruct_varInt = pDZ->_functions->getElementAsInt(pDZ->_object,0,0);
- param->SOAPStruct_varFloat = pDZ->_functions->getElementAsFloat(pDZ->_object,0,0);
+ param->varString = pDZ->_functions->getElementAsString(pDZ->_object,0,0);
+ param->varInt = pDZ->_functions->getElementAsInt(pDZ->_object,0,0);
+ param->varFloat = pDZ->_functions->getElementAsFloat(pDZ->_object,0,0);
return pDZ->_functions->getStatus(pDZ->_object);
}
void* Axis_Create_SOAPStruct(SOAPStruct* pObj, bool bArray, int nSize)
@@ -73,7 +73,7 @@
pTemp = param;
for (x=0; x<nSize; x++)
{
- if(pTemp->SOAPStruct_varString) free(pTemp->SOAPStruct_varString);
+ if(pTemp->varString) free(pTemp->varString);
pTemp++;
}
free(param);
@@ -81,7 +81,7 @@
else
{
/*delete any pointer members or array members of this struct here*/
- if(param->SOAPStruct_varString) free(param->SOAPStruct_varString);
+ if(param->varString) free(param->varString);
free(param);
}
}
1.5 +3 -3 ws-axis/c/samples/server/interoptests/cbase/SOAPStruct.h
Index: SOAPStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cbase/SOAPStruct.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SOAPStruct.h 12 Aug 2004 13:23:41 -0000 1.4
+++ SOAPStruct.h 16 Aug 2004 06:14:21 -0000 1.5
@@ -13,9 +13,9 @@
static const char* Axis_TypeName_SOAPStruct = "SOAPStruct";
typedef struct SOAPStructTag {
- xsd__string SOAPStruct_varString;
- int SOAPStruct_varInt;
- float SOAPStruct_varFloat;
+ xsd__string varString;
+ int varInt;
+ float varFloat;
} SOAPStruct;
#endif /* !defined(__SOAPSTRUCT_H__INCLUDED_)*/
1.5 +6 -6 ws-axis/c/samples/server/interoptests/cgroupB/InteropTestPortTypeB.c
Index: InteropTestPortTypeB.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cgroupB/InteropTestPortTypeB.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InteropTestPortTypeB.c 12 Aug 2004 13:23:54 -0000 1.4
+++ InteropTestPortTypeB.c 16 Aug 2004 06:14:21 -0000 1.5
@@ -10,15 +10,15 @@
void echoStructAsSimpleTypes(SOAPStruct* Value0, AXIS_OUT_PARAM xsd__string *OutValue0, AXIS_OUT_PARAM int *OutValue1, AXIS_OUT_PARAM float *OutValue2)
-{ *OutValue0 = Value0->SOAPStruct_varString;
- *OutValue1 = Value0->SOAPStruct_varInt;
- *OutValue2 = Value0->SOAPStruct_varFloat;
+{ *OutValue0 = Value0->varString;
+ *OutValue1 = Value0->varInt;
+ *OutValue2 = Value0->varFloat;
}
SOAPStruct* echoSimpleTypesAsStruct(xsd__string Value0,int Value1,float Value2)
{ SOAPStruct* pRet = (SOAPStruct*) malloc(sizeof(SOAPStruct));
- pRet->SOAPStruct_varString = Value0;
- pRet->SOAPStruct_varInt = Value1;
- pRet->SOAPStruct_varFloat = Value2;
+ pRet->varString = Value0;
+ pRet->varInt = Value1;
+ pRet->varFloat = Value2;
return pRet;
}
SOAPStructStruct* echoNestedStruct(SOAPStructStruct* Value0)
1.4 +14 -14 ws-axis/c/samples/server/interoptests/cgroupB/SOAPArrayStruct.c
Index: SOAPArrayStruct.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cgroupB/SOAPArrayStruct.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SOAPArrayStruct.c 12 Aug 2004 13:23:54 -0000 1.3
+++ SOAPArrayStruct.c 16 Aug 2004 06:14:21 -0000 1.4
@@ -23,10 +23,10 @@
pSZ->_functions->serializeStartElementOfType(pSZ->_object, Axis_TypeName_SOAPArrayStruct, Axis_URI_SOAPArrayStruct, sPrefix);
}
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPArrayStruct_varString", (void*)&(param->SOAPArrayStruct_varString), XSD_STRING);
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPArrayStruct_varInt", (void*)&(param->SOAPArrayStruct_varInt), XSD_INT);
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPArrayStruct_varFloat", (void*)&(param->SOAPArrayStruct_varFloat), XSD_FLOAT);
- pSZ->_functions->serializeBasicArray(pSZ->_object, (Axis_Array*)(¶m->SOAPArrayStruct_varArray),XSD_STRING, "SOAPArrayStruct_varArray");
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varString", (void*)&(param->varString), XSD_STRING);
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varInt", (void*)&(param->varInt), XSD_INT);
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varFloat", (void*)&(param->varFloat), XSD_FLOAT);
+ pSZ->_functions->serializeBasicArray(pSZ->_object, (Axis_Array*)(¶m->varArray),XSD_STRING, "varArray");
pSZ->_functions->serializeEndElementOfType(pSZ->_object, Axis_TypeName_SOAPArrayStruct);
return AXIS_SUCCESS;
@@ -38,11 +38,11 @@
int Axis_DeSerialize_SOAPArrayStruct(SOAPArrayStruct* param, IWrapperSoapDeSerializer* pDZ)
{
Axis_Array array;
- param->SOAPArrayStruct_varString = pDZ->_functions->getElementAsString(pDZ->_object,0,0);
- param->SOAPArrayStruct_varInt = pDZ->_functions->getElementAsInt(pDZ->_object,0,0);
- param->SOAPArrayStruct_varFloat = pDZ->_functions->getElementAsFloat(pDZ->_object,0,0);
+ param->varString = pDZ->_functions->getElementAsString(pDZ->_object,0,0);
+ param->varInt = pDZ->_functions->getElementAsInt(pDZ->_object,0,0);
+ param->varFloat = pDZ->_functions->getElementAsFloat(pDZ->_object,0,0);
array = pDZ->_functions->getBasicArray(pDZ->_object, XSD_STRING,0,0);
- memcpy(&(param->SOAPArrayStruct_varArray), &array, sizeof(Axis_Array));
+ memcpy(&(param->varArray), &array, sizeof(Axis_Array));
return pDZ->_functions->getStatus(pDZ->_object);
}
void* Axis_Create_SOAPArrayStruct(SOAPArrayStruct* pObj, bool bArray, int nSize)
@@ -61,8 +61,8 @@
memset(pObj, 0, sizeof(SOAPArrayStruct));
pTemp = pObj;
- pTemp->SOAPArrayStruct_varArray.m_Array = 0;
- pTemp->SOAPArrayStruct_varArray.m_Size = 0;
+ pTemp->varArray.m_Array = 0;
+ pTemp->varArray.m_Size = 0;
}
return pObj;
}
@@ -79,8 +79,8 @@
pTemp = param;
for (x=0; x<nSize; x++)
{
- if(pTemp->SOAPArrayStruct_varString) free(pTemp->SOAPArrayStruct_varString);
- if (pTemp->SOAPArrayStruct_varArray.m_Array) free(pTemp->SOAPArrayStruct_varArray.m_Array);
+ if(pTemp->varString) free(pTemp->varString);
+ if (pTemp->varArray.m_Array) free(pTemp->varArray.m_Array);
pTemp++;
}
free(param);
@@ -88,8 +88,8 @@
else
{
/*delete any pointer members or array members of this struct here*/
- if(param->SOAPArrayStruct_varString) free(param->SOAPArrayStruct_varString);
- if (param->SOAPArrayStruct_varArray.m_Array) free(param->SOAPArrayStruct_varArray.m_Array);
+ if(param->varString) free(param->varString);
+ if (param->varArray.m_Array) free(param->varArray.m_Array);
free(param);
}
}
1.4 +4 -4 ws-axis/c/samples/server/interoptests/cgroupB/SOAPArrayStruct.h
Index: SOAPArrayStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cgroupB/SOAPArrayStruct.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SOAPArrayStruct.h 12 Aug 2004 13:23:54 -0000 1.3
+++ SOAPArrayStruct.h 16 Aug 2004 06:14:21 -0000 1.4
@@ -13,10 +13,10 @@
static const char* Axis_TypeName_SOAPArrayStruct = "SOAPArrayStruct";
typedef struct SOAPArrayStructTag {
- xsd__string SOAPArrayStruct_varString;
- int SOAPArrayStruct_varInt;
- float SOAPArrayStruct_varFloat;
- xsd__string_Array SOAPArrayStruct_varArray;
+ xsd__string varString;
+ int varInt;
+ float varFloat;
+ xsd__string_Array varArray;
} SOAPArrayStruct;
#endif /* !defined(__SOAPARRAYSTRUCT_H__INCLUDED_)*/
1.4 +8 -8 ws-axis/c/samples/server/interoptests/cgroupB/SOAPStruct.c
Index: SOAPStruct.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cgroupB/SOAPStruct.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SOAPStruct.c 12 Aug 2004 13:23:54 -0000 1.3
+++ SOAPStruct.c 16 Aug 2004 06:14:21 -0000 1.4
@@ -23,9 +23,9 @@
pSZ->_functions->serializeStartElementOfType(pSZ->_object, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct, sPrefix);
}
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPStruct_varString", (void*)&(param->SOAPStruct_varString), XSD_STRING);
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPStruct_varInt", (void*)&(param->SOAPStruct_varInt), XSD_INT);
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPStruct_varFloat", (void*)&(param->SOAPStruct_varFloat), XSD_FLOAT);
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varString", (void*)&(param->varString), XSD_STRING);
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varInt", (void*)&(param->varInt), XSD_INT);
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varFloat", (void*)&(param->varFloat), XSD_FLOAT);
pSZ->_functions->serializeEndElementOfType(pSZ->_object, Axis_TypeName_SOAPStruct);
return AXIS_SUCCESS;
@@ -36,9 +36,9 @@
*/
int Axis_DeSerialize_SOAPStruct(SOAPStruct* param, IWrapperSoapDeSerializer* pDZ)
{
- param->SOAPStruct_varString = pDZ->_functions->getElementAsString(pDZ->_object,0,0);
- param->SOAPStruct_varInt = pDZ->_functions->getElementAsInt(pDZ->_object,0,0);
- param->SOAPStruct_varFloat = pDZ->_functions->getElementAsFloat(pDZ->_object,0,0);
+ param->varString = pDZ->_functions->getElementAsString(pDZ->_object,0,0);
+ param->varInt = pDZ->_functions->getElementAsInt(pDZ->_object,0,0);
+ param->varFloat = pDZ->_functions->getElementAsFloat(pDZ->_object,0,0);
return pDZ->_functions->getStatus(pDZ->_object);
}
void* Axis_Create_SOAPStruct(SOAPStruct* pObj, bool bArray, int nSize)
@@ -73,7 +73,7 @@
pTemp = param;
for (x=0; x<nSize; x++)
{
- if(pTemp->SOAPStruct_varString) free(pTemp->SOAPStruct_varString);
+ if(pTemp->varString) free(pTemp->varString);
pTemp++;
}
free(param);
@@ -81,7 +81,7 @@
else
{
/*delete any pointer members or array members of this struct here*/
- if(param->SOAPStruct_varString) free(param->SOAPStruct_varString);
+ if(param->varString) free(param->varString);
free(param);
}
}
1.4 +3 -3 ws-axis/c/samples/server/interoptests/cgroupB/SOAPStruct.h
Index: SOAPStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cgroupB/SOAPStruct.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SOAPStruct.h 12 Aug 2004 13:23:54 -0000 1.3
+++ SOAPStruct.h 16 Aug 2004 06:14:22 -0000 1.4
@@ -13,9 +13,9 @@
static const char* Axis_TypeName_SOAPStruct = "SOAPStruct";
typedef struct SOAPStructTag {
- xsd__string SOAPStruct_varString;
- int SOAPStruct_varInt;
- float SOAPStruct_varFloat;
+ xsd__string varString;
+ int varInt;
+ float varFloat;
} SOAPStruct;
#endif /* !defined(__SOAPSTRUCT_H__INCLUDED_)*/
1.5 +13 -13 ws-axis/c/samples/server/interoptests/cgroupB/SOAPStructStruct.c
Index: SOAPStructStruct.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cgroupB/SOAPStructStruct.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SOAPStructStruct.c 12 Aug 2004 13:23:54 -0000 1.4
+++ SOAPStructStruct.c 16 Aug 2004 06:14:22 -0000 1.5
@@ -29,10 +29,10 @@
pSZ->_functions->serializeStartElementOfType(pSZ->_object, Axis_TypeName_SOAPStructStruct, Axis_URI_SOAPStructStruct, sPrefix);
}
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPStructStruct_varString", (void*)&(param->SOAPStructStruct_varString), XSD_STRING);
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPStructStruct_varInt", (void*)&(param->SOAPStructStruct_varInt), XSD_INT);
- pSZ->_functions->serializeAsElement(pSZ->_object, "SOAPStructStruct_varFloat", (void*)&(param->SOAPStructStruct_varFloat), XSD_FLOAT);
- Axis_Serialize_SOAPStruct(param->SOAPStructStruct_varStruct, pSZ, false);
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varString", (void*)&(param->varString), XSD_STRING);
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varInt", (void*)&(param->varInt), XSD_INT);
+ pSZ->_functions->serializeAsElement(pSZ->_object, "varFloat", (void*)&(param->varFloat), XSD_FLOAT);
+ Axis_Serialize_SOAPStruct(param->varStruct, pSZ, false);
pSZ->_functions->serializeEndElementOfType(pSZ->_object, Axis_TypeName_SOAPStructStruct);
return AXIS_SUCCESS;
@@ -43,10 +43,10 @@
*/
int Axis_DeSerialize_SOAPStructStruct(SOAPStructStruct* param, IWrapperSoapDeSerializer* pDZ)
{
- param->SOAPStructStruct_varString = pDZ->_functions->getElementAsString(pDZ->_object,0,0);
- param->SOAPStructStruct_varInt = pDZ->_functions->getElementAsInt(pDZ->_object,0,0);
- param->SOAPStructStruct_varFloat = pDZ->_functions->getElementAsFloat(pDZ->_object,0,0);
- param->SOAPStructStruct_varStruct = (SOAPStruct*)pDZ->_functions->getCmplxObject(pDZ->_object, (void*)Axis_DeSerialize_SOAPStruct
+ param->varString = pDZ->_functions->getElementAsString(pDZ->_object,0,0);
+ param->varInt = pDZ->_functions->getElementAsInt(pDZ->_object,0,0);
+ param->varFloat = pDZ->_functions->getElementAsFloat(pDZ->_object,0,0);
+ param->varStruct = (SOAPStruct*)pDZ->_functions->getCmplxObject(pDZ->_object, (void*)Axis_DeSerialize_SOAPStruct
, (void*)Axis_Create_SOAPStruct, (void*)Axis_Delete_SOAPStruct
, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
return pDZ->_functions->getStatus(pDZ->_object);
@@ -67,7 +67,7 @@
memset(pObj, 0, sizeof(SOAPStructStruct));
pTemp = pObj;
- pTemp->SOAPStructStruct_varStruct=0;
+ pTemp->varStruct=0;
}
return pObj;
}
@@ -84,8 +84,8 @@
pTemp = param;
for (x=0; x<nSize; x++)
{
- if(pTemp->SOAPStructStruct_varString) free(pTemp->SOAPStructStruct_varString);
- if (pTemp->SOAPStructStruct_varStruct) Axis_Delete_SOAPStruct(pTemp->SOAPStructStruct_varStruct, false, 0);
+ if(pTemp->varString) free(pTemp->varString);
+ if (pTemp->varStruct) Axis_Delete_SOAPStruct(pTemp->varStruct, false, 0);
pTemp++;
}
free(param);
@@ -93,8 +93,8 @@
else
{
/*delete any pointer members or array members of this struct here*/
- if(param->SOAPStructStruct_varString) free(param->SOAPStructStruct_varString);
- if (param->SOAPStructStruct_varStruct) Axis_Delete_SOAPStruct(param->SOAPStructStruct_varStruct, false, 0);
+ if(param->varString) free(param->varString);
+ if (param->varStruct) Axis_Delete_SOAPStruct(param->varStruct, false, 0);
free(param);
}
}
1.4 +4 -4 ws-axis/c/samples/server/interoptests/cgroupB/SOAPStructStruct.h
Index: SOAPStructStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cgroupB/SOAPStructStruct.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SOAPStructStruct.h 12 Aug 2004 13:23:54 -0000 1.3
+++ SOAPStructStruct.h 16 Aug 2004 06:14:22 -0000 1.4
@@ -14,10 +14,10 @@
static const char* Axis_TypeName_SOAPStructStruct = "SOAPStructStruct";
typedef struct SOAPStructStructTag {
- xsd__string SOAPStructStruct_varString;
- int SOAPStructStruct_varInt;
- float SOAPStructStruct_varFloat;
- SOAPStruct* SOAPStructStruct_varStruct;
+ xsd__string varString;
+ int varInt;
+ float varFloat;
+ SOAPStruct* varStruct;
} SOAPStructStruct;
#endif /* !defined(__SOAPSTRUCTSTRUCT_H__INCLUDED_)*/
1.6 +14 -9 ws-axis/c/samples/server/interoptests/groupB/InteropTestPortTypeB.cpp
Index: InteropTestPortTypeB.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/InteropTestPortTypeB.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InteropTestPortTypeB.cpp 12 Aug 2004 13:24:06 -0000 1.5
+++ InteropTestPortTypeB.cpp 16 Aug 2004 06:14:24 -0000 1.6
@@ -33,20 +33,25 @@
{
}
void InteropTestPortTypeB::echoStructAsSimpleTypes(SOAPStruct* Value0, AXIS_OUT_PARAM xsd__string *OutValue0, AXIS_OUT_PARAM int *OutValue1, AXIS_OUT_PARAM float *OutValue2)
-{ *OutValue0 = Value0->SOAPStruct_varString;
- *OutValue1 = Value0->SOAPStruct_varInt;
- *OutValue2 = Value0->SOAPStruct_varFloat;
+{
+ *OutValue0 = Value0->varString;
+ *OutValue1 = Value0->varInt;
+ *OutValue2 = Value0->varFloat;
}
+
SOAPStruct* InteropTestPortTypeB::echoSimpleTypesAsStruct(xsd__string Value0, int Value1, float Value2)
-{ SOAPStruct* pRet = new SOAPStruct();
- pRet->SOAPStruct_varString = Value0;
- pRet->SOAPStruct_varInt = Value1;
- pRet->SOAPStruct_varFloat = Value2;
+{
+ SOAPStruct* pRet = new SOAPStruct();
+ pRet->varString = Value0;
+ pRet->varInt = Value1;
+ pRet->varFloat = Value2;
return pRet;
}
SOAPStructStruct* InteropTestPortTypeB::echoNestedStruct(SOAPStructStruct* Value0)
-{ return Value0;
+{
+ return Value0;
}
SOAPArrayStruct* InteropTestPortTypeB::echoNestedArray(SOAPArrayStruct* Value0)
-{ return Value0;
+{
+ return Value0;
}
1.8 +3 -3 ws-axis/c/samples/server/interoptests/groupB/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 12 Aug 2004 13:24:06 -0000 1.7
+++ Makefile.am 16 Aug 2004 06:14:24 -0000 1.8
@@ -1,5 +1,5 @@
-lib_LTLIBRARIES = libInteropGroupB.la
+lib_LTLIBRARIES = libgroupB.la
SUBDIRS =
-libInteropGroupB_la_SOURCES = SOAPStruct.cpp InteropTestPortTypeBWrapper.cpp AxisServiceException.cpp SOAPArrayStruct.cpp SOAPStructStruct.cpp InteropTestPortTypeB.cpp InteropTestPortTypeBService.cpp
-libInteropGroupB_la_LIBADD = $(LDFLAGS)
+libgroupB_la_SOURCES = SOAPStruct.cpp InteropTestPortTypeBWrapper.cpp AxisServiceException.cpp SOAPArrayStruct.cpp SOAPStructStruct.cpp InteropTestPortTypeB.cpp InteropTestPortTypeBService.cpp
+libgroupB_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(AXISCPP_HOME)/include
1.7 +11 -11 ws-axis/c/samples/server/interoptests/groupB/SOAPArrayStruct.cpp
Index: SOAPArrayStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/SOAPArrayStruct.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SOAPArrayStruct.cpp 12 Aug 2004 13:24:06 -0000 1.6
+++ SOAPArrayStruct.cpp 16 Aug 2004 06:14:24 -0000 1.7
@@ -24,10 +24,10 @@
Axis_URI_SOAPArrayStruct, "\">", NULL);
}
- pSZ->serializeAsElement("SOAPArrayStruct_varString", (void*)&(param->SOAPArrayStruct_varString), XSD_STRING);
- pSZ->serializeAsElement("SOAPArrayStruct_varInt", (void*)&(param->SOAPArrayStruct_varInt), XSD_INT);
- pSZ->serializeAsElement("SOAPArrayStruct_varFloat", (void*)&(param->SOAPArrayStruct_varFloat), XSD_FLOAT);
- pSZ->serializeBasicArray((Axis_Array*)(¶m->SOAPArrayStruct_varArray),XSD_STRING, "SOAPArrayStruct_varArray");
+ pSZ->serializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
+ pSZ->serializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
+ pSZ->serializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
+ pSZ->serializeBasicArray((Axis_Array*)(¶m->varArray),XSD_STRING, "varArray");
pSZ->serialize("</", Axis_TypeName_SOAPArrayStruct, ">", NULL);
return AXIS_SUCCESS;
@@ -38,10 +38,10 @@
*/
int Axis_DeSerialize_SOAPArrayStruct(SOAPArrayStruct* param, IWrapperSoapDeSerializer* pIWSDZ)
{
- param->SOAPArrayStruct_varString = pIWSDZ->getElementAsString("SOAPArrayStruct_varString",0);
- param->SOAPArrayStruct_varInt = pIWSDZ->getElementAsInt("SOAPArrayStruct_varInt",0);
- param->SOAPArrayStruct_varFloat = pIWSDZ->getElementAsFloat("SOAPArrayStruct_varFloat",0);
- param->SOAPArrayStruct_varArray = (xsd__string_Array&)pIWSDZ->getBasicArray(XSD_STRING, "SOAPArrayStruct_varArray",0);
+ param->varString = pIWSDZ->getElementAsString("varString",0);
+ param->varInt = pIWSDZ->getElementAsInt("varInt",0);
+ param->varFloat = pIWSDZ->getElementAsFloat("varFloat",0);
+ param->varArray = (xsd__string_Array&)pIWSDZ->getBasicArray(XSD_STRING, "varArray",0);
return pIWSDZ->getStatus();
}
void* Axis_Create_SOAPArrayStruct(SOAPArrayStruct* pObj, bool bArray = false, int nSize=0)
@@ -91,12 +91,12 @@
{
/*do not allocate memory to any pointer members here
because deserializer will allocate memory anyway. */
- SOAPArrayStruct_varArray.m_Array = 0;
- SOAPArrayStruct_varArray.m_Size = 0;
+ varArray.m_Array = 0;
+ varArray.m_Size = 0;
}
SOAPArrayStruct::~SOAPArrayStruct()
{
/*delete any pointer and array members here*/
- delete [] ((xsd__string*)SOAPArrayStruct_varArray.m_Array);
+ delete [] ((xsd__string*)varArray.m_Array);
}
1.8 +4 -4 ws-axis/c/samples/server/interoptests/groupB/SOAPArrayStruct.h
Index: SOAPArrayStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/SOAPArrayStruct.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SOAPArrayStruct.h 12 Aug 2004 13:24:06 -0000 1.7
+++ SOAPArrayStruct.h 16 Aug 2004 06:14:24 -0000 1.8
@@ -16,10 +16,10 @@
class SOAPArrayStruct
{
public:
- xsd__string SOAPArrayStruct_varString;
- int SOAPArrayStruct_varInt;
- float SOAPArrayStruct_varFloat;
- xsd__string_Array SOAPArrayStruct_varArray;
+ xsd__string varString;
+ int varInt;
+ float varFloat;
+ xsd__string_Array varArray;
SOAPArrayStruct();
virtual ~SOAPArrayStruct();
};
1.7 +6 -6 ws-axis/c/samples/server/interoptests/groupB/SOAPStruct.cpp
Index: SOAPStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/SOAPStruct.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SOAPStruct.cpp 12 Aug 2004 13:24:08 -0000 1.6
+++ SOAPStruct.cpp 16 Aug 2004 06:14:24 -0000 1.7
@@ -24,9 +24,9 @@
Axis_URI_SOAPStruct, "\">", NULL);
}
- pSZ->serializeAsElement("SOAPStruct_varString", (void*)&(param->SOAPStruct_varString), XSD_STRING);
- pSZ->serializeAsElement("SOAPStruct_varInt", (void*)&(param->SOAPStruct_varInt), XSD_INT);
- pSZ->serializeAsElement("SOAPStruct_varFloat", (void*)&(param->SOAPStruct_varFloat), XSD_FLOAT);
+ pSZ->serializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
+ pSZ->serializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
+ pSZ->serializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
pSZ->serialize("</", Axis_TypeName_SOAPStruct, ">", NULL);
return AXIS_SUCCESS;
@@ -37,9 +37,9 @@
*/
int Axis_DeSerialize_SOAPStruct(SOAPStruct* param, IWrapperSoapDeSerializer* pIWSDZ)
{
- param->SOAPStruct_varString = pIWSDZ->getElementAsString("SOAPStruct_varString",0);
- param->SOAPStruct_varInt = pIWSDZ->getElementAsInt("SOAPStruct_varInt",0);
- param->SOAPStruct_varFloat = pIWSDZ->getElementAsFloat("SOAPStruct_varFloat",0);
+ param->varString = pIWSDZ->getElementAsString("varString",0);
+ param->varInt = pIWSDZ->getElementAsInt("varInt",0);
+ param->varFloat = pIWSDZ->getElementAsFloat("varFloat",0);
return pIWSDZ->getStatus();
}
void* Axis_Create_SOAPStruct(SOAPStruct* pObj, bool bArray = false, int nSize=0)
1.8 +3 -3 ws-axis/c/samples/server/interoptests/groupB/SOAPStruct.h
Index: SOAPStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/SOAPStruct.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SOAPStruct.h 12 Aug 2004 13:24:09 -0000 1.7
+++ SOAPStruct.h 16 Aug 2004 06:14:24 -0000 1.8
@@ -16,9 +16,9 @@
class SOAPStruct
{
public:
- xsd__string SOAPStruct_varString;
- int SOAPStruct_varInt;
- float SOAPStruct_varFloat;
+ xsd__string varString;
+ int varInt;
+ float varFloat;
SOAPStruct();
virtual ~SOAPStruct();
};
1.7 +10 -10 ws-axis/c/samples/server/interoptests/groupB/SOAPStructStruct.cpp
Index: SOAPStructStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/SOAPStructStruct.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SOAPStructStruct.cpp 12 Aug 2004 13:24:09 -0000 1.6
+++ SOAPStructStruct.cpp 16 Aug 2004 06:14:24 -0000 1.7
@@ -30,10 +30,10 @@
Axis_URI_SOAPStructStruct, "\">", NULL);
}
- pSZ->serializeAsElement("SOAPStructStruct_varString", (void*)&(param->SOAPStructStruct_varString), XSD_STRING);
- pSZ->serializeAsElement("SOAPStructStruct_varInt", (void*)&(param->SOAPStructStruct_varInt), XSD_INT);
- pSZ->serializeAsElement("SOAPStructStruct_varFloat", (void*)&(param->SOAPStructStruct_varFloat), XSD_FLOAT);
- Axis_Serialize_SOAPStruct(param->SOAPStructStruct_varStruct, pSZ);
+ pSZ->serializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
+ pSZ->serializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
+ pSZ->serializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
+ Axis_Serialize_SOAPStruct(param->varStruct, pSZ);
pSZ->serialize("</", Axis_TypeName_SOAPStructStruct, ">", NULL);
return AXIS_SUCCESS;
@@ -44,10 +44,10 @@
*/
int Axis_DeSerialize_SOAPStructStruct(SOAPStructStruct* param, IWrapperSoapDeSerializer* pIWSDZ)
{
- param->SOAPStructStruct_varString = pIWSDZ->getElementAsString("SOAPStructStruct_varString",0);
- param->SOAPStructStruct_varInt = pIWSDZ->getElementAsInt("SOAPStructStruct_varInt",0);
- param->SOAPStructStruct_varFloat = pIWSDZ->getElementAsFloat("SOAPStructStruct_varFloat",0);
- param->SOAPStructStruct_varStruct = (SOAPStruct*)pIWSDZ->getCmplxObject((void*)Axis_DeSerialize_SOAPStruct
+ param->varString = pIWSDZ->getElementAsString("varString",0);
+ param->varInt = pIWSDZ->getElementAsInt("varInt",0);
+ param->varFloat = pIWSDZ->getElementAsFloat("varFloat",0);
+ param->varStruct = (SOAPStruct*)pIWSDZ->getCmplxObject((void*)Axis_DeSerialize_SOAPStruct
, (void*)Axis_Create_SOAPStruct, (void*)Axis_Delete_SOAPStruct
, "SOAPStruct", Axis_URI_SOAPStruct);
return pIWSDZ->getStatus();
@@ -99,11 +99,11 @@
{
/*do not allocate memory to any pointer members here
because deserializer will allocate memory anyway. */
- SOAPStructStruct_varStruct=0;
+ varStruct=0;
}
SOAPStructStruct::~SOAPStructStruct()
{
/*delete any pointer and array members here*/
- delete SOAPStructStruct_varStruct;
+ delete varStruct;
}
1.8 +4 -4 ws-axis/c/samples/server/interoptests/groupB/SOAPStructStruct.h
Index: SOAPStructStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/SOAPStructStruct.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SOAPStructStruct.h 12 Aug 2004 13:24:09 -0000 1.7
+++ SOAPStructStruct.h 16 Aug 2004 06:14:24 -0000 1.8
@@ -18,10 +18,10 @@
class SOAPStructStruct
{
public:
- xsd__string SOAPStructStruct_varString;
- int SOAPStructStruct_varInt;
- float SOAPStructStruct_varFloat;
- SOAPStruct* SOAPStructStruct_varStruct;
+ xsd__string varString;
+ int varInt;
+ float varFloat;
+ SOAPStruct* varStruct;
SOAPStructStruct();
virtual ~SOAPStructStruct();
};
1.2 +2 -2 ws-axis/c/samples/server/interoptests/groupB/deploy.wsdd
Index: deploy.wsdd
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/deploy.wsdd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deploy.wsdd 1 Apr 2004 15:10:18 -0000 1.1
+++ deploy.wsdd 16 Aug 2004 06:14:24 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:CPP="http://xml.apache.org/axis/wsdd/providers/CPP">
- <service name="InteropGroupB" provider="CPP:RPC" description="Axis C++ web service">
- <parameter name="className" value="/user/local/apache/axis/InteropGroupB.so"/>
+ <service name="groupB" provider="CPP:RPC" description="Axis C++ web service">
+ <parameter name="className" value="/user/local/apache/axis/groupB.so"/>
<parameter name="allowedMethods" value="echoStructAsSimpleTypes echoSimpleTypesAsStruct echoNestedStruct echoNestedArray "/>
</service>
</deployment>
1.2 +1 -1 ws-axis/c/samples/server/interoptests/groupB/undeploy.wsdd
Index: undeploy.wsdd
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/undeploy.wsdd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- undeploy.wsdd 1 Apr 2004 15:10:18 -0000 1.1
+++ undeploy.wsdd 16 Aug 2004 06:14:24 -0000 1.2
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<undeployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:CPP="http://xml.apache.org/axis/wsdd/providers/CPP">
- <service name="InteropGroupB"/>
+ <service name="groupB"/>
</undeployment>