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/src/wsdd WSDDDeployment.cpp WSDDDocument.cpp
Date Sun, 26 Oct 2003 07:28:44 GMT
susantha    2003/10/26 00:28:44

  Modified:    c/src/client/deployment AdminClient.cpp
               c/src/client/samples/interoptests/base
                        InteropTestPortType.cpp SOAPStruct.cpp
               c/src/client/samples/interoptests/groupB
                        InteropTestPortTypeB.cpp SOAPArrayStruct.cpp
                        SOAPStruct.cpp SOAPStructStruct.cpp
               c/src/engine Axis.cpp
               c/src/server/handlers/custom/loghandler LogHandler.cpp
                        LogHandler.h
               c/src/server/handlers/transport/testhandler2 TestTransport.h
               c/src/server/samples/interoptests/base
                        InteropTestPortTypeWrapper.cpp SOAPStruct.cpp
               c/src/server/samples/interoptests/groupB
                        InteropTestPortTypeBWrapper.cpp SOAPArrayStruct.cpp
                        SOAPStruct.cpp SOAPStructStruct.cpp
               c/src/server/web_services/cpp_deployment CPP_Deployment.h
               c/src/wsdd WSDDDeployment.cpp WSDDDocument.cpp
  Log:
  Fixed some blocker bugs of Admin client
  
  Revision  Changes    Path
  1.8       +31 -39    ws-axis/c/src/client/deployment/AdminClient.cpp
  
  Index: AdminClient.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/deployment/AdminClient.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AdminClient.cpp	22 Oct 2003 11:40:19 -0000	1.7
  +++ AdminClient.cpp	26 Oct 2003 07:28:43 -0000	1.8
  @@ -61,6 +61,7 @@
    *
    */
   
  +#include <ctype.h>
   #include <axis/client/Call.h>
   #include <axis/wsdd/WSDDDeployment.h>
   #include "AdminClientHelper.h"
  @@ -78,30 +79,28 @@
   char* pchMethodName = "";
   ADMIN_CLIENT_METHOD eADMIN_CLIENT_METHOD;
   char* pchMessage = "";
  +WSDDDeployment* pWSDDDeployment = NULL;
   
  -int main(int argc, char *argv[ ]) {
  +int main(int argc, char *argv[]) 
  +{
  +	string sURI = "";
  +	int nPort = 0;
   
   	if (argc < 3) {
  -		printf("Problem occured.\nUsage: %s <Method_Name> <WSDD_FilePath>", argv[0]);

  +		printf("Usage: %s <WSDD File Path> <Server> <Port>", argv[0]);	
   		exit(1);
   	}
   
  -	pchMethodName = argv[1];
  +	string sServer = argv[2];
  +	string sPort = (argc == 4)?argv[3]:"80";
   
  -	if (strcmp(pchMethodName, "deploy") == 0) {
  -		eADMIN_CLIENT_METHOD = AC_DEPLOY;
  -	} else if (strcmp(pchMethodName, "undeploy") == 0) {
  -		eADMIN_CLIENT_METHOD = AC_UNDEPLOY;
  -	} else {
  -		eADMIN_CLIENT_METHOD = AC_UNKNOWN;
  -	}
  -
  -	if (eADMIN_CLIENT_METHOD == AC_UNKNOWN) {
  -		printf("Problem occured.\nMethod_Name should be deploy OR undeploy");
  +	if (0 == (nPort = atoi(sPort.c_str()))) 
  +	{
  +		printf("\nError : Invalid port\n");
   		exit(1);
   	}
   
  -	int nStatus;
  + 	int nStatus;
   	int ret = 0;
   	char* chWSDDPath = "";	
   
  @@ -114,7 +113,17 @@
   
   	do {
   
  -		chWSDDPath = argv[2];
  +		chWSDDPath = argv[1];
  +
  +		pWSDDDeployment= new WSDDDeployment();
  +		if (pWSDDDeployment->LoadWSDD(chWSDDPath) != SUCCESS) 
  +		{
  +			pchMessage = "Failed processing the given WSDD. Please check whether \n1) The wsdd exists
in the given path\
  +					\n2) The wsdd is correct etc\n";
  +			break;
  +		}
  +
  +		eADMIN_CLIENT_METHOD = (pWSDDDeployment->GetDeploymentType() == DT_DEPLOYMENT)? AC_DEPLOY:AC_UNDEPLOY;
   
   		if (eADMIN_CLIENT_METHOD == AC_DEPLOY) {
   			if ( processDeployWSDD(chWSDDPath) != SUCCESS ) {
  @@ -128,13 +137,13 @@
   			}
   		}
   
  -		/* The protocol can be taken from the binding section in the WSDL */
  +		/* The protocol can be taken from the binding section in the WSDL */ //????? 
   		m_pCall->SetProtocol(APTHTTP);
  -		/* The value for SOAPAction is specified in the binding section of the WSDL */
  -		m_pCall->SetHeader("SOAPAction", "servicename");
  -		/* End point URI too can be taken from WSDL */
  -		//m_pCall->SetEndpointURI("http://192.168.101.15:9999/axis/WebserviceDeployer");
  -		m_pCall->SetEndpointURI("http://127.0.0.1:9999/axis/WebserviceDeployer");
  +		/* The value for SOAPAction is specified in the binding section of the WSDL */ //?????

  +		m_pCall->SetHeader("SOAPAction", "WebserviceDeployer");
  +		/* End point URI too can be taken from WSDL */ //????? 
  +		sURI = "http://" + sServer + ":" + sPort + "/axis/WebserviceDeployer";
  +		m_pCall->SetEndpointURI(sURI.c_str());
   
   		/* Following will establish the connections with the server too */
   		if (SUCCESS != m_pCall->Initialize()) 
  @@ -190,6 +199,7 @@
   
   	} while(0);
   
  +	if (pWSDDDeployment) delete pWSDDDeployment;
   	delete m_pCall;
   
   	return 0;
  @@ -203,15 +213,6 @@
   	int iStatus = FAIL;
   
   	do {
  -
  -		WSDDDeployment* pWSDDDeployment= new WSDDDeployment();
  -		if (pWSDDDeployment->LoadWSDD(pchWSDDPath) != SUCCESS) {
  -			pchMessage = "Failed processing the given WSDD. Please check whether \n1) The wsdd exists
in the given path\
  -					\n2) The wsdd is correct etc\n";
  -			
  -			break;
  -		}
  -
   		const WSDDServiceMap* pWSDDServiceMap= pWSDDDeployment->GetWSDDServiceMap();
   		const WSDDServiceMap::const_iterator itCurrService = pWSDDServiceMap->begin();	
   		
  @@ -253,15 +254,6 @@
   	int iStatus = FAIL;
   
   	do {
  -
  -		WSDDDeployment* pWSDDDeployment= new WSDDDeployment();
  -		if (pWSDDDeployment->LoadWSDD(pchWSDDPath) != SUCCESS) {
  -			pchMessage = "Failed processing the given WSDD. Please check whether \n1) The wsdd exists
in the given path\
  -				\n2) The wsdd is correct etc\n";
  -			
  -			break;
  -		}
  -
   		const WSDDServiceMap* pWSDDServiceMap= pWSDDDeployment->GetWSDDServiceMap();
   		const WSDDServiceMap::const_iterator itCurrService = pWSDDServiceMap->begin();	
   		
  
  
  
  1.6       +3 -4      ws-axis/c/src/client/samples/interoptests/base/InteropTestPortType.cpp
  
  Index: InteropTestPortType.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/base/InteropTestPortType.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InteropTestPortType.cpp	24 Oct 2003 09:13:08 -0000	1.5
  +++ InteropTestPortType.cpp	26 Oct 2003 07:28:43 -0000	1.6
  @@ -6,8 +6,7 @@
   
   #include "InteropTestPortType.h"
   
  -#include <axis/common/IWrapperSoapDeSerializer.h>
  -#include <axis/common/IWrapperSoapSerializer.h>
  +#include <axis/common/AxisWrapperAPI.h>
   
   extern int Axis_DeSerialize_SOAPStruct(SOAPStruct* param, IWrapperSoapDeSerializer *pDZ);
   extern void* Axis_Create_SOAPStruct(bool bArray = false, int nSize=0);
  @@ -20,7 +19,7 @@
   	m_pCall = new Call();
   	m_pCall->SetProtocol(APTHTTP);
   	m_pCall->SetHeader("SOAPAction", "InteropBase");
  -	m_pCall->SetEndpointURI("http://localhost:80/axis/InteropBase");
  +	m_pCall->SetEndpointURI("http://localhost:8080/axis/InteropBase");
   }
   
   InteropTestPortType::~InteropTestPortType()
  @@ -179,7 +178,7 @@
   	if (SUCCESS != m_pCall->Initialize()) return pReturn;
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoStruct", "http://soapinterop.org/");
  -	m_pCall->AddParameter(Value0, (void*) Axis_Serialize_SOAPStruct, (void*) Axis_Delete_SOAPStruct,
"inputStruct");
  +	m_pCall->AddParameter(Value0, Axis_Serialize_SOAPStruct, Axis_Delete_SOAPStruct, "inputStruct");
   	m_pCall->SetReturnType((void*) Axis_DeSerialize_SOAPStruct, (void*) Axis_Create_SOAPStruct,
(void*) Axis_Delete_SOAPStruct, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
   	nStatus = m_pCall->Invoke();
   	if (SUCCESS == nStatus)
  
  
  
  1.2       +1 -3      ws-axis/c/src/client/samples/interoptests/base/SOAPStruct.cpp
  
  Index: SOAPStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/base/SOAPStruct.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SOAPStruct.cpp	21 Oct 2003 15:06:37 -0000	1.1
  +++ SOAPStruct.cpp	26 Oct 2003 07:28:43 -0000	1.2
  @@ -5,9 +5,7 @@
   ////////////////////////////////////////////////////////////////////////////////////
   
   #include "SOAPStruct.h"
  -#include <axis/common/IWrapperSoapDeSerializer.h>
  -#include <axis/common/IWrapperSoapSerializer.h>
  -#include <axis/common/IParam.h>
  +#include <axis/common/AxisWrapperAPI.h>
   
   /////////////////////////////////////////////////////////////////////////////
   // This static method serialize a SOAPStruct type of object
  
  
  
  1.7       +4 -5      ws-axis/c/src/client/samples/interoptests/groupB/InteropTestPortTypeB.cpp
  
  Index: InteropTestPortTypeB.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/groupB/InteropTestPortTypeB.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- InteropTestPortTypeB.cpp	25 Oct 2003 08:39:37 -0000	1.6
  +++ InteropTestPortTypeB.cpp	26 Oct 2003 07:28:43 -0000	1.7
  @@ -6,8 +6,7 @@
   
   #include "InteropTestPortTypeB.h"
   
  -#include <axis/common/IWrapperSoapDeSerializer.h>
  -#include <axis/common/IWrapperSoapSerializer.h>
  +#include <axis/common/AxisWrapperAPI.h>
   
   extern int Axis_DeSerialize_SOAPStruct(SOAPStruct* param, IWrapperSoapDeSerializer *pDZ);
   extern void* Axis_Create_SOAPStruct(bool bArray = false, int nSize=0);
  @@ -32,7 +31,7 @@
   	m_pCall = new Call();
   	m_pCall->SetProtocol(APTHTTP);
   	m_pCall->SetHeader("SOAPAction", "InteropGroupB");
  -	m_pCall->SetEndpointURI("http://localhost:80/axis/InteropGroupB");
  +	m_pCall->SetEndpointURI("http://localhost/axis/InteropGroupB");
   }
   
   InteropTestPortTypeB::~InteropTestPortTypeB()
  @@ -125,7 +124,7 @@
   	if (SUCCESS != m_pCall->Initialize()) return pReturn;
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoNestedStruct", "http://soapinterop.org/");
  -	m_pCall->AddParameter(Value0, (void*) Axis_Serialize_SOAPStructStruct, (void*) Axis_Delete_SOAPStructStruct,
"inputStruct");
  +	m_pCall->AddParameter(Value0, Axis_Serialize_SOAPStructStruct, Axis_Delete_SOAPStructStruct,
"inputStruct");
   	m_pCall->SetReturnType((void*) Axis_DeSerialize_SOAPStructStruct, (void*) Axis_Create_SOAPStructStruct,
(void*) Axis_Delete_SOAPStructStruct, Axis_TypeName_SOAPStructStruct, Axis_URI_SOAPStructStruct);
   	nStatus = m_pCall->Invoke();
   	if (SUCCESS == nStatus)
  @@ -147,7 +146,7 @@
   	if (SUCCESS != m_pCall->Initialize()) return pReturn;
   	m_pCall->SetSOAPVersion(SOAP_VER_1_1);
   	m_pCall->SetOperation("echoNestedArray", "http://soapinterop.org/");
  -	m_pCall->AddParameter(Value0, (void*) Axis_Serialize_SOAPArrayStruct, (void*) Axis_Delete_SOAPArrayStruct,
"inputStruct");
  +	m_pCall->AddParameter(Value0, Axis_Serialize_SOAPArrayStruct, Axis_Delete_SOAPArrayStruct,
"inputStruct");
   	m_pCall->SetReturnType((void*) Axis_DeSerialize_SOAPArrayStruct, (void*) Axis_Create_SOAPArrayStruct,
(void*) Axis_Delete_SOAPArrayStruct, Axis_TypeName_SOAPArrayStruct, Axis_URI_SOAPArrayStruct);
   	nStatus = m_pCall->Invoke();
   	if (SUCCESS == nStatus)
  
  
  
  1.2       +1 -3      ws-axis/c/src/client/samples/interoptests/groupB/SOAPArrayStruct.cpp
  
  Index: SOAPArrayStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/groupB/SOAPArrayStruct.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SOAPArrayStruct.cpp	21 Oct 2003 15:06:38 -0000	1.1
  +++ SOAPArrayStruct.cpp	26 Oct 2003 07:28:43 -0000	1.2
  @@ -5,9 +5,7 @@
   ////////////////////////////////////////////////////////////////////////////////////
   
   #include "SOAPArrayStruct.h"
  -#include <axis/common/IWrapperSoapDeSerializer.h>
  -#include <axis/common/IWrapperSoapSerializer.h>
  -#include <axis/common/IParam.h>
  +#include <axis/common/AxisWrapperAPI.h>
   
   /////////////////////////////////////////////////////////////////////////////
   // This static method serialize a SOAPArrayStruct type of object
  
  
  
  1.2       +1 -3      ws-axis/c/src/client/samples/interoptests/groupB/SOAPStruct.cpp
  
  Index: SOAPStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/groupB/SOAPStruct.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SOAPStruct.cpp	21 Oct 2003 15:06:38 -0000	1.1
  +++ SOAPStruct.cpp	26 Oct 2003 07:28:43 -0000	1.2
  @@ -5,9 +5,7 @@
   ////////////////////////////////////////////////////////////////////////////////////
   
   #include "SOAPStruct.h"
  -#include <axis/common/IWrapperSoapDeSerializer.h>
  -#include <axis/common/IWrapperSoapSerializer.h>
  -#include <axis/common/IParam.h>
  +#include <axis/common/AxisWrapperAPI.h>
   
   /////////////////////////////////////////////////////////////////////////////
   // This static method serialize a SOAPStruct type of object
  
  
  
  1.3       +3 -4      ws-axis/c/src/client/samples/interoptests/groupB/SOAPStructStruct.cpp
  
  Index: SOAPStructStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/groupB/SOAPStructStruct.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPStructStruct.cpp	24 Oct 2003 08:29:19 -0000	1.2
  +++ SOAPStructStruct.cpp	26 Oct 2003 07:28:43 -0000	1.3
  @@ -5,9 +5,7 @@
   ////////////////////////////////////////////////////////////////////////////////////
   
   #include "SOAPStructStruct.h"
  -#include <axis/common/IWrapperSoapDeSerializer.h>
  -#include <axis/common/IWrapperSoapSerializer.h>
  -#include <axis/common/IParam.h>
  +#include <axis/common/AxisWrapperAPI.h>
   
   extern int Axis_DeSerialize_SOAPStruct(SOAPStruct* param, IWrapperSoapDeSerializer *pDZ);
   extern void* Axis_Create_SOAPStruct(bool bArray = false, int nSize=0);
  @@ -49,7 +47,8 @@
   	param->varString = pIWSDZ->GetString();
   	param->varInt = pIWSDZ->GetInt();
   	param->varFloat = pIWSDZ->GetFloat();
  -	param->varStruct = (SOAPStruct*)pIWSDZ->GetObject((void*) (AXIS_DESERIALIZE_FUNCT)
Axis_DeSerialize_SOAPStruct, (void*) (AXIS_OBJECT_CREATE_FUNCT) Axis_Create_SOAPStruct, (void*)
(AXIS_OBJECT_DELETE_FUNCT) Axis_Delete_SOAPStruct
  +	param->varStruct = (SOAPStruct*)pIWSDZ->GetObject((void*)Axis_DeSerialize_SOAPStruct
  +		, (void*)Axis_Create_SOAPStruct, (void*)Axis_Delete_SOAPStruct
   		, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
   	return SUCCESS;
   }
  
  
  
  1.29      +5 -2      ws-axis/c/src/engine/Axis.cpp
  
  Index: Axis.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/Axis.cpp,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Axis.cpp	25 Oct 2003 08:39:37 -0000	1.28
  +++ Axis.cpp	26 Oct 2003 07:28:43 -0000	1.29
  @@ -252,8 +252,11 @@
   	URIMapping::Initialize();
   	SoapFault::initialize();
   	ModuleInitialize();
  -    char* pWsddPath = g_pConfig->GetWsddFilePath();
  -	if (SUCCESS != g_pWSDDDeployment->LoadWSDD(pWsddPath)) return FAIL;
  +	if (bServer) //no client side wsdd processing at the moment
  +	{
  +		char* pWsddPath = g_pConfig->GetWsddFilePath();
  +		if (SUCCESS != g_pWSDDDeployment->LoadWSDD(pWsddPath)) return FAIL;
  +	}
   	return SUCCESS;
   }
   
  
  
  
  1.15      +3 -5      ws-axis/c/src/server/handlers/custom/loghandler/LogHandler.cpp
  
  Index: LogHandler.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/loghandler/LogHandler.cpp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- LogHandler.cpp	24 Oct 2003 08:29:19 -0000	1.14
  +++ LogHandler.cpp	26 Oct 2003 07:28:43 -0000	1.15
  @@ -60,8 +60,6 @@
    */
   
   #include "LogHandler.h"
  -#include <axis/soap/SoapDeSerializer.h>
  -#include <axis/soap/SoapSerializer.h>
   //#include <axis/common/AxisTrace.h>
   #include <axis/common/AxisException.h>
   #include <time.h>
  @@ -96,7 +94,7 @@
       if(!sFileName.empty())
       {
           //AXISTRACE1("file name not empty");
  -        if ((fileLogCount = fopen(sFileName.c_str(), "rt")) == NULL)
  +        if ((fileLogCount = fopen(sFileName.c_str(), "at")) == NULL)
               return FAIL;
           int nLineCount = 0;
           //AXISTRACE1("file opened for read");
  @@ -119,7 +117,7 @@
               fputs("time : ", fileLogCount);
               fputs(ctime(&ltime), fileLogCount);
               fputs(": service ", fileLogCount);
  -            fputs(md->GetService()->GetServiceName(), fileLogCount);
  +            fputs("Service ", fileLogCount);
               //AXISTRACE1("came here2");
               fputs(" is accessed ", fileLogCount);
               sprintf(printcount,"%d", nLineCount);
  @@ -148,7 +146,7 @@
   
   const string& LogHandler::GetOption(const string& sArg)
   {
  -	map<string, string>::const_iterator it = m_pOption->find(sArg);
  +	map<string, string>::const_iterator it = m_pOption->find(sArg.c_str());
   	if (it != m_pOption->end())
   	{
   		return (*it).second;
  
  
  
  1.8       +0 -2      ws-axis/c/src/server/handlers/custom/loghandler/LogHandler.h
  
  Index: LogHandler.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/loghandler/LogHandler.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LogHandler.h	20 Oct 2003 06:40:24 -0000	1.7
  +++ LogHandler.h	26 Oct 2003 07:28:43 -0000	1.8
  @@ -60,8 +60,6 @@
    */
   
   #include <axis/common/IMessageData.h>
  -#include <axis/wsdd/WSDDHandler.h>
  -#include <axis/wsdd/WSDDService.h>
   #include <axis/common/Handler.h>
   
   #include <list>
  
  
  
  1.7       +0 -2      ws-axis/c/src/server/handlers/transport/testhandler2/TestTransport.h
  
  Index: TestTransport.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/handlers/transport/testhandler2/TestTransport.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TestTransport.h	20 Oct 2003 06:40:24 -0000	1.6
  +++ TestTransport.h	26 Oct 2003 07:28:43 -0000	1.7
  @@ -59,8 +59,6 @@
    *
    */
   #include <axis/common/IMessageData.h>
  -#include <axis/wsdd/WSDDHandler.h>
  -#include <axis/wsdd/WSDDService.h>
   #include <axis/common/Handler.h>
   
   #include <list>
  
  
  
  1.3       +20 -8     ws-axis/c/src/server/samples/interoptests/base/InteropTestPortTypeWrapper.cpp
  
  Index: InteropTestPortTypeWrapper.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/base/InteropTestPortTypeWrapper.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InteropTestPortTypeWrapper.cpp	24 Oct 2003 08:29:19 -0000	1.2
  +++ InteropTestPortTypeWrapper.cpp	26 Oct 2003 07:28:44 -0000	1.3
  @@ -111,7 +111,11 @@
   	mc->getSoapDeSerializer(&pIWSDZ);
   	if (!pIWSDZ) return FAIL;
   	pIWSSZ->createSoapMethod("echoStringArrayResponse", pIWSSZ->getNewNamespacePrefix(),
"http://soapinterop.org/");
  -	ArrayOfstring v0 = (ArrayOfstring&)pIWSDZ->GetArray(XSD_STRING);
  +	ArrayOfstring v0;
  +	v0.m_Size = pIWSDZ->GetArraySize();
  +	if (v0.m_Size < 1) return FAIL;
  +	v0.m_Array = new string[v0.m_Size];
  +	if (SUCCESS != pIWSDZ->GetArray((Axis_Array*)(&v0), XSD_STRING)) return FAIL;
   	ArrayOfstring ret = pWs->echoStringArray(v0);
   	return pIWSSZ->AddOutputParam("echoStringArrayReturn", (Axis_Array*)(&ret),XSD_STRING);
   }
  @@ -147,7 +151,11 @@
   	mc->getSoapDeSerializer(&pIWSDZ);
   	if (!pIWSDZ) return FAIL;
   	pIWSSZ->createSoapMethod("echoIntegerArrayResponse", pIWSSZ->getNewNamespacePrefix(),
"http://soapinterop.org/");
  -	ArrayOfint v0 = (ArrayOfint&)pIWSDZ->GetArray(XSD_INT);
  +	ArrayOfint v0;
  +	v0.m_Size = pIWSDZ->GetArraySize();
  +	if (v0.m_Size < 1) return FAIL;
  +	v0.m_Array = new int[v0.m_Size];
  +	if (SUCCESS != pIWSDZ->GetArray((Axis_Array*)(&v0), XSD_INT)) return FAIL;
   	ArrayOfint ret = pWs->echoIntegerArray(v0);
   	return pIWSSZ->AddOutputParam("echoIntegerArrayReturn", (Axis_Array*)(&ret),XSD_INT);
   }
  @@ -183,7 +191,11 @@
   	mc->getSoapDeSerializer(&pIWSDZ);
   	if (!pIWSDZ) return FAIL;
   	pIWSSZ->createSoapMethod("echoFloatArrayResponse", pIWSSZ->getNewNamespacePrefix(),
"http://soapinterop.org/");
  -	ArrayOffloat v0 = (ArrayOffloat&)pIWSDZ->GetArray(XSD_FLOAT);
  +	ArrayOffloat v0;
  +	v0.m_Size = pIWSDZ->GetArraySize();
  +	if (v0.m_Size < 1) return FAIL;
  +	v0.m_Array = new float[v0.m_Size];
  +	if (SUCCESS != pIWSDZ->GetArray((Axis_Array*)(&v0), XSD_FLOAT)) return FAIL;
   	ArrayOffloat ret = pWs->echoFloatArray(v0);
   	return pIWSSZ->AddOutputParam("echoFloatArrayReturn", (Axis_Array*)(&ret),XSD_FLOAT);
   }
  @@ -201,8 +213,8 @@
   	mc->getSoapDeSerializer(&pIWSDZ);
   	if (!pIWSDZ) return FAIL;
   	pIWSSZ->createSoapMethod("echoStructResponse", pIWSSZ->getNewNamespacePrefix(),
"http://soapinterop.org/");
  -	SOAPStruct *v0 = (SOAPStruct*)pIWSDZ->GetObject((void*) (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_SOAPStruct
  -		,(void*) (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_SOAPStruct, (void*) (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_SOAPStruct
  +	SOAPStruct *v0 = (SOAPStruct*)pIWSDZ->GetObject((void*)Axis_DeSerialize_SOAPStruct
  +		, (void*)Axis_Create_SOAPStruct, (void*)Axis_Delete_SOAPStruct
   		, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
   	SOAPStruct *ret = pWs->echoStruct(v0);
   	return pIWSSZ->AddOutputParam("echoStructReturn", ret, (void*)Axis_Serialize_SOAPStruct,
(void*)Axis_Delete_SOAPStruct);
  @@ -221,9 +233,9 @@
   	mc->getSoapDeSerializer(&pIWSDZ);
   	if (!pIWSDZ) return FAIL;
   	pIWSSZ->createSoapMethod("echoStructArrayResponse", pIWSSZ->getNewNamespacePrefix(),
"http://soapinterop.org/");
  -	ArrayOfSOAPStruct v0 = (ArrayOfSOAPStruct&)pIWSDZ->GetArray((void*) (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_SOAPStruct
  -		,(void*) (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_SOAPStruct,(void*) (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_SOAPStruct
  -		,(void*) (AXIS_OBJECT_SIZE_FUNCT)Axis_GetSize_SOAPStruct, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
  +	ArrayOfSOAPStruct v0 = (ArrayOfSOAPStruct&)pIWSDZ->GetArray((void*)Axis_DeSerialize_SOAPStruct
  +		, (void*)Axis_Create_SOAPStruct, (void*)Axis_Delete_SOAPStruct
  +		, (void*)Axis_GetSize_SOAPStruct, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
   	ArrayOfSOAPStruct ret = pWs->echoStructArray(v0);
   	return pIWSSZ->AddOutputParam("echoStructArrayReturn", (Axis_Array*)(&ret),(void*)
Axis_Serialize_SOAPStruct, (void*) Axis_Delete_SOAPStruct, (void*) Axis_GetSize_SOAPStruct,
Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
   }
  
  
  
  1.2       +1 -3      ws-axis/c/src/server/samples/interoptests/base/SOAPStruct.cpp
  
  Index: SOAPStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/base/SOAPStruct.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SOAPStruct.cpp	21 Oct 2003 15:09:04 -0000	1.1
  +++ SOAPStruct.cpp	26 Oct 2003 07:28:44 -0000	1.2
  @@ -5,9 +5,7 @@
   ////////////////////////////////////////////////////////////////////////////////////
   
   #include "SOAPStruct.h"
  -#include <axis/common/IWrapperSoapDeSerializer.h>
  -#include <axis/common/IWrapperSoapSerializer.h>
  -#include <axis/common/IParam.h>
  +#include <axis/common/AxisWrapperAPI.h>
   
   /////////////////////////////////////////////////////////////////////////////
   // This static method serialize a SOAPStruct type of object
  
  
  
  1.4       +6 -6      ws-axis/c/src/server/samples/interoptests/groupB/InteropTestPortTypeBWrapper.cpp
  
  Index: InteropTestPortTypeBWrapper.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/groupB/InteropTestPortTypeBWrapper.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InteropTestPortTypeBWrapper.cpp	24 Oct 2003 09:13:08 -0000	1.3
  +++ InteropTestPortTypeBWrapper.cpp	26 Oct 2003 07:28:44 -0000	1.4
  @@ -87,8 +87,8 @@
   	mc->getSoapDeSerializer(&pIWSDZ);
   	if (!pIWSDZ) return FAIL;
   	pIWSSZ->createSoapMethod("echoStructAsSimpleTypesResponse", pIWSSZ->getNewNamespacePrefix(),
"http://soapinterop.org/");
  -	SOAPStruct *v0 = (SOAPStruct*)pIWSDZ->GetObject((void*) (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_SOAPStruct
  -		, (void*) (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_SOAPStruct, (void*) (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_SOAPStruct
  +	SOAPStruct *v0 = (SOAPStruct*)pIWSDZ->GetObject((void*)Axis_DeSerialize_SOAPStruct
  +		, (void*)Axis_Create_SOAPStruct, (void*)Axis_Delete_SOAPStruct
   		, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
   	string outValue0;
   	int outValue1;
  @@ -154,8 +154,8 @@
   	mc->getSoapDeSerializer(&pIWSDZ);
   	if (!pIWSDZ) return FAIL;
   	pIWSSZ->createSoapMethod("echoNestedStructResponse", pIWSSZ->getNewNamespacePrefix(),
"http://soapinterop.org/");
  -	SOAPStructStruct *v0 = (SOAPStructStruct*)pIWSDZ->GetObject( (void*) (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_SOAPStructStruct
  -		, (void*) (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_SOAPStructStruct, (void*) (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_SOAPStructStruct
  +	SOAPStructStruct *v0 = (SOAPStructStruct*)pIWSDZ->GetObject((void*)Axis_DeSerialize_SOAPStructStruct
  +		, (void*)Axis_Create_SOAPStructStruct, (void*)Axis_Delete_SOAPStructStruct
   		, Axis_TypeName_SOAPStructStruct, Axis_URI_SOAPStructStruct);
   	SOAPStructStruct *ret = pWs->echoNestedStruct(v0);
   	return pIWSSZ->AddOutputParam("echoNestedStructReturn", ret, (void*)Axis_Serialize_SOAPStructStruct,
(void*)Axis_Delete_SOAPStructStruct);
  @@ -174,8 +174,8 @@
   	mc->getSoapDeSerializer(&pIWSDZ);
   	if (!pIWSDZ) return FAIL;
   	pIWSSZ->createSoapMethod("echoNestedArrayResponse", pIWSSZ->getNewNamespacePrefix(),
"http://soapinterop.org/");
  -	SOAPArrayStruct *v0 = (SOAPArrayStruct*)pIWSDZ->GetObject((void*) (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_SOAPArrayStruct
  -		, (void*) (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_SOAPArrayStruct, (void*) (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_SOAPArrayStruct
  +	SOAPArrayStruct *v0 = (SOAPArrayStruct*)pIWSDZ->GetObject((void*)Axis_DeSerialize_SOAPArrayStruct
  +		, (void*)Axis_Create_SOAPArrayStruct, (void*)Axis_Delete_SOAPArrayStruct
   		, Axis_TypeName_SOAPArrayStruct, Axis_URI_SOAPArrayStruct);
   	SOAPArrayStruct *ret = pWs->echoNestedArray(v0);
   	return pIWSSZ->AddOutputParam("echoNestedArrayReturn", ret, (void*)Axis_Serialize_SOAPArrayStruct,
(void*)Axis_Delete_SOAPArrayStruct);
  
  
  
  1.2       +1 -3      ws-axis/c/src/server/samples/interoptests/groupB/SOAPArrayStruct.cpp
  
  Index: SOAPArrayStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/groupB/SOAPArrayStruct.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SOAPArrayStruct.cpp	21 Oct 2003 15:09:04 -0000	1.1
  +++ SOAPArrayStruct.cpp	26 Oct 2003 07:28:44 -0000	1.2
  @@ -5,9 +5,7 @@
   ////////////////////////////////////////////////////////////////////////////////////
   
   #include "SOAPArrayStruct.h"
  -#include <axis/common/IWrapperSoapDeSerializer.h>
  -#include <axis/common/IWrapperSoapSerializer.h>
  -#include <axis/common/IParam.h>
  +#include <axis/common/AxisWrapperAPI.h>
   
   /////////////////////////////////////////////////////////////////////////////
   // This static method serialize a SOAPArrayStruct type of object
  
  
  
  1.2       +1 -3      ws-axis/c/src/server/samples/interoptests/groupB/SOAPStruct.cpp
  
  Index: SOAPStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/groupB/SOAPStruct.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SOAPStruct.cpp	21 Oct 2003 15:09:05 -0000	1.1
  +++ SOAPStruct.cpp	26 Oct 2003 07:28:44 -0000	1.2
  @@ -5,9 +5,7 @@
   ////////////////////////////////////////////////////////////////////////////////////
   
   #include "SOAPStruct.h"
  -#include <axis/common/IWrapperSoapDeSerializer.h>
  -#include <axis/common/IWrapperSoapSerializer.h>
  -#include <axis/common/IParam.h>
  +#include <axis/common/AxisWrapperAPI.h>
   
   /////////////////////////////////////////////////////////////////////////////
   // This static method serialize a SOAPStruct type of object
  
  
  
  1.3       +3 -5      ws-axis/c/src/server/samples/interoptests/groupB/SOAPStructStruct.cpp
  
  Index: SOAPStructStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/groupB/SOAPStructStruct.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPStructStruct.cpp	24 Oct 2003 09:13:08 -0000	1.2
  +++ SOAPStructStruct.cpp	26 Oct 2003 07:28:44 -0000	1.3
  @@ -5,9 +5,7 @@
   ////////////////////////////////////////////////////////////////////////////////////
   
   #include "SOAPStructStruct.h"
  -#include <axis/common/IWrapperSoapDeSerializer.h>
  -#include <axis/common/IWrapperSoapSerializer.h>
  -#include <axis/common/IParam.h>
  +#include <axis/common/AxisWrapperAPI.h>
   
   extern int Axis_DeSerialize_SOAPStruct(SOAPStruct* param, IWrapperSoapDeSerializer *pDZ);
   extern void* Axis_Create_SOAPStruct(bool bArray = false, int nSize=0);
  @@ -49,8 +47,8 @@
   	param->varString = pIWSDZ->GetString();
   	param->varInt = pIWSDZ->GetInt();
   	param->varFloat = pIWSDZ->GetFloat();
  -	param->varStruct = (SOAPStruct*)pIWSDZ->GetObject((void*) (AXIS_DESERIALIZE_FUNCT)Axis_DeSerialize_SOAPStruct
  -		, (void*) (AXIS_OBJECT_CREATE_FUNCT)Axis_Create_SOAPStruct, (void*) (AXIS_OBJECT_DELETE_FUNCT)Axis_Delete_SOAPStruct
  +	param->varStruct = (SOAPStruct*)pIWSDZ->GetObject((void*)Axis_DeSerialize_SOAPStruct
  +		, (void*)Axis_Create_SOAPStruct, (void*)Axis_Delete_SOAPStruct
   		, Axis_TypeName_SOAPStruct, Axis_URI_SOAPStruct);
   	return SUCCESS;
   }
  
  
  
  1.2       +1 -1      ws-axis/c/src/server/web_services/cpp_deployment/CPP_Deployment.h
  
  Index: CPP_Deployment.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/web_services/cpp_deployment/CPP_Deployment.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CPP_Deployment.h	11 Oct 2003 06:12:16 -0000	1.1
  +++ CPP_Deployment.h	26 Oct 2003 07:28:44 -0000	1.2
  @@ -72,7 +72,7 @@
   #pragma once
   #endif // _MSC_VER > 1000
   
  -#include <common/GDefine.h>
  +#include <axis/common/GDefine.h>
   #include <string>
   #include <list>
   
  
  
  
  1.18      +13 -0     ws-axis/c/src/wsdd/WSDDDeployment.cpp
  
  Index: WSDDDeployment.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDeployment.cpp,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- WSDDDeployment.cpp	25 Oct 2003 05:08:05 -0000	1.17
  +++ WSDDDeployment.cpp	26 Oct 2003 07:28:44 -0000	1.18
  @@ -84,6 +84,7 @@
   	m_pTransportHandlers = NULL;
   	m_GlobalResponseHandlers = NULL;
   	m_GlobalRequestHandlers = NULL;
  +	m_DeplType = DT_DEPLOYMENT;
   }
   
   WSDDDeployment::~WSDDDeployment()
  @@ -537,3 +538,15 @@
   
   	return SUCCESS;
   }
  +
  +DEPLOYMENTTYPE WSDDDeployment::GetDeploymentType() const
  +{
  +	return m_DeplType;
  +}
  +
  +void WSDDDeployment::SetDeploymentType(DEPLOYMENTTYPE nType)
  +{
  +	m_DeplType = nType;
  +}
  +
  +
  
  
  
  1.23      +18 -2     ws-axis/c/src/wsdd/WSDDDocument.cpp
  
  Index: WSDDDocument.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDocument.cpp,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- WSDDDocument.cpp	25 Oct 2003 08:39:37 -0000	1.22
  +++ WSDDDocument.cpp	26 Oct 2003 07:28:44 -0000	1.23
  @@ -409,10 +409,15 @@
   		switch(m_lev0)
   		{
   		case WSDD_UNKNOWN:
  -			if((XMLString::equals(lname, kw_depl)) || (XMLString::equals(lname, kw_undepl)))
  +			if(XMLString::equals(lname, kw_depl))
   			{  
   				m_lev0 = WSDD_DEPLOYMENT;
  -				//nothing to get
  +				m_pDeployment->SetDeploymentType(DT_DEPLOYMENT);
  +			}
  +			else if(XMLString::equals(lname, kw_undepl))
  +			{  
  +				m_lev0 = WSDD_DEPLOYMENT;
  +				m_pDeployment->SetDeploymentType(DT_UNDEPLOYMENT);
   			}
   			break;
   		case WSDD_DEPLOYMENT:
  @@ -556,3 +561,14 @@
   	else 
   		return ""; 
   }
  +
  +void WSDDDocument::warning(const SAXParseException& exception)
  +{
  +}
  +void WSDDDocument::error(const SAXParseException& exception)
  +{
  +}
  +void WSDDDocument::fatalError(const SAXParseException& exception)
  +{
  +}
  +
  
  
  

Mime
View raw message