axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From susan...@apache.org
Subject cvs commit: ws-axis/c/vc/server/samples/interoptests/doclitbase doclitbase.dsp
Date Tue, 03 Feb 2004 14:33:28 GMT
susantha    2004/02/03 06:33:28

  Modified:    c/samples/client/interoptests/doclitbase
                        InteropBaseClient.cpp InteropTestPortType.cpp
               c/samples/client/interoptests/doclitgroupB
                        InteropTestPortTypeB.cpp
               c/samples/client/interoptests/groupB
                        InteropTestPortTypeB.cpp
               c/samples/server/interoptests/base
                        InteropTestPortTypeService.cpp
               c/samples/server/interoptests/doclitbase
                        InteropTestPortTypeService.cpp
                        InteropTestPortTypeWrapper.cpp
                        InteropTestPortTypeWrapper.h
               c/samples/server/interoptests/doclitgroupB
                        InteropTestPortTypeBService.cpp
                        InteropTestPortTypeBWrapper.cpp
                        InteropTestPortTypeBWrapper.h
               c/samples/server/interoptests/groupB
                        InteropTestPortTypeBService.cpp
                        InteropTestPortTypeBWrapper.cpp
                        InteropTestPortTypeBWrapper.h
               c/vc/client/samples/interoptests/doclitbase doclitbase.dsp
               c/vc/client/samples/interoptests/groupB groupB.dsp
               c/vc/server/samples/interoptests/doclitbase doclitbase.dsp
  Log:
  Changed other interop samples to work with the changes to the code base
  
  Revision  Changes    Path
  1.2       +8 -8      ws-axis/c/samples/client/interoptests/doclitbase/InteropBaseClient.cpp
  
  Index: InteropBaseClient.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/doclitbase/InteropBaseClient.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InteropBaseClient.cpp	27 Jan 2004 05:47:04 -0000	1.1
  +++ InteropBaseClient.cpp	3 Feb 2004 14:33:27 -0000	1.2
  @@ -12,14 +12,14 @@
   	char buffer1[100];
   	
   	InteropTestPortType ws;
  -/*	printf("invoking echoString...\n");
  +	printf("invoking echoString...\n");
   	//testing echoString 
   	if (0 == strcmp(ws.echoString("hello world"), "hello world"))
   		printf("successful\n");
   	else
   		printf("failed\n");
  -*/	// testing echoStringArray 
  -	ArrayOfstring arrstr;
  +	// testing echoStringArray 
  +/*	ArrayOfstring arrstr;
   	arrstr.m_Array = new char*[ARRAYSIZE];
   	arrstr.m_Size = ARRAYSIZE;
   	for (x=0;x<ARRAYSIZE;x++)
  @@ -45,8 +45,8 @@
   			printf("failed\n");
   	}
   	printf("Done\n");
  -	// testing echoInteger 
  -/*	printf("invoking echoInteger...\n");
  +*/	// testing echoInteger 
  +	printf("invoking echoInteger...\n");
   	if (ws.echoInteger(56) == 56)
   		printf("successful\n");
   	else
  @@ -84,7 +84,7 @@
   	else
   		printf("failed\n");
   	// testing echo Struct
  -	SOAPStruct stct;
  +/*	SOAPStruct stct;
   	stct.varFloat = 12345.7346345;
   	stct.varInt = 5000;
   	stct.varString = "This is string in SOAPStruct";
  @@ -136,7 +136,7 @@
   //		printf("successful\n");
   //	else
   //		printf("failed\n");
  -	//testing echo decimal
  +*/	//testing echo decimal
   	printf("invoking echoDecimal...\n");
   	if (ws.echoDecimal(1234.567890) > 1234.56)
   		printf("successful\n");
  @@ -148,6 +148,6 @@
   		printf("successful\n");
   	else
   		printf("failed\n");
  -*/	getchar();
  +	getchar();
   	return 0;
   }
  
  
  
  1.2       +15 -15    ws-axis/c/samples/client/interoptests/doclitbase/InteropTestPortType.cpp
  
  Index: InteropTestPortType.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/doclitbase/InteropTestPortType.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InteropTestPortType.cpp	27 Jan 2004 05:47:04 -0000	1.1
  +++ InteropTestPortType.cpp	3 Feb 2004 14:33:27 -0000	1.2
  @@ -18,7 +18,7 @@
   {
   	m_pCall = new Call();
   	m_pCall->SetProtocol(APTHTTP);
  -	m_pCall->SetEndpointURI("http://localhost/axis/InteropBaseDL");
  +	m_pCall->SetEndpointURI("http://localhost:5555/axis/InteropBaseDL");
   }
   
   InteropTestPortType::~InteropTestPortType()
  @@ -36,7 +36,7 @@
   {
   	int nStatus;
   	AxisChar* Ret;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return Ret;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return Ret;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoString");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoString", "http://soapinterop.org/");
  @@ -61,7 +61,7 @@
   {
   	int nStatus;
   	ArrayOfstring RetArray = {NULL, 0};
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return RetArray;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return RetArray;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoStringArray");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoStringArray", "http://soapinterop.org/");
  @@ -86,7 +86,7 @@
   {
   	int nStatus;
   	int Ret;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return Ret;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return Ret;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoInteger");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoInteger", "http://soapinterop.org/");
  @@ -111,7 +111,7 @@
   {
   	int nStatus;
   	ArrayOfint RetArray = {NULL, 0};
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return RetArray;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return RetArray;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoIntegerArray");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoIntegerArray", "http://soapinterop.org/");
  @@ -136,7 +136,7 @@
   {
   	int nStatus;
   	float Ret;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return Ret;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return Ret;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoFloat");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoFloat", "http://soapinterop.org/");
  @@ -165,7 +165,7 @@
   {
   	int nStatus;
   	ArrayOffloat RetArray = {NULL, 0};
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return RetArray;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return RetArray;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoFloatArray");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoFloatArray", "http://soapinterop.org/");
  @@ -190,7 +190,7 @@
   {
   	int nStatus;
   	SOAPStruct* pReturn = NULL;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return pReturn;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return pReturn;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoStruct");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoStruct", "http://soapinterop.org/");
  @@ -215,7 +215,7 @@
   {
   	int nStatus;
   	ArrayOfSOAPStruct RetArray = {NULL, 0};
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return RetArray;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return RetArray;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoStructArray");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoStructArray", "http://soapinterop.org/");
  @@ -239,7 +239,7 @@
   void InteropTestPortType::echoVoid()
   {
   	int nStatus;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoVoid");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoVoid", "http://soapinterop.org/");
  @@ -262,7 +262,7 @@
   {
   	int nStatus;
   	xsd__base64Binary Ret;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return Ret;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return Ret;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoBase64");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoBase64", "http://soapinterop.org/");
  @@ -287,7 +287,7 @@
   {
   	int nStatus;
   	xsd__dateTime Ret;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return Ret;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return Ret;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoDate");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoDate", "http://soapinterop.org/");
  @@ -312,7 +312,7 @@
   {
   	int nStatus;
   	xsd__hexBinary Ret;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return Ret;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return Ret;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoHexBinary");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoHexBinary", "http://soapinterop.org/");
  @@ -337,7 +337,7 @@
   {
   	int nStatus;
   	xsd__decimal Ret;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return Ret;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return Ret;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoDecimal");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoDecimal", "http://soapinterop.org/");
  @@ -362,7 +362,7 @@
   {
   	int nStatus;
   	xsd__boolean Ret;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return Ret;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return Ret;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropBaseDL#echoBoolean");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoBoolean", "http://soapinterop.org/");
  
  
  
  1.2       +5 -5      ws-axis/c/samples/client/interoptests/doclitgroupB/InteropTestPortTypeB.cpp
  
  Index: InteropTestPortTypeB.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/doclitgroupB/InteropTestPortTypeB.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InteropTestPortTypeB.cpp	27 Jan 2004 05:47:04 -0000	1.1
  +++ InteropTestPortTypeB.cpp	3 Feb 2004 14:33:28 -0000	1.2
  @@ -30,7 +30,7 @@
   {
   	m_pCall = new Call();
   	m_pCall->SetProtocol(APTHTTP);
  -	m_pCall->SetEndpointURI("http://localhost/axis/InteropGroupBDL");
  +	m_pCall->SetEndpointURI("http://localhost:5555/axis/InteropGroupBDL");
   }
   
   InteropTestPortTypeB::~InteropTestPortTypeB()
  @@ -47,7 +47,7 @@
   void InteropTestPortTypeB::echoStructAsSimpleTypes(SOAPStruct* Value0, AXIS_OUT_PARAM AxisChar**
outValue0, AXIS_OUT_PARAM int* outValue1, AXIS_OUT_PARAM float* outValue2)
   {
   	int nStatus;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropGroupBDL#echoStructAsSimpleTypes");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoStructAsSimpleTypes", "http://soapinterop.org/");
  @@ -73,7 +73,7 @@
   {
   	int nStatus;
   	SOAPStruct* pReturn = NULL;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return pReturn;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return pReturn;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropGroupBDL#echoSimpleTypesAsStruct");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoSimpleTypesAsStruct", "http://soapinterop.org/");
  @@ -110,7 +110,7 @@
   {
   	int nStatus;
   	SOAPStructStruct* pReturn = NULL;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return pReturn;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return pReturn;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropGroupBDL#echoNestedStruct");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoNestedStruct", "http://soapinterop.org/");
  @@ -135,7 +135,7 @@
   {
   	int nStatus;
   	SOAPArrayStruct* pReturn = NULL;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(DOC_LITERAL)) return pReturn;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER)) return pReturn;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropGroupBDL#echoNestedArray");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoNestedArray", "http://soapinterop.org/");
  
  
  
  1.3       +5 -5      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InteropTestPortTypeB.cpp	27 Jan 2004 05:47:04 -0000	1.2
  +++ InteropTestPortTypeB.cpp	3 Feb 2004 14:33:28 -0000	1.3
  @@ -47,7 +47,7 @@
   void InteropTestPortTypeB::echoStructAsSimpleTypes(SOAPStruct* Value0, AXIS_OUT_PARAM AxisChar**
outValue0, AXIS_OUT_PARAM int* outValue1, AXIS_OUT_PARAM float* outValue2)
   {
   	int nStatus;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(RPC_ENCODED)) return;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_RPC_PROVIDER)) return;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropGroupB#echoStructAsSimpleTypes");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoStructAsSimpleTypes", "http://soapinterop.org/");
  @@ -73,7 +73,7 @@
   {
   	int nStatus;
   	SOAPStruct* pReturn = NULL;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(RPC_ENCODED)) return pReturn;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_RPC_PROVIDER)) return pReturn;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropGroupB#echoSimpleTypesAsStruct");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoSimpleTypesAsStruct", "http://soapinterop.org/");
  @@ -100,7 +100,7 @@
   {
   	int nStatus;
   	ArrayOfString2D RetArray = {NULL, 0};
  -	if (AXIS_SUCCESS != m_pCall->Initialize(RPC_ENCODED)) return RetArray;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_RPC_PROVIDER)) return RetArray;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropGroupB#echo2DStringArray");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echo2DStringArray", "http://soapinterop.org/");
  @@ -125,7 +125,7 @@
   {
   	int nStatus;
   	SOAPStructStruct* pReturn = NULL;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(RPC_ENCODED)) return pReturn;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_RPC_PROVIDER)) return pReturn;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropGroupB#echoNestedStruct");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoNestedStruct", "http://soapinterop.org/");
  @@ -150,7 +150,7 @@
   {
   	int nStatus;
   	SOAPArrayStruct* pReturn = NULL;
  -	if (AXIS_SUCCESS != m_pCall->Initialize(RPC_ENCODED)) return pReturn;
  +	if (AXIS_SUCCESS != m_pCall->Initialize(CPP_RPC_PROVIDER)) return pReturn;
   	m_pCall->SetTransportProperty(SOAPACTION_HEADER, "InteropGroupB#echoNestedArray");
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoNestedArray", "http://soapinterop.org/");
  
  
  
  1.4       +0 -2      ws-axis/c/samples/server/interoptests/base/InteropTestPortTypeService.cpp
  
  Index: InteropTestPortTypeService.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/base/InteropTestPortTypeService.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InteropTestPortTypeService.cpp	3 Feb 2004 13:04:46 -0000	1.3
  +++ InteropTestPortTypeService.cpp	3 Feb 2004 14:33:28 -0000	1.4
  @@ -7,8 +7,6 @@
   #endif
   #include "InteropTestPortTypeWrapper.h"
   
  -extern BasicHandlerFunctions InteropTestPortTypeWrapper_functions;
  -
   extern "C" {
   STORAGE_CLASS_INFO
   int GetClassInstance(BasicHandler **inst)
  
  
  
  1.2       +11 -6     ws-axis/c/samples/server/interoptests/doclitbase/InteropTestPortTypeService.cpp
  
  Index: InteropTestPortTypeService.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/doclitbase/InteropTestPortTypeService.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InteropTestPortTypeService.cpp	27 Jan 2004 05:47:06 -0000	1.1
  +++ InteropTestPortTypeService.cpp	3 Feb 2004 14:33:28 -0000	1.2
  @@ -6,29 +6,34 @@
   #define STORAGE_CLASS_INFO 
   #endif
   #include "InteropTestPortTypeWrapper.h" 
  +
   extern "C" {
   STORAGE_CLASS_INFO
   int GetClassInstance(BasicHandler **inst)
   {
  -	WrapperClassHandler* pWCH = new InteropTestPortTypeWrapper();
  -	if (pWCH)
  +	*inst = new BasicHandler();
  +	InteropTestPortTypeWrapper* pService = new InteropTestPortTypeWrapper();
  +	(*inst)->_functions = 0;
  +	if (pService)
   	{
  -		pWCH->Init();
  -		*inst = pWCH;
  -		return AXIS_SUCCESS;
  +		(*inst)->_object = pService;
  +		return pService->Init();
   	}
   	return AXIS_FAIL;
   }
  +
   STORAGE_CLASS_INFO 
   int DestroyInstance(BasicHandler *inst)
   {
   	if (inst)
   	{
  -		WrapperClassHandler* pWCH = static_cast<WrapperClassHandler*>(inst);
  +		WrapperClassHandler* pWCH = static_cast<WrapperClassHandler*>(inst->_object);
   		pWCH->Fini();
   		delete pWCH;
  +		delete inst;
   		return AXIS_SUCCESS;
   	}
   	return AXIS_FAIL;
   }
   }
  +
  
  
  
  1.2       +3 -2      ws-axis/c/samples/server/interoptests/doclitbase/InteropTestPortTypeWrapper.cpp
  
  Index: InteropTestPortTypeWrapper.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/doclitbase/InteropTestPortTypeWrapper.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InteropTestPortTypeWrapper.cpp	27 Jan 2004 05:47:06 -0000	1.1
  +++ InteropTestPortTypeWrapper.cpp	3 Feb 2004 14:33:28 -0000	1.2
  @@ -23,7 +23,7 @@
   }
   
   //implementation of WrapperClassHandler interface
  -void InteropTestPortTypeWrapper::OnFault(IMessageData *pMsg)
  +void InteropTestPortTypeWrapper::OnFault(void *pMsg)
   {
   }
   
  @@ -41,8 +41,9 @@
   /////////////////////////////////////////////////////////////////
   // This method invokes the right service method 
   //////////////////////////////////////////////////////////////////
  -int InteropTestPortTypeWrapper::Invoke(IMessageData *mc)
  +int InteropTestPortTypeWrapper::Invoke(void *pMsg)
   {
  +	IMessageData *mc = (IMessageData*)pMsg;
   	const AxisChar *method = mc->GetOperationName();
   	if (0 == strcmp(method, "echoString"))
   		return echoString(mc);
  
  
  
  1.2       +2 -2      ws-axis/c/samples/server/interoptests/doclitbase/InteropTestPortTypeWrapper.h
  
  Index: InteropTestPortTypeWrapper.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/doclitbase/InteropTestPortTypeWrapper.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InteropTestPortTypeWrapper.h	27 Jan 2004 05:47:06 -0000	1.1
  +++ InteropTestPortTypeWrapper.h	3 Feb 2004 14:33:28 -0000	1.2
  @@ -22,8 +22,8 @@
   public:
   	virtual ~InteropTestPortTypeWrapper();
   public://implementation of WrapperClassHandler interface
  -	int AXISCALL Invoke(IMessageData* mc);
  -	void AXISCALL OnFault(IMessageData* pMsg);
  +	int AXISCALL Invoke(void* mc);
  +	void AXISCALL OnFault(void* pMsg);
   	int AXISCALL Init();
   	int AXISCALL Fini();
   	AXIS_BINDING_STYLE AXISCALL GetBindingStyle(){return DOC_LITERAL;};
  
  
  
  1.2       +11 -6     ws-axis/c/samples/server/interoptests/doclitgroupB/InteropTestPortTypeBService.cpp
  
  Index: InteropTestPortTypeBService.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/doclitgroupB/InteropTestPortTypeBService.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InteropTestPortTypeBService.cpp	27 Jan 2004 05:47:06 -0000	1.1
  +++ InteropTestPortTypeBService.cpp	3 Feb 2004 14:33:28 -0000	1.2
  @@ -6,29 +6,34 @@
   #define STORAGE_CLASS_INFO 
   #endif
   #include "InteropTestPortTypeBWrapper.h" 
  +
   extern "C" {
   STORAGE_CLASS_INFO
   int GetClassInstance(BasicHandler **inst)
   {
  -	WrapperClassHandler* pWCH = new InteropTestPortTypeBWrapper();
  -	if (pWCH)
  +	*inst = new BasicHandler();
  +	InteropTestPortTypeBWrapper* pService = new InteropTestPortTypeBWrapper();
  +	(*inst)->_functions = 0;
  +	if (pService)
   	{
  -		pWCH->Init();
  -		*inst = pWCH;
  -		return AXIS_SUCCESS;
  +		(*inst)->_object = pService;
  +		return pService->Init();
   	}
   	return AXIS_FAIL;
   }
  +
   STORAGE_CLASS_INFO 
   int DestroyInstance(BasicHandler *inst)
   {
   	if (inst)
   	{
  -		WrapperClassHandler* pWCH = static_cast<WrapperClassHandler*>(inst);
  +		WrapperClassHandler* pWCH = static_cast<WrapperClassHandler*>(inst->_object);
   		pWCH->Fini();
   		delete pWCH;
  +		delete inst;
   		return AXIS_SUCCESS;
   	}
   	return AXIS_FAIL;
   }
   }
  +
  
  
  
  1.2       +3 -2      ws-axis/c/samples/server/interoptests/doclitgroupB/InteropTestPortTypeBWrapper.cpp
  
  Index: InteropTestPortTypeBWrapper.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/doclitgroupB/InteropTestPortTypeBWrapper.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InteropTestPortTypeBWrapper.cpp	27 Jan 2004 05:47:06 -0000	1.1
  +++ InteropTestPortTypeBWrapper.cpp	3 Feb 2004 14:33:28 -0000	1.2
  @@ -35,7 +35,7 @@
   }
   
   //implementation of WrapperClassHandler interface
  -void InteropTestPortTypeBWrapper::OnFault(IMessageData *pMsg)
  +void InteropTestPortTypeBWrapper::OnFault(void *pMsg)
   {
   }
   
  @@ -53,8 +53,9 @@
   /////////////////////////////////////////////////////////////////
   // This method invokes the right service method 
   //////////////////////////////////////////////////////////////////
  -int InteropTestPortTypeBWrapper::Invoke(IMessageData *mc)
  +int InteropTestPortTypeBWrapper::Invoke(void *pMsg)
   {
  +	IMessageData *mc = (IMessageData*)pMsg;
   	const AxisChar *method = mc->GetOperationName();
   	if (0 == strcmp(method, "echoStructAsSimpleTypes"))
   		return echoStructAsSimpleTypes(mc);
  
  
  
  1.2       +2 -2      ws-axis/c/samples/server/interoptests/doclitgroupB/InteropTestPortTypeBWrapper.h
  
  Index: InteropTestPortTypeBWrapper.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/doclitgroupB/InteropTestPortTypeBWrapper.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InteropTestPortTypeBWrapper.h	27 Jan 2004 05:47:06 -0000	1.1
  +++ InteropTestPortTypeBWrapper.h	3 Feb 2004 14:33:28 -0000	1.2
  @@ -22,8 +22,8 @@
   public:
   	virtual ~InteropTestPortTypeBWrapper();
   public://implementation of WrapperClassHandler interface
  -	int AXISCALL Invoke(IMessageData* mc);
  -	void AXISCALL OnFault(IMessageData* pMsg);
  +	int AXISCALL Invoke(void* mc);
  +	void AXISCALL OnFault(void* pMsg);
   	int AXISCALL Init();
   	int AXISCALL Fini();
   	AXIS_BINDING_STYLE AXISCALL GetBindingStyle(){return DOC_LITERAL;};
  
  
  
  1.3       +10 -6     ws-axis/c/samples/server/interoptests/groupB/InteropTestPortTypeBService.cpp
  
  Index: InteropTestPortTypeBService.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/InteropTestPortTypeBService.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InteropTestPortTypeBService.cpp	27 Jan 2004 05:47:07 -0000	1.2
  +++ InteropTestPortTypeBService.cpp	3 Feb 2004 14:33:28 -0000	1.3
  @@ -6,27 +6,31 @@
   #define STORAGE_CLASS_INFO 
   #endif
   #include "InteropTestPortTypeBWrapper.h" 
  +
   extern "C" {
   STORAGE_CLASS_INFO
   int GetClassInstance(BasicHandler **inst)
   {
  -	WrapperClassHandler* pWCH = new InteropTestPortTypeBWrapper();
  -	if (pWCH)
  +	*inst = new BasicHandler();
  +	InteropTestPortTypeBWrapper* pService = new InteropTestPortTypeBWrapper();
  +	(*inst)->_functions = 0;
  +	if (pService)
   	{
  -		pWCH->Init();
  -		*inst = pWCH;
  -		return AXIS_SUCCESS;
  +		(*inst)->_object = pService;
  +		return pService->Init();
   	}
   	return AXIS_FAIL;
   }
  +
   STORAGE_CLASS_INFO 
   int DestroyInstance(BasicHandler *inst)
   {
   	if (inst)
   	{
  -		WrapperClassHandler* pWCH = static_cast<WrapperClassHandler*>(inst);
  +		WrapperClassHandler* pWCH = static_cast<WrapperClassHandler*>(inst->_object);
   		pWCH->Fini();
   		delete pWCH;
  +		delete inst;
   		return AXIS_SUCCESS;
   	}
   	return AXIS_FAIL;
  
  
  
  1.3       +3 -2      ws-axis/c/samples/server/interoptests/groupB/InteropTestPortTypeBWrapper.cpp
  
  Index: InteropTestPortTypeBWrapper.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/InteropTestPortTypeBWrapper.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InteropTestPortTypeBWrapper.cpp	27 Jan 2004 05:47:07 -0000	1.2
  +++ InteropTestPortTypeBWrapper.cpp	3 Feb 2004 14:33:28 -0000	1.3
  @@ -35,7 +35,7 @@
   }
   
   //implementation of WrapperClassHandler interface
  -void InteropTestPortTypeBWrapper::OnFault(IMessageData *pMsg)
  +void InteropTestPortTypeBWrapper::OnFault(void *pMsg)
   {
   }
   
  @@ -53,8 +53,9 @@
   /////////////////////////////////////////////////////////////////
   // This method invokes the right service method 
   //////////////////////////////////////////////////////////////////
  -int InteropTestPortTypeBWrapper::Invoke(IMessageData *mc)
  +int InteropTestPortTypeBWrapper::Invoke(void *pMsg)
   {
  +	IMessageData *mc = (IMessageData*)pMsg;
   	const AxisChar *method = mc->GetOperationName();
   	if (0 == strcmp(method, "echoStructAsSimpleTypes"))
   		return echoStructAsSimpleTypes(mc);
  
  
  
  1.3       +2 -2      ws-axis/c/samples/server/interoptests/groupB/InteropTestPortTypeBWrapper.h
  
  Index: InteropTestPortTypeBWrapper.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/groupB/InteropTestPortTypeBWrapper.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InteropTestPortTypeBWrapper.h	27 Jan 2004 05:47:07 -0000	1.2
  +++ InteropTestPortTypeBWrapper.h	3 Feb 2004 14:33:28 -0000	1.3
  @@ -22,8 +22,8 @@
   public:
   	virtual ~InteropTestPortTypeBWrapper();
   public://implementation of WrapperClassHandler interface
  -	int AXISCALL Invoke(IMessageData* mc);
  -	void AXISCALL OnFault(IMessageData* pMsg);
  +	int AXISCALL Invoke(void* mc);
  +	void AXISCALL OnFault(void* pMsg);
   	int AXISCALL Init();
   	int AXISCALL Fini();
   	AXIS_BINDING_STYLE AXISCALL GetBindingStyle(){return RPC_ENCODED;};
  
  
  
  1.4       +1 -1      ws-axis/c/vc/client/samples/interoptests/doclitbase/doclitbase.dsp
  
  Index: doclitbase.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/client/samples/interoptests/doclitbase/doclitbase.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- doclitbase.dsp	29 Jan 2004 10:02:34 -0000	1.3
  +++ doclitbase.dsp	3 Feb 2004 14:33:28 -0000	1.4
  @@ -60,7 +60,7 @@
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 1
  -# PROP Output_Dir "Debug"
  +# PROP Output_Dir "Release"
   # PROP Intermediate_Dir "Debug"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /GZ /c
  
  
  
  1.7       +1 -1      ws-axis/c/vc/client/samples/interoptests/groupB/groupB.dsp
  
  Index: groupB.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/client/samples/interoptests/groupB/groupB.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- groupB.dsp	29 Jan 2004 10:02:34 -0000	1.6
  +++ groupB.dsp	3 Feb 2004 14:33:28 -0000	1.7
  @@ -74,7 +74,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib client_D.lib Ws2_32.lib libexpat.lib
xml.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../../lib/axis"
/libpath:"C:\Expat-1.95.7\Source\lib\Debug"
  +# ADD LINK32 Common_D.lib Soap_D.lib wsdd_D.lib Engine_D.lib client_D.lib Ws2_32.lib libexpat.lib
xml_D.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../../lib/axis"
/libpath:"C:\Expat-1.95.7\Source\lib\Debug"
   
   !ENDIF 
   
  
  
  
  1.4       +1 -1      ws-axis/c/vc/server/samples/interoptests/doclitbase/doclitbase.dsp
  
  Index: doclitbase.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/server/samples/interoptests/doclitbase/doclitbase.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- doclitbase.dsp	29 Jan 2004 10:02:34 -0000	1.3
  +++ doclitbase.dsp	3 Feb 2004 14:33:28 -0000	1.4
  @@ -63,7 +63,7 @@
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 1
  -# PROP Output_Dir "Debug"
  +# PROP Output_Dir "Release"
   # PROP Intermediate_Dir "Debug"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "DOCLITBASE_EXPORTS" /YX /FD /GZ /c
  
  
  

Mime
View raw message