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:15:12 UTC
cvs commit: ws-axis/c/samples/client/interoptests/groupB InteropGroupBClient.cpp InteropTestPortTypeB.cpp Makefile.am SOAPArrayStruct.cpp SOAPArrayStruct.h SOAPStruct.cpp SOAPStruct.h SOAPStructStruct.cpp SOAPStructStruct.h
roshan 2004/08/15 23:15:12
Modified: c/samples/client/interoptests/base InteropBaseClient.cpp
InteropTestPortType.cpp Makefile.am SOAPStruct.cpp
SOAPStruct.h
c/samples/client/interoptests/cbase InteropBaseClient.c
Makefile.am SOAPStruct.c SOAPStruct.h
c/samples/client/interoptests/cgroupB InteropGroupBClient.c
Makefile.am SOAPArrayStruct.c SOAPArrayStruct.h
SOAPStruct.c SOAPStruct.h SOAPStructStruct.c
SOAPStructStruct.h
c/samples/client/interoptests/groupB InteropGroupBClient.cpp
InteropTestPortTypeB.cpp Makefile.am
SOAPArrayStruct.cpp SOAPArrayStruct.h
SOAPStruct.cpp SOAPStruct.h SOAPStructStruct.cpp
SOAPStructStruct.h
Log:
modified hand written interop samples except doclit ones to conform to variable name changes
Revision Changes Path
1.21 +6 -6 ws-axis/c/samples/client/interoptests/base/InteropBaseClient.cpp
Index: InteropBaseClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/base/InteropBaseClient.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- InteropBaseClient.cpp 12 Aug 2004 13:37:59 -0000 1.20
+++ InteropBaseClient.cpp 16 Aug 2004 06:15:08 -0000 1.21
@@ -100,9 +100,9 @@
printf("failed\n");
// testing echo Struct
SOAPStruct stct;
- stct.SOAPStruct_varFloat = 12345.7346345;
- stct.SOAPStruct_varInt = 5000;
- stct.SOAPStruct_varString = strdup("This is string in SOAPStruct");
+ stct.varFloat = 12345.7346345;
+ stct.varInt = 5000;
+ stct.varString = strdup("This is string in SOAPStruct");
printf("invoking echoStruct...\n");
if (ws.echoStruct(&stct) != NULL)
printf("successful\n");
@@ -114,10 +114,10 @@
arrstct.m_Size = ARRAYSIZE;
for (x=0;x<ARRAYSIZE;x++)
{
- arrstct.m_Array[x].SOAPStruct_varFloat = 1.1111*x;
- arrstct.m_Array[x].SOAPStruct_varInt = x;
+ arrstct.m_Array[x].varFloat = 1.1111*x;
+ arrstct.m_Array[x].varInt = x;
sprintf(buffer1, "varString of %dth element of SOAPStruct array", x);
- arrstct.m_Array[x].SOAPStruct_varString = buffer1;
+ arrstct.m_Array[x].varString = buffer1;
}
//testing echo Struct Array
printf("invoking echoStructArray...\n");
1.22 +29 -29 ws-axis/c/samples/client/interoptests/base/InteropTestPortType.cpp
Index: InteropTestPortType.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/base/InteropTestPortType.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- InteropTestPortType.cpp 12 Aug 2004 13:37:59 -0000 1.21
+++ InteropTestPortType.cpp 16 Aug 2004 06:15:08 -0000 1.22
@@ -23,7 +23,7 @@
InteropTestPortType::InteropTestPortType()
:Stub(" ", APTHTTP)
{
- m_pCall->setEndpointURI("http://localhost/axis/InteropBase");
+ m_pCall->setEndpointURI("http://localhost/axis/base");
}
InteropTestPortType::~InteropTestPortType()
@@ -44,7 +44,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return Ret;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoString");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoString");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoString", "http://soapinterop.org/");
applyUserPreferences();
@@ -67,7 +67,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -89,7 +89,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return RetArray;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoStringArray");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoStringArray");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoStringArray", "http://soapinterop.org/");
applyUserPreferences();
@@ -112,7 +112,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -134,7 +134,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return Ret;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoInteger");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoInteger");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoInteger", "http://soapinterop.org/");
applyUserPreferences();
@@ -157,7 +157,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -179,7 +179,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return RetArray;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoIntegerArray");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoIntegerArray");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoIntegerArray", "http://soapinterop.org/");
applyUserPreferences();
@@ -202,7 +202,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -224,7 +224,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return Ret;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoFloat");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoFloat");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoFloat", "http://soapinterop.org/");
applyUserPreferences();
@@ -247,7 +247,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -269,7 +269,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return RetArray;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoFloatArray");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoFloatArray");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoFloatArray", "http://soapinterop.org/");
applyUserPreferences();
@@ -292,7 +292,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -314,7 +314,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return pReturn;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoStruct");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoStruct");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoStruct", "http://soapinterop.org/");
applyUserPreferences();
@@ -337,7 +337,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -359,7 +359,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return RetArray;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoStructArray");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoStructArray");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoStructArray", "http://soapinterop.org/");
applyUserPreferences();
@@ -382,7 +382,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -403,7 +403,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return ;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoVoid");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoVoid");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoVoid", "http://soapinterop.org/");
applyUserPreferences();
@@ -424,7 +424,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -446,7 +446,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return Ret;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoBase64");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoBase64");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoBase64", "http://soapinterop.org/");
applyUserPreferences();
@@ -469,7 +469,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -491,7 +491,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return Ret;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoDate");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoDate");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoDate", "http://soapinterop.org/");
applyUserPreferences();
@@ -514,7 +514,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -536,7 +536,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return Ret;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoHexBinary");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoHexBinary");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoHexBinary", "http://soapinterop.org/");
applyUserPreferences();
@@ -559,7 +559,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -581,7 +581,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return Ret;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoDecimal");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoDecimal");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoDecimal", "http://soapinterop.org/");
applyUserPreferences();
@@ -604,7 +604,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -626,7 +626,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return Ret;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropBase#echoBoolean");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "base#echoBoolean");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoBoolean", "http://soapinterop.org/");
applyUserPreferences();
@@ -649,7 +649,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropBase" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/base" );
if(pSoapFault)
{
m_pCall->unInitialize();
1.16 +3 -3 ws-axis/c/samples/client/interoptests/base/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/base/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.am 13 Aug 2004 08:45:20 -0000 1.15
+++ Makefile.am 16 Aug 2004 06:15:08 -0000 1.16
@@ -1,6 +1,6 @@
-bin_PROGRAMS = InteropBase
+bin_PROGRAMS = base
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS)
-InteropBase_SOURCES = SOAPStruct.cpp InteropTestPortType.cpp AxisClientException.cpp InteropBaseClient.cpp
-InteropBase_LDADD = @LINKCLIENTLIB@
+base_SOURCES = SOAPStruct.cpp InteropTestPortType.cpp AxisClientException.cpp
+base_LDADD = $(LDFLAGS)
INCLUDES = -I$(AXISCPP_HOME)/include
1.7 +6 -6 ws-axis/c/samples/client/interoptests/base/SOAPStruct.cpp
Index: SOAPStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/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:38:00 -0000 1.6
+++ SOAPStruct.cpp 16 Aug 2004 06:15:08 -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/client/interoptests/base/SOAPStruct.h
Index: SOAPStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/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:38:00 -0000 1.7
+++ SOAPStruct.h 16 Aug 2004 06:15:08 -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.12 +6 -6 ws-axis/c/samples/client/interoptests/cbase/InteropBaseClient.c
Index: InteropBaseClient.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cbase/InteropBaseClient.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- InteropBaseClient.c 12 Aug 2004 13:38:18 -0000 1.11
+++ InteropBaseClient.c 16 Aug 2004 06:15:09 -0000 1.12
@@ -93,9 +93,9 @@
else
printf("failed\n");
/* testing echo Struct*/
- stct.SOAPStruct_varFloat = 12345.7346345;
- stct.SOAPStruct_varInt = 5000;
- stct.SOAPStruct_varString = strdup("This is string in SOAPStruct");
+ stct.varFloat = 12345.7346345;
+ stct.varInt = 5000;
+ stct.varString = strdup("This is string in SOAPStruct");
printf("invoking echoStruct...\n");
if (echoStruct(pstub, &stct) != NULL)
printf("successful\n");
@@ -106,10 +106,10 @@
arrstct.m_Size = ARRAYSIZE;
for (x=0;x<ARRAYSIZE;x++)
{
- arrstct.m_Array[x].SOAPStruct_varFloat = 1.1111*x;
- arrstct.m_Array[x].SOAPStruct_varInt = x;
+ arrstct.m_Array[x].varFloat = 1.1111*x;
+ arrstct.m_Array[x].varInt = x;
sprintf(buffer1, "varString of %dth element of SOAPStruct array", x);
- arrstct.m_Array[x].SOAPStruct_varString = buffer1;
+ arrstct.m_Array[x].varString = buffer1;
}
/*testing echo Struct Array*/
1.13 +2 -2 ws-axis/c/samples/client/interoptests/cbase/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cbase/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.am 13 Aug 2004 09:28:57 -0000 1.12
+++ Makefile.am 16 Aug 2004 06:15:09 -0000 1.13
@@ -1,6 +1,6 @@
bin_PROGRAMS = cbase
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS)
-cbase_SOURCES = SOAPStruct.c InteropTestPortType.c InteropBaseClient.c
-cbase_LDADD = @LINKCLIENTLIB@
+cbase_SOURCES = SOAPStruct.c InteropTestPortType.c
+cbase_LDADD = $(LDFLAGS)
INCLUDES = -I$(AXISCPP_HOME)/include
1.7 +8 -8 ws-axis/c/samples/client/interoptests/cbase/SOAPStruct.c
Index: SOAPStruct.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cbase/SOAPStruct.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SOAPStruct.c 12 Aug 2004 13:38:18 -0000 1.6
+++ SOAPStruct.c 16 Aug 2004 06:15:09 -0000 1.7
@@ -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.6 +3 -3 ws-axis/c/samples/client/interoptests/cbase/SOAPStruct.h
Index: SOAPStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cbase/SOAPStruct.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SOAPStruct.h 12 Aug 2004 13:38:19 -0000 1.5
+++ SOAPStruct.h 16 Aug 2004 06:15:09 -0000 1.6
@@ -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.8 +16 -16 ws-axis/c/samples/client/interoptests/cgroupB/InteropGroupBClient.c
Index: InteropGroupBClient.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cgroupB/InteropGroupBClient.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InteropGroupBClient.c 12 Aug 2004 13:38:24 -0000 1.7
+++ InteropGroupBClient.c 16 Aug 2004 06:15:09 -0000 1.8
@@ -30,14 +30,14 @@
sprintf(endpoint, "http://%s:%s/axis/cgroupB", server, port);
pstub = get_InteropTestPortTypeB_stub(endpoint);
- sas.SOAPArrayStruct_varFloat = 12345.67890;
- sas.SOAPArrayStruct_varInt = 5000;
- sas.SOAPArrayStruct_varString = strdup("varString content of SOAPArrayStruct");
- sas.SOAPArrayStruct_varArray.m_Array = malloc(sizeof(AxisChar*)*ARRAYSIZE);
- sas.SOAPArrayStruct_varArray.m_Size = ARRAYSIZE;
+ sas.varFloat = 12345.67890;
+ sas.varInt = 5000;
+ sas.varString = strdup("varString content of SOAPArrayStruct");
+ sas.varArray.m_Array = malloc(sizeof(AxisChar*)*ARRAYSIZE);
+ sas.varArray.m_Size = ARRAYSIZE;
for (x=0; x<ARRAYSIZE; x++)
{
- sas.SOAPArrayStruct_varArray.m_Array[x] = strdup("content of string array element");
+ sas.varArray.m_Array[x] = strdup("content of string array element");
}
/* printf("invoking echoNestedArray...\n");
if (echoNestedArray(pstub, &sas) != NULL)
@@ -46,13 +46,13 @@
printf("failed\n");
*/
/*testing Nested Structs*/
- sss.SOAPStructStruct_varFloat = 12345.67890;
- sss.SOAPStructStruct_varInt = 5000;
- sss.SOAPStructStruct_varString = strdup("varString content of SOAPStructStruct");
- sss.SOAPStructStruct_varStruct = malloc(sizeof(SOAPStruct));
- sss.SOAPStructStruct_varStruct->SOAPStruct_varFloat = 67890.12345;
- sss.SOAPStructStruct_varStruct->SOAPStruct_varInt = 54321;
- sss.SOAPStructStruct_varStruct->SOAPStruct_varString = strdup("varString content of SOAPStruct");
+ sss.varFloat = 12345.67890;
+ sss.varInt = 5000;
+ sss.varString = strdup("varString content of SOAPStructStruct");
+ sss.varStruct = malloc(sizeof(SOAPStruct));
+ sss.varStruct->varFloat = 67890.12345;
+ sss.varStruct->varInt = 54321;
+ sss.varStruct->varString = strdup("varString content of SOAPStruct");
printf("invoking echoNestedStruct...\n");
if (echoNestedStruct(pstub, &sss) != NULL)
printf("successful\n");
@@ -68,9 +68,9 @@
printf("failed\n");
/*testing echo Struct as simple types.*/
- ss.SOAPStruct_varFloat = 12345.67890;
- ss.SOAPStruct_varInt = 5000;
- ss.SOAPStruct_varString = strdup("content of string passed");
+ ss.varFloat = 12345.67890;
+ ss.varInt = 5000;
+ ss.varString = strdup("content of string passed");
printf("invoking echoStructAsSimpleTypes...\n");
echoStructAsSimpleTypes(pstub, &ss, &outStr, &outInt, &outFloat);
if (outInt == 5000 && (0 == strcmp(outStr,"content of string passed")) && outFloat > 12345.67)
1.10 +2 -2 ws-axis/c/samples/client/interoptests/cgroupB/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cgroupB/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am 13 Aug 2004 10:34:08 -0000 1.9
+++ Makefile.am 16 Aug 2004 06:15:09 -0000 1.10
@@ -1,6 +1,6 @@
bin_PROGRAMS = cgroupB
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS)
-cgroupB_SOURCES = SOAPStructStruct.c SOAPStruct.c SOAPArrayStruct.c InteropTestPortTypeB.c InteropGroupBClient.c
-cgroupB_LDADD = @LINKCLIENTLIB@
+cgroupB_SOURCES = SOAPStructStruct.c SOAPStruct.c SOAPArrayStruct.c InteropTestPortTypeB.c
+cgroupB_LDADD = $(LDFLAGS)
INCLUDES = -I$(AXISCPP_HOME)/include
1.5 +14 -14 ws-axis/c/samples/client/interoptests/cgroupB/SOAPArrayStruct.c
Index: SOAPArrayStruct.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cgroupB/SOAPArrayStruct.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SOAPArrayStruct.c 12 Aug 2004 13:38:24 -0000 1.4
+++ SOAPArrayStruct.c 16 Aug 2004 06:15:09 -0000 1.5
@@ -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.5 +4 -4 ws-axis/c/samples/client/interoptests/cgroupB/SOAPArrayStruct.h
Index: SOAPArrayStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cgroupB/SOAPArrayStruct.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SOAPArrayStruct.h 12 Aug 2004 13:38:24 -0000 1.4
+++ SOAPArrayStruct.h 16 Aug 2004 06:15:10 -0000 1.5
@@ -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.5 +8 -8 ws-axis/c/samples/client/interoptests/cgroupB/SOAPStruct.c
Index: SOAPStruct.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cgroupB/SOAPStruct.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SOAPStruct.c 12 Aug 2004 13:38:24 -0000 1.4
+++ SOAPStruct.c 16 Aug 2004 06:15:10 -0000 1.5
@@ -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/client/interoptests/cgroupB/SOAPStruct.h
Index: SOAPStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cgroupB/SOAPStruct.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SOAPStruct.h 12 Aug 2004 13:38:24 -0000 1.4
+++ SOAPStruct.h 16 Aug 2004 06:15:10 -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.6 +13 -13 ws-axis/c/samples/client/interoptests/cgroupB/SOAPStructStruct.c
Index: SOAPStructStruct.c
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cgroupB/SOAPStructStruct.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SOAPStructStruct.c 12 Aug 2004 13:38:24 -0000 1.5
+++ SOAPStructStruct.c 16 Aug 2004 06:15:10 -0000 1.6
@@ -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.5 +4 -4 ws-axis/c/samples/client/interoptests/cgroupB/SOAPStructStruct.h
Index: SOAPStructStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cgroupB/SOAPStructStruct.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SOAPStructStruct.h 12 Aug 2004 13:38:24 -0000 1.4
+++ SOAPStructStruct.h 16 Aug 2004 06:15:10 -0000 1.5
@@ -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.11 +16 -16 ws-axis/c/samples/client/interoptests/groupB/InteropGroupBClient.cpp
Index: InteropGroupBClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/groupB/InteropGroupBClient.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- InteropGroupBClient.cpp 12 Aug 2004 13:38:31 -0000 1.10
+++ InteropGroupBClient.cpp 16 Aug 2004 06:15:11 -0000 1.11
@@ -27,14 +27,14 @@
/*testing Nested Arrays*/
SOAPArrayStruct sas;
- sas.SOAPArrayStruct_varFloat = 12345.67890;
- sas.SOAPArrayStruct_varInt = 5000;
- sas.SOAPArrayStruct_varString = strdup("varString content of SOAPArrayStruct");
- sas.SOAPArrayStruct_varArray.m_Array = new AxisChar*[ARRAYSIZE];
- sas.SOAPArrayStruct_varArray.m_Size = ARRAYSIZE;
+ sas.varFloat = 12345.67890;
+ sas.varInt = 5000;
+ sas.varString = strdup("varString content of SOAPArrayStruct");
+ sas.varArray.m_Array = new AxisChar*[ARRAYSIZE];
+ sas.varArray.m_Size = ARRAYSIZE;
for (x=0; x<ARRAYSIZE; x++)
{
- sas.SOAPArrayStruct_varArray.m_Array[x] = strdup("content of string array element");
+ sas.varArray.m_Array[x] = strdup("content of string array element");
}
printf("invoking echoNestedArray...\n");
if (ws.echoNestedArray(&sas) != NULL)
@@ -44,13 +44,13 @@
/*testing Nested Structs*/
SOAPStructStruct sss;
- sss.SOAPStructStruct_varFloat = 12345.67890;
- sss.SOAPStructStruct_varInt = 5000;
- sss.SOAPStructStruct_varString = strdup("varString content of SOAPStructStruct");
- sss.SOAPStructStruct_varStruct = new SOAPStruct();
- sss.SOAPStructStruct_varStruct->SOAPStruct_varFloat = 67890.12345;
- sss.SOAPStructStruct_varStruct->SOAPStruct_varInt = 54321;
- sss.SOAPStructStruct_varStruct->SOAPStruct_varString = strdup("varString content of SOAPStruct");
+ sss.varFloat = 12345.67890;
+ sss.varInt = 5000;
+ sss.varString = strdup("varString content of SOAPStructStruct");
+ sss.varStruct = new SOAPStruct();
+ sss.varStruct->varFloat = 67890.12345;
+ sss.varStruct->varInt = 54321;
+ sss.varStruct->varString = strdup("varString content of SOAPStruct");
printf("invoking echoNestedStruct...\n");
if (ws.echoNestedStruct(&sss) != NULL)
printf("successful\n");
@@ -67,9 +67,9 @@
/*testing echo Struct as simple types.*/
SOAPStruct ss;
- ss.SOAPStruct_varFloat = 12345.67890;
- ss.SOAPStruct_varInt = 5000;
- ss.SOAPStruct_varString = strdup("content of string passed");
+ ss.varFloat = 12345.67890;
+ ss.varInt = 5000;
+ ss.varString = strdup("content of string passed");
char* outStr;
int outInt;
float outFloat;
1.16 +9 -9 ws-axis/c/samples/client/interoptests/groupB/InteropTestPortTypeB.cpp
Index: InteropTestPortTypeB.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/groupB/InteropTestPortTypeB.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- InteropTestPortTypeB.cpp 12 Aug 2004 13:38:31 -0000 1.15
+++ InteropTestPortTypeB.cpp 16 Aug 2004 06:15:11 -0000 1.16
@@ -35,7 +35,7 @@
InteropTestPortTypeB::InteropTestPortTypeB()
:Stub(" ", APTHTTP)
{
- m_pCall->setEndpointURI("http://localhost/axis/InteropGroupB");
+ m_pCall->setEndpointURI("http://localhost/axis/groupB");
}
InteropTestPortTypeB::~InteropTestPortTypeB()
@@ -55,7 +55,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return ;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropGroupB#echoStructAsSimpleTypes");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "groupB#echoStructAsSimpleTypes");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoStructAsSimpleTypes", "http://soapinterop.org/");
applyUserPreferences();
@@ -79,7 +79,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropGroupB" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/groupB" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -101,7 +101,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return pReturn;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropGroupB#echoSimpleTypesAsStruct");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "groupB#echoSimpleTypesAsStruct");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoSimpleTypesAsStruct", "http://soapinterop.org/");
applyUserPreferences();
@@ -126,7 +126,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropGroupB" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/groupB" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -148,7 +148,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return pReturn;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropGroupB#echoNestedStruct");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "groupB#echoNestedStruct");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoNestedStruct", "http://soapinterop.org/");
applyUserPreferences();
@@ -171,7 +171,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropGroupB" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/groupB" );
if(pSoapFault)
{
m_pCall->unInitialize();
@@ -193,7 +193,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER, NORMAL_CHANNEL))
return pReturn;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropGroupB#echoNestedArray");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "groupB#echoNestedArray");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoNestedArray", "http://soapinterop.org/");
applyUserPreferences();
@@ -216,7 +216,7 @@
m_pCall->unInitialize();
throw;
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/InteropGroupB" );
+ ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/groupB" );
if(pSoapFault)
{
m_pCall->unInitialize();
1.13 +3 -3 ws-axis/c/samples/client/interoptests/groupB/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/groupB/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.am 13 Aug 2004 10:25:46 -0000 1.12
+++ Makefile.am 16 Aug 2004 06:15:11 -0000 1.13
@@ -1,6 +1,6 @@
-bin_PROGRAMS = InteropGroupB
+bin_PROGRAMS = groupB
SUBDIRS =
AM_CPPFLAGS = $(CPPFLAGS)
-InteropGroupB_SOURCES = SOAPStruct.cpp SOAPArrayStruct.cpp SOAPStructStruct.cpp AxisClientException.cpp InteropTestPortTypeB.cpp InteropGroupBClient.cpp
-InteropGroupB_LDADD = @LINKCLIENTLIB@
+groupB_SOURCES = SOAPStruct.cpp SOAPArrayStruct.cpp SOAPStructStruct.cpp AxisClientException.cpp InteropTestPortTypeB.cpp
+groupB_LDADD = $(LDFLAGS)
INCLUDES = -I$(AXISCPP_HOME)/include
1.7 +11 -11 ws-axis/c/samples/client/interoptests/groupB/SOAPArrayStruct.cpp
Index: SOAPArrayStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/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:38:31 -0000 1.6
+++ SOAPArrayStruct.cpp 16 Aug 2004 06:15:11 -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/client/interoptests/groupB/SOAPArrayStruct.h
Index: SOAPArrayStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/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:38:32 -0000 1.7
+++ SOAPArrayStruct.h 16 Aug 2004 06:15:11 -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/client/interoptests/groupB/SOAPStruct.cpp
Index: SOAPStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/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:38:33 -0000 1.6
+++ SOAPStruct.cpp 16 Aug 2004 06:15:11 -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/client/interoptests/groupB/SOAPStruct.h
Index: SOAPStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/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:38:33 -0000 1.7
+++ SOAPStruct.h 16 Aug 2004 06:15:11 -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/client/interoptests/groupB/SOAPStructStruct.cpp
Index: SOAPStructStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/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:38:33 -0000 1.6
+++ SOAPStructStruct.cpp 16 Aug 2004 06:15:11 -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/client/interoptests/groupB/SOAPStructStruct.h
Index: SOAPStructStruct.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/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:38:33 -0000 1.7
+++ SOAPStructStruct.h 16 Aug 2004 06:15:11 -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();
};