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/apache2_0 Apache2_0Module.dsp
Date Mon, 29 Mar 2004 04:20:32 GMT
susantha    2004/03/28 20:20:32

  Modified:    c/include/axis/server AxisUserAPI.h
               c/samples/client/interoptests/base InteropBaseClient.cpp
                        InteropTestPortType.cpp
               c/samples/client/interoptests/cbase InteropBaseClient.c
                        InteropTestPortType.c
               c/samples/client/interoptests/doclitbase
                        InteropBaseClient.cpp SOAPStruct.cpp
               c/samples/client/interoptests/doclitgroupB
                        SOAPArrayStruct.cpp SOAPStruct.cpp
                        SOAPStructStruct.cpp
               c/samples/client/interoptests/groupB
                        InteropTestPortTypeB.cpp
               c/samples/server/interoptests/doclitbase SOAPStruct.cpp
               c/samples/server/interoptests/doclitgroupB
                        SOAPArrayStruct.cpp SOAPStruct.cpp
                        SOAPStructStruct.cpp
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws
                        DeploymentWriter.java UndeploymentWriter.java
                        WSDL2Ws.java WrapperConstants.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c
                        ArrayParamWriter.java ClientStubHeaderWriter.java
                        ClientStubWriter.java ParamCFileWriter.java
                        ParmHeaderFileWriter.java ServiceWriter.java
                        WrapHeaderWriter.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal
                        ClientStubWriter.java ServiceWriter.java
                        WrapHeaderWriter.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
                        ArrayParamWriter.java ClientStubWriter.java
                        ParamCPPFileWriter.java ParmHeaderFileWriter.java
                        ServiceHeaderWriter.java WrapHeaderWriter.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
                        ClientStubWriter.java ParamCPPFileWriter.java
                        ServiceHeaderWriter.java WrapHeaderWriter.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info TypeMap.java
                        WrapperInfo.java
               c/vc/common CommonLibrary.dsp
               c/vc/samples/client/interoptests/base base.dsp
               c/vc/samples/client/interoptests/cbase cbase.dsp
               c/vc/samples/client/interoptests/cgroupB cgroupB.dsp
               c/vc/samples/client/interoptests/doclitbase doclitbase.dsp
               c/vc/samples/client/interoptests/doclitgroupB
                        doclitgroupB.dsp
               c/vc/samples/client/interoptests/groupB groupB.dsp
               c/vc/samples/client/interoptests/groupC groupC.dsp
               c/vc/server/apache1_3 Apache1_3Module.dsp
               c/vc/server/apache2_0 Apache2_0Module.dsp
  Log:
  Corrected all interop samples to work correctly
  Modified vc project files for interop samples
  Improved WSDL2Ws tool to accept an additional command line option to specifity channel security type (ssl etc)
  
  Revision  Changes    Path
  1.8       +5 -0      ws-axis/c/include/axis/server/AxisUserAPI.h
  
  Index: AxisUserAPI.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisUserAPI.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AxisUserAPI.h	19 Mar 2004 14:05:28 -0000	1.7
  +++ AxisUserAPI.h	29 Mar 2004 04:20:30 -0000	1.8
  @@ -133,4 +133,9 @@
   static const int xsd_boolean_true = 1;
   static const int xsd_boolean_false = 0;
   
  +typedef enum {
  +	NORMAL_CHANNEL=0,
  +	SSL_CHANNEL
  +} AXIS_CHANNEL_TYPE;
  +
   #endif /* !defined(AFX_AXISUSERAPI_H__6E27008D_DCA0_4F28_AC82_FEEBE1A1CBBB__INCLUDED_) */
  
  
  
  1.5       +6 -5      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- InteropBaseClient.cpp	8 Mar 2004 05:43:46 -0000	1.4
  +++ InteropBaseClient.cpp	29 Mar 2004 04:20:30 -0000	1.5
  @@ -11,14 +11,14 @@
   {
   	int x;
   	char buffer1[100];
  -	char buffer2[100];
  +//	char buffer2[100];
   
   	InteropTestPortType ws;
   
   	printf("invoking echoString...\n");
   	//testing echoString 
   	string bigstring;
  -	for (int ii=0;ii<200;ii++)
  +	for (int ii=0;ii<2;ii++)
   	{
   		bigstring += "hello world ";
   	}
  @@ -64,7 +64,8 @@
   		printf("failed\n");
   	// testing echoFloat 
   	printf("invoking echoFloat...\n");
  -	if (ws.echoFloat(1.4214) > 1.42)
  +	float fvalue = 1.4214;
  +	if (ws.echoFloat(fvalue) > 1.42)
   		printf("successful\n");
   	else
   		printf("failed\n");
  @@ -82,7 +83,7 @@
   	else
   		printf("failed\n");
   	// testing echo Struct
  -/*	SOAPStruct stct;
  +	SOAPStruct stct;
   	stct.varFloat = 12345.7346345;
   	stct.varInt = 5000;
   	stct.varString = strdup("This is string in SOAPStruct");
  @@ -113,7 +114,7 @@
   	ws.echoVoid();
   	printf("successful\n");
   	//testing echo base 64 binary
  -*/
  +
   /*	printf("invoking echoBase64...\n");
   	if (0 == strcmp(ws.echoBase64("BCDF675E234242WHRTKMJDGKGUEJ898636JFJFHEJDGWTDHFJRURYGBCDHTWRSG"),
   		"BCDF675E234242WHRTKMJDGKGUEJ898636JFJFHEJDGWTDHFJRURYGBCDHTWRSG"))
  
  
  
  1.8       +1 -1      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- InteropTestPortType.cpp	27 Mar 2004 09:13:03 -0000	1.7
  +++ InteropTestPortType.cpp	29 Mar 2004 04:20:30 -0000	1.8
  @@ -21,7 +21,7 @@
   {
   	m_pCall = new Call();
   	m_pCall->SetProtocol(APTHTTP);
  -	m_pCall->SetEndpointURI("http://localhost/axis/InteropBase");
  +	m_pCall->SetEndpointURI("http://localhost:5555/axis/InteropBase");
   }
   
   InteropTestPortType::~InteropTestPortType()
  
  
  
  1.6       +10 -13    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InteropBaseClient.c	10 Feb 2004 15:04:21 -0000	1.5
  +++ InteropBaseClient.c	29 Mar 2004 04:20:30 -0000	1.6
  @@ -86,7 +86,7 @@
   	else
   		printf("failed\n");
   	/*testing echo Array of Struct*/
  -/*	arrstct.m_Array = malloc(sizeof(SOAPStruct)*ARRAYSIZE);
  +	arrstct.m_Array = malloc(sizeof(SOAPStruct)*ARRAYSIZE);
   	arrstct.m_Size = ARRAYSIZE;
   	for (x=0;x<ARRAYSIZE;x++)
   	{
  @@ -95,20 +95,19 @@
   		sprintf(buffer1, "varString of %dth element of SOAPStruct array", x);
   		arrstct.m_Array[x].varString = buffer1;
   	}
  -*/	
  +	
   	/*testing echo Struct Array*/
  -/*	printf("invoking echoStructArray...\n");
  +	printf("invoking echoStructArray...\n");
   	if (echoStructArray(pstub, arrstct).m_Array != NULL)
   		printf("successful\n");
   	else
  -		printf("failed\n");
  -*/		
  +		printf("failed\n");		
   	/*testing echo void*/
  -/*	
  +	
   	printf("invoking echoVoid...\n");
   	echoVoid(pstub);
   	printf("successful\n");
  -*/	
  +	
   	/*testing echo base 64 binary*/
   /*	printf("invoking echoBase64...\n");
   	if (0 == strcmp(ws.echoBase64(pstub, "BCDF675E234242WHRTKMJDGKGUEJ898636JFJFHEJDGWTDHFJRURYGBCDHTWRSG"),
  @@ -131,21 +130,19 @@
   	else
   		printf("failed\n");
   */	/*testing echo decimal*/
  -/*	printf("invoking echoDecimal...\n");
  +	printf("invoking echoDecimal...\n");
   	if (echoDecimal(pstub, 1234.567890) > 1234.56)
   		printf("successful\n");
   	else
   		printf("failed\n");
  -*/		
  +		
   	/*testing echo boolean*/
  -/*	printf("invoking echoBoolean...\n");
  +	printf("invoking echoBoolean...\n");
   	if (echoBoolean(pstub, true_) == true_)
   		printf("successful\n");
   	else
   		printf("failed\n");
   		
  -	getchar();
  -	return 0;
  -*/	
  +	getchar();	
   	destroy_InteropTestPortType_stub(pstub);
   }
  
  
  
  1.10      +1 -1      ws-axis/c/samples/client/interoptests/cbase/InteropTestPortType.c
  
  Index: InteropTestPortType.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cbase/InteropTestPortType.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- InteropTestPortType.c	27 Mar 2004 09:13:04 -0000	1.9
  +++ InteropTestPortType.c	29 Mar 2004 04:20:30 -0000	1.10
  @@ -13,7 +13,7 @@
   extern int Axis_GetSize_SOAPStruct();
   
   void* get_InteropTestPortType_stub(){
  -	return GetStubObject(APTHTTP, "http://localhost/axis/InteropBase");
  +	return GetStubObject(APTHTTP, "http://localhost:5555/axis/InteropBase");
   }
   void destroy_InteropTestPortType_stub(void* p){
   	DestroyStubObject(p);
  
  
  
  1.3       +7 -7      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InteropBaseClient.cpp	3 Feb 2004 14:33:27 -0000	1.2
  +++ InteropBaseClient.cpp	29 Mar 2004 04:20:31 -0000	1.3
  @@ -3,13 +3,13 @@
   
   #include "InteropTestPortType.h" 
   
  -#define ARRAYSIZE 2000
  -#define LOOPFOR 100
  +#define ARRAYSIZE 2
  +#define LOOPFOR 2
   
   int main(int argc, char* argv[])
   {
   	int x;
  -	char buffer1[100];
  +	char buffer1[1000];
   	
   	InteropTestPortType ws;
   	printf("invoking echoString...\n");
  @@ -19,7 +19,7 @@
   	else
   		printf("failed\n");
   	// testing echoStringArray 
  -/*	ArrayOfstring arrstr;
  +	ArrayOfstring arrstr;
   	arrstr.m_Array = new char*[ARRAYSIZE];
   	arrstr.m_Size = ARRAYSIZE;
   	for (x=0;x<ARRAYSIZE;x++)
  @@ -45,7 +45,7 @@
   			printf("failed\n");
   	}
   	printf("Done\n");
  -*/	// testing echoInteger 
  +	// testing echoInteger 
   	printf("invoking echoInteger...\n");
   	if (ws.echoInteger(56) == 56)
   		printf("successful\n");
  @@ -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");
  
  
  
  1.3       +4 -2      ws-axis/c/samples/client/interoptests/doclitbase/SOAPStruct.cpp
  
  Index: SOAPStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/doclitbase/SOAPStruct.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPStruct.cpp	27 Mar 2004 09:13:04 -0000	1.2
  +++ SOAPStruct.cpp	29 Mar 2004 04:20:31 -0000	1.3
  @@ -12,6 +12,9 @@
   //////////////////////////////////////////////////////////////////////
   int Axis_Serialize_SOAPStruct(SOAPStruct* param, IWrapperSoapSerializer* pSZ, bool bArray = false)
   {
  +	/* first serialize attributes if any*/
  +	pSZ->Serialize(">", 0);
  +	/* then serialize elements if any*/
   	pSZ->SerializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
   	pSZ->SerializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
   	pSZ->SerializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
  @@ -26,11 +29,10 @@
   	param->varString = pIWSDZ->GetElementAsString("varString",0);
   	param->varInt = pIWSDZ->GetElementAsInt("varInt",0);
   	param->varFloat = pIWSDZ->GetElementAsFloat("varFloat",0);
  -	return AXIS_SUCCESS;
  +	return pIWSDZ->GetStatus();
   }
   void* Axis_Create_SOAPStruct(void* pObj, bool bArray = false, int nSize=0)
   {
  -
   	if (bArray && (nSize > 0))
   	{
   		if (pObj)
  
  
  
  1.3       +3 -0      ws-axis/c/samples/client/interoptests/doclitgroupB/SOAPArrayStruct.cpp
  
  Index: SOAPArrayStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/doclitgroupB/SOAPArrayStruct.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPArrayStruct.cpp	27 Mar 2004 09:13:04 -0000	1.2
  +++ SOAPArrayStruct.cpp	29 Mar 2004 04:20:31 -0000	1.3
  @@ -12,6 +12,9 @@
   //////////////////////////////////////////////////////////////////////
   int Axis_Serialize_SOAPArrayStruct(SOAPArrayStruct* param, IWrapperSoapSerializer* pSZ, bool bArray = false)
   {
  +	/* first serialize attributes if any*/
  +	pSZ->Serialize(">", 0);
  +	/* then serialize elements if any*/
   	pSZ->SerializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
   	pSZ->SerializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
   	pSZ->SerializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
  
  
  
  1.3       +3 -0      ws-axis/c/samples/client/interoptests/doclitgroupB/SOAPStruct.cpp
  
  Index: SOAPStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/doclitgroupB/SOAPStruct.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPStruct.cpp	27 Mar 2004 09:13:04 -0000	1.2
  +++ SOAPStruct.cpp	29 Mar 2004 04:20:31 -0000	1.3
  @@ -12,6 +12,9 @@
   //////////////////////////////////////////////////////////////////////
   int Axis_Serialize_SOAPStruct(SOAPStruct* param, IWrapperSoapSerializer* pSZ, bool bArray = false)
   {
  +	/* first serialize attributes if any*/
  +	pSZ->Serialize(">", 0);
  +	/* then serialize elements if any*/
   	pSZ->SerializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
   	pSZ->SerializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
   	pSZ->SerializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
  
  
  
  1.3       +3 -0      ws-axis/c/samples/client/interoptests/doclitgroupB/SOAPStructStruct.cpp
  
  Index: SOAPStructStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/doclitgroupB/SOAPStructStruct.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPStructStruct.cpp	27 Mar 2004 09:13:04 -0000	1.2
  +++ SOAPStructStruct.cpp	29 Mar 2004 04:20:31 -0000	1.3
  @@ -18,6 +18,9 @@
   //////////////////////////////////////////////////////////////////////
   int Axis_Serialize_SOAPStructStruct(SOAPStructStruct* param, IWrapperSoapSerializer* pSZ, bool bArray = false)
   {
  +	/* first serialize attributes if any*/
  +	pSZ->Serialize(">", 0);
  +	/* then serialize elements if any*/
   	pSZ->SerializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
   	pSZ->SerializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
   	pSZ->SerializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
  
  
  
  1.5       +1 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- InteropTestPortTypeB.cpp	27 Mar 2004 09:13:04 -0000	1.4
  +++ InteropTestPortTypeB.cpp	29 Mar 2004 04:20:31 -0000	1.5
  @@ -33,7 +33,7 @@
   {
   	m_pCall = new Call();
   	m_pCall->SetProtocol(APTHTTP);
  -	m_pCall->SetEndpointURI("http://localhost/axis/InteropGroupB");
  +	m_pCall->SetEndpointURI("http://localhost:5555/axis/InteropGroupB");
   }
   
   InteropTestPortTypeB::~InteropTestPortTypeB()
  
  
  
  1.3       +4 -1      ws-axis/c/samples/server/interoptests/doclitbase/SOAPStruct.cpp
  
  Index: SOAPStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/doclitbase/SOAPStruct.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPStruct.cpp	27 Mar 2004 09:13:05 -0000	1.2
  +++ SOAPStruct.cpp	29 Mar 2004 04:20:31 -0000	1.3
  @@ -12,6 +12,9 @@
   //////////////////////////////////////////////////////////////////////
   int Axis_Serialize_SOAPStruct(SOAPStruct* param, IWrapperSoapSerializer* pSZ, bool bArray = false)
   {
  +	/* first serialize attributes if any*/
  +	pSZ->Serialize(">", 0);
  +	/* then serialize elements if any*/
   	pSZ->SerializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
   	pSZ->SerializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
   	pSZ->SerializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
  @@ -26,7 +29,7 @@
   	param->varString = pIWSDZ->GetElementAsString("varString",0);
   	param->varInt = pIWSDZ->GetElementAsInt("varInt",0);
   	param->varFloat = pIWSDZ->GetElementAsFloat("varFloat",0);
  -	return AXIS_SUCCESS;
  +	return pIWSDZ->GetStatus();
   }
   void* Axis_Create_SOAPStruct(void* pObj, bool bArray = false, int nSize=0)
   {
  
  
  
  1.3       +3 -0      ws-axis/c/samples/server/interoptests/doclitgroupB/SOAPArrayStruct.cpp
  
  Index: SOAPArrayStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/doclitgroupB/SOAPArrayStruct.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPArrayStruct.cpp	27 Mar 2004 09:13:05 -0000	1.2
  +++ SOAPArrayStruct.cpp	29 Mar 2004 04:20:31 -0000	1.3
  @@ -12,6 +12,9 @@
   //////////////////////////////////////////////////////////////////////
   int Axis_Serialize_SOAPArrayStruct(SOAPArrayStruct* param, IWrapperSoapSerializer* pSZ, bool bArray = false)
   {
  +	/* first serialize attributes if any*/
  +	pSZ->Serialize(">", 0);
  +	/* then serialize elements if any*/
   	pSZ->SerializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
   	pSZ->SerializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
   	pSZ->SerializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
  
  
  
  1.3       +3 -0      ws-axis/c/samples/server/interoptests/doclitgroupB/SOAPStruct.cpp
  
  Index: SOAPStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/doclitgroupB/SOAPStruct.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPStruct.cpp	27 Mar 2004 09:13:05 -0000	1.2
  +++ SOAPStruct.cpp	29 Mar 2004 04:20:31 -0000	1.3
  @@ -12,6 +12,9 @@
   //////////////////////////////////////////////////////////////////////
   int Axis_Serialize_SOAPStruct(SOAPStruct* param, IWrapperSoapSerializer* pSZ, bool bArray = false)
   {
  +	/* first serialize attributes if any*/
  +	pSZ->Serialize(">", 0);
  +	/* then serialize elements if any*/
   	pSZ->SerializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
   	pSZ->SerializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
   	pSZ->SerializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
  
  
  
  1.3       +3 -0      ws-axis/c/samples/server/interoptests/doclitgroupB/SOAPStructStruct.cpp
  
  Index: SOAPStructStruct.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/doclitgroupB/SOAPStructStruct.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPStructStruct.cpp	27 Mar 2004 09:13:05 -0000	1.2
  +++ SOAPStructStruct.cpp	29 Mar 2004 04:20:31 -0000	1.3
  @@ -18,6 +18,9 @@
   //////////////////////////////////////////////////////////////////////
   int Axis_Serialize_SOAPStructStruct(SOAPStructStruct* param, IWrapperSoapSerializer* pSZ, bool bArray = false)
   {
  +	/* first serialize attributes if any*/
  +	pSZ->Serialize(">", 0);
  +	/* then serialize elements if any*/
   	pSZ->SerializeAsElement("varString", (void*)&(param->varString), XSD_STRING);
   	pSZ->SerializeAsElement("varInt", (void*)&(param->varInt), XSD_INT);
   	pSZ->SerializeAsElement("varFloat", (void*)&(param->varFloat), XSD_FLOAT);
  
  
  
  1.2       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/DeploymentWriter.java
  
  Index: DeploymentWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/DeploymentWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DeploymentWriter.java	22 Mar 2004 10:56:53 -0000	1.1
  +++ DeploymentWriter.java	29 Mar 2004 04:20:31 -0000	1.2
  @@ -23,7 +23,7 @@
   		try {
   			BufferedWriter writer = new BufferedWriter(new FileWriter(getFilePath(this.wscontext, "deploy"), false));
   			writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
  -			writer.write("<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\""+
				" xmlns:"+this.providerLang+"=\"http://xml.apache.org/axis/wsdd/providers/"+this.providerLang+">\n");
  +			writer.write("<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\""+
				" xmlns:"+this.providerLang+"=\"http://xml.apache.org/axis/wsdd/providers/"+this.providerLang+"\">\n");
   			writer.write("\t<service name=\""+this.servicename+"\" provider=\""+this.providerLang+":"+this.providerStyle+"\" description=\""+this.description+"\">\n");
   			writer.write("\t\t<parameter name=\"className\" value=\"/user/local/apache/axis/"+this.servicename+".so\"/>\n");
   			writer.write("\t\t<parameter name=\"allowedMethods\" value=\"");
  
  
  
  1.2       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/UndeploymentWriter.java
  
  Index: UndeploymentWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/UndeploymentWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UndeploymentWriter.java	22 Mar 2004 10:56:53 -0000	1.1
  +++ UndeploymentWriter.java	29 Mar 2004 04:20:31 -0000	1.2
  @@ -23,7 +23,7 @@
   			BufferedWriter writer = new BufferedWriter(new FileWriter(getFilePath(this.wscontext, "undeploy"), false));
   			writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
   			writer.write("<undeployment xmlns=\"http://xml.apache.org/axis/wsdd/\""+
  -				" xmlns:"+this.providerLang+"=\"http://xml.apache.org/axis/wsdd/providers/"+this.providerLang+">\n");
  +				" xmlns:"+this.providerLang+"=\"http://xml.apache.org/axis/wsdd/providers/"+this.providerLang+"\">\n");
   			writer.write("\t<service name=\""+this.servicename+"\"/>\n");
   			writer.write("</undeployment>\n");
   			writer.flush();
  
  
  
  1.22      +8 -4      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java
  
  Index: WSDL2Ws.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- WSDL2Ws.java	17 Mar 2004 11:25:02 -0000	1.21
  +++ WSDL2Ws.java	29 Mar 2004 04:20:31 -0000	1.22
  @@ -366,7 +366,8 @@
           String targetoutputLocation,
           String targetLanguage,
           String targetImplementationStyle,
  -        String targetEngine)
  +        String targetEngine,
  +        String security)
           throws WrapperFault {
           	
   		this.language = targetLanguage;
  @@ -395,7 +396,8 @@
                           targetEngine,
                           transportURI,
                           targetEndpointURI,
  -                        targetNameSpaceOfWSDL),
  +                        targetNameSpaceOfWSDL,
  +                        security),
                       new ServiceInfo(servicename, qualifiedServiceName, methods),
                       typeMap));
           if (wsg == null)
  @@ -644,7 +646,8 @@
                   "java WSDL2Ws <wsdlfile> -<optionChar><value>\n"
                       + "-o target output folder - default is current folder\n"
                       + "-l target language(c|c++) - default is c++\n"
  -                    + "-s (client|server) - default is server\n");
  +                    + "-s target side(client|server) - default is server\n"
  +                    + "-c channel security(ssl|none) - default is none\n");
           else {
               WSDL2Ws gen = new WSDL2Ws(data);
               gen.genarateWrappers(
  @@ -652,7 +655,8 @@
                   data.getOptionBykey("o"),
                   data.getOptionBykey("l"),
                   data.getOptionBykey("i"),
  -                data.getOptionBykey("s"));
  +                data.getOptionBykey("s"),
  +                data.getOptionBykey("c"));
           }
       }
   }
  
  
  
  1.6       +4 -0      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperConstants.java
  
  Index: WrapperConstants.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WrapperConstants.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WrapperConstants.java	22 Mar 2004 10:56:53 -0000	1.5
  +++ WrapperConstants.java	29 Mar 2004 04:20:31 -0000	1.6
  @@ -128,4 +128,8 @@
   	public static final String CLIENT = "client";
   	
   	public static final String SOAPENC_ARRAY = "Array";
  +	
  +	//channel security types
  +	public static final String CHANNEL_SECURITY_NONE = "none";
  +	public static final String CHANNEL_SECURITY_SSL = "ssl";
   }
  
  
  
  1.6       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
  
  Index: ArrayParamWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ArrayParamWriter.java	28 Jan 2004 10:19:13 -0000	1.5
  +++ ArrayParamWriter.java	29 Mar 2004 04:20:31 -0000	1.6
  @@ -100,7 +100,7 @@
   				writer.write("#include \""+attribs[0].getTypeName()+".h\"\n\n");
   			}
   			else{
  -				writer.write("#include <axis/common/AxisUserAPI.h>\n\n");
  +				writer.write("#include <axis/server/AxisUserAPI.h>\n\n");
   			}
   			writeArrayStruct();
   			this.writer.write("#endif /* !defined(__"+classname.toUpperCase()+"_"+getFileType().toUpperCase()+"_H__INCLUDED_)*/\n");
  
  
  
  1.9       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java
  
  Index: ClientStubHeaderWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubHeaderWriter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ClientStubHeaderWriter.java	19 Feb 2004 10:27:53 -0000	1.8
  +++ ClientStubHeaderWriter.java	29 Mar 2004 04:20:31 -0000	1.9
  @@ -171,7 +171,7 @@
   	protected void writePreprocssorStatements() throws WrapperFault {
   		try{
   			writer.write("#include <axis/client/Call.h>\n");
  -			writer.write("#include <axis/common/AxisWrapperAPI.h>\n");
  +			writer.write("#include <axis/server/AxisWrapperAPI.h>\n");
   			Type atype;
   			Iterator types = this.wscontext.getTypemap().getTypes().iterator();
   			HashSet typeSet = new HashSet();
  
  
  
  1.13      +5 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
  
  Index: ClientStubWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ClientStubWriter.java	19 Feb 2004 10:27:53 -0000	1.12
  +++ ClientStubWriter.java	29 Mar 2004 04:20:31 -0000	1.13
  @@ -67,6 +67,8 @@
   import java.util.HashSet;
   import java.util.Iterator;
   import javax.xml.namespace.QName;
  +
  +import org.apache.axis.wsdl.wsdl2ws.WrapperConstants;
   import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
   import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
   import org.apache.axis.wsdl.wsdl2ws.info.MethodInfo;
  @@ -228,8 +230,10 @@
   		if (aretherearrayparams || returntypeisarray){
   			writer.write("\tAxis_Array array;\n");
   		}
  +		String channelSecurityType = (WrapperConstants.CHANNEL_SECURITY_SSL.equals(wscontext.getWrapInfo().getChannelSecurity()))?
  +										"SSL_CHANNEL" : "NORMAL_CHANNEL";
   		writer.write("\t/* Following will establish the connections with the server too */\n");
  -		writer.write("\tif (AXIS_SUCCESS != pCall->_functions->Initialize(pCall->_object, C_RPC_PROVIDER)) return ");
  +		writer.write("\tif (AXIS_SUCCESS != pCall->_functions->Initialize(pCall->_object, C_RPC_PROVIDER, "+channelSecurityType+")) return ");
   		if (returntype != null){
   			writer.write((returntypeisarray?"RetArray":returntypeissimple?"Ret":"pReturn")+";\n");
   		}
  
  
  
  1.6       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java
  
  Index: ParamCFileWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamCFileWriter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ParamCFileWriter.java	28 Jan 2004 10:19:14 -0000	1.5
  +++ ParamCFileWriter.java	29 Mar 2004 04:20:31 -0000	1.6
  @@ -108,7 +108,7 @@
   		try {
   			writer.write("#include <malloc.h>\n");
   			writer.write("#include \""+this.classname + ".h\"\n");
  -			writer.write("#include <axis/common/AxisWrapperAPI.h>\n\n");
  +			writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
   		} catch (IOException e) {
   			e.printStackTrace();
   			throw new WrapperFault(e);
  
  
  
  1.9       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
  
  Index: ParmHeaderFileWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ParmHeaderFileWriter.java	3 Feb 2004 13:04:48 -0000	1.8
  +++ ParmHeaderFileWriter.java	29 Mar 2004 04:20:31 -0000	1.9
  @@ -131,7 +131,7 @@
   	  try{
   		Type atype;
   		Iterator types = this.wscontext.getTypemap().getTypes().iterator();
  -		writer.write("#include <axis/common/AxisUserAPI.h>\n\n");
  +		writer.write("#include <axis/server/AxisUserAPI.h>\n\n");
   		HashSet typeSet = new HashSet();
   		String typeName = null;
   		while(types.hasNext()){
  
  
  
  1.9       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ServiceWriter.java
  
  Index: ServiceWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ServiceWriter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ServiceWriter.java	20 Feb 2004 13:37:44 -0000	1.8
  +++ ServiceWriter.java	29 Mar 2004 04:20:31 -0000	1.9
  @@ -162,7 +162,7 @@
   			Type atype;
   			Iterator types = this.wscontext.getTypemap().getTypes().iterator();
   			HashSet typeSet = new HashSet();
  -			writer.write("#include <axis/common/AxisUserAPI.h>\n");
  +			writer.write("#include <axis/server/AxisUserAPI.h>\n");
   			String typeName = null;
   			while(types.hasNext()){
   				atype = (Type)types.next();
  
  
  
  1.7       +2 -2      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapHeaderWriter.java
  
  Index: WrapHeaderWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapHeaderWriter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WrapHeaderWriter.java	9 Feb 2004 14:57:07 -0000	1.6
  +++ WrapHeaderWriter.java	29 Mar 2004 04:20:31 -0000	1.7
  @@ -128,8 +128,8 @@
   	 */
   	protected void writePreprocssorStatements() throws WrapperFault {
   		try{
  -			writer.write("#include <axis/common/IMessageData.h>\n");
  -			writer.write("#include <axis/common/AxisWrapperAPI.h>\n\n");
  +			writer.write("#include <axis/server/IMessageData.h>\n");
  +			writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
   		}catch(IOException e){
   			throw new WrapperFault(e);
   		}
  
  
  
  1.14      +4 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java
  
  Index: ClientStubWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ClientStubWriter.java	27 Mar 2004 15:23:20 -0000	1.13
  +++ ClientStubWriter.java	29 Mar 2004 04:20:31 -0000	1.14
  @@ -69,6 +69,7 @@
   
   import javax.xml.namespace.QName;
   
  +import org.apache.axis.wsdl.wsdl2ws.WrapperConstants;
   import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
   import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
   import org.apache.axis.wsdl.wsdl2ws.CUtils;
  @@ -233,8 +234,10 @@
   				//TODO initialize return parameter appropriately.
   			}
   		}
  +		String channelSecurityType = (WrapperConstants.CHANNEL_SECURITY_SSL.equals(wscontext.getWrapInfo().getChannelSecurity()))?
  +										"SSL_CHANNEL" : "NORMAL_CHANNEL";
   		writer.write("\t/* Following will establish the connections with the server too */\n");
  -		writer.write("\tif (AXIS_SUCCESS != pCall->_functions->Initialize(pCall->_object, C_DOC_PROVIDER,false_)) return ");
  +		writer.write("\tif (AXIS_SUCCESS != pCall->_functions->Initialize(pCall->_object, C_DOC_PROVIDER, "+channelSecurityType+")) return ");
   		if (returntype != null){
   			writer.write((returntypeisarray?"RetArray":returntypeissimple?"Ret":"pReturn")+";\n");
   		}
  
  
  
  1.5       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ServiceWriter.java
  
  Index: ServiceWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ServiceWriter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServiceWriter.java	20 Feb 2004 13:37:44 -0000	1.4
  +++ ServiceWriter.java	29 Mar 2004 04:20:31 -0000	1.5
  @@ -163,7 +163,7 @@
   			Type atype;
   			Iterator types = this.wscontext.getTypemap().getTypes().iterator();
   			HashSet typeSet = new HashSet();
  -			writer.write("#include <axis/common/AxisUserAPI.h>\n");
  +			writer.write("#include <axis/server/AxisUserAPI.h>\n");
   			while(types.hasNext()){
   				atype = (Type)types.next();
   				if (atype.getLanguageSpecificName().startsWith(">")) continue;
  
  
  
  1.5       +2 -2      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/WrapHeaderWriter.java
  
  Index: WrapHeaderWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/WrapHeaderWriter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WrapHeaderWriter.java	9 Feb 2004 14:57:07 -0000	1.4
  +++ WrapHeaderWriter.java	29 Mar 2004 04:20:31 -0000	1.5
  @@ -128,8 +128,8 @@
   	 */
   	protected void writePreprocssorStatements() throws WrapperFault {
   		try{
  -			writer.write("#include <axis/common/IMessageData.h>\n");
  -			writer.write("#include <axis/common/AxisWrapperAPI.h>\n\n");
  +			writer.write("#include <axis/server/IMessageData.h>\n");
  +			writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
   		}catch(IOException e){
   			throw new WrapperFault(e);
   		}
  
  
  
  1.9       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java
  
  Index: ArrayParamWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ArrayParamWriter.java	17 Feb 2004 12:47:44 -0000	1.8
  +++ ArrayParamWriter.java	29 Mar 2004 04:20:31 -0000	1.9
  @@ -97,7 +97,7 @@
   				writer.write("#include \""+attribs[0].getTypeName()+".h\"\n\n");
   			}
   			else{
  -				writer.write("#include <axis/common/AxisUserAPI.h>\n\n");
  +				writer.write("#include <axis/server/AxisUserAPI.h>\n\n");
   			}
   			writeArrayStruct();
   			this.writer.write("#endif /* !defined(__"+classname.toUpperCase()+"_"+getFileType().toUpperCase()+"_H__INCLUDED_)*/\n");
  
  
  
  1.25      +6 -2      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
  
  Index: ClientStubWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ClientStubWriter.java	19 Feb 2004 10:27:54 -0000	1.24
  +++ ClientStubWriter.java	29 Mar 2004 04:20:31 -0000	1.25
  @@ -68,6 +68,7 @@
   
   import javax.xml.namespace.QName;
   
  +import org.apache.axis.wsdl.wsdl2ws.WrapperConstants;
   import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
   import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
   import org.apache.axis.wsdl.wsdl2ws.CUtils;
  @@ -155,7 +156,7 @@
   	protected void writePreprocssorStatements() throws WrapperFault {
   		try{
   			writer.write("#include \""+classname+".h\"\n\n");
  -			writer.write("#include <axis/common/AxisWrapperAPI.h>\n\n");
  +			writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
   		}catch(IOException e){
   			throw new WrapperFault(e);
   		}
  @@ -276,7 +277,9 @@
   				//TODO initialize return parameter appropriately.
   			}
   		}
  -		writer.write("\tif (AXIS_SUCCESS != m_pCall->Initialize(CPP_RPC_PROVIDER)) return ");
  +		String channelSecurityType = (WrapperConstants.CHANNEL_SECURITY_SSL.equals(wscontext.getWrapInfo().getChannelSecurity()))?
  +										"SSL_CHANNEL" : "NORMAL_CHANNEL";
  +		writer.write("\tif (AXIS_SUCCESS != m_pCall->Initialize(CPP_RPC_PROVIDER, "+channelSecurityType +")) return ");
   		if (returntype != null){
   			writer.write((returntypeisarray?"RetArray":returntypeissimple?"Ret":"pReturn")+";\n");
   		}
  @@ -412,6 +415,7 @@
   				if (typeName.startsWith(">")) continue;
   				typeSet.add(typeName);
   			}
  +			writer.write("bool CallBase::bInitialized;\n" +
				"CallFunctions CallBase::ms_VFtable;\n");
   			Iterator itr = typeSet.iterator();
   			while(itr.hasNext())
   			{
  
  
  
  1.6       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java
  
  Index: ParamCPPFileWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParamCPPFileWriter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ParamCPPFileWriter.java	17 Jan 2004 12:25:31 -0000	1.5
  +++ ParamCPPFileWriter.java	29 Mar 2004 04:20:31 -0000	1.6
  @@ -113,7 +113,7 @@
   	try {
   		writer.write("#include <malloc.h>\n");
   		writer.write("#include \""+this.classname + ".h\"\n");
  -		writer.write("#include <axis/common/AxisWrapperAPI.h>\n\n");
  +		writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
   	} catch (IOException e) {
   		e.printStackTrace();
   		throw new WrapperFault(e);
  
  
  
  1.12      +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
  
  Index: ParmHeaderFileWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ParmHeaderFileWriter.java	15 Jan 2004 13:45:24 -0000	1.11
  +++ ParmHeaderFileWriter.java	29 Mar 2004 04:20:31 -0000	1.12
  @@ -144,7 +144,7 @@
   	  try{
   		Type atype;
   		Iterator types = this.wscontext.getTypemap().getTypes().iterator();
  -		writer.write("#include <axis/common/AxisUserAPI.h>\n\n");
  +		writer.write("#include <axis/server/AxisUserAPI.h>\n\n");
   		HashSet typeSet = new HashSet();
   		for (int i=0;i<attribs.length; i++)
   		{
  
  
  
  1.13      +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java
  
  Index: ServiceHeaderWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ServiceHeaderWriter.java	20 Feb 2004 13:37:44 -0000	1.12
  +++ ServiceHeaderWriter.java	29 Mar 2004 04:20:31 -0000	1.13
  @@ -197,7 +197,7 @@
   			Type atype;
   			Iterator types = this.wscontext.getTypemap().getTypes().iterator();
   			HashSet typeSet = new HashSet();
  -			writer.write("#include <axis/common/AxisUserAPI.h>\n\n");
  +			writer.write("#include <axis/server/AxisUserAPI.h>\n\n");
   			while(types.hasNext()){
   				atype = (Type)types.next();
   				if (atype.getLanguageSpecificName().startsWith(">")) continue;				
  
  
  
  1.8       +4 -4      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java
  
  Index: WrapHeaderWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapHeaderWriter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WrapHeaderWriter.java	15 Jan 2004 13:45:24 -0000	1.7
  +++ WrapHeaderWriter.java	29 Mar 2004 04:20:31 -0000	1.8
  @@ -152,10 +152,10 @@
   	protected void writePreprocssorStatements() throws WrapperFault {
   		try{
   			writer.write("#include \""+CUtils.getWebServiceNameFromWrapperName(classname)+".h\"\n");
  -			writer.write("#include <axis/common/WrapperClassHandler.h>\n");
  -			writer.write("#include <axis/common/IMessageData.h>\n");
  -			writer.write("#include <axis/common/GDefine.h>\n");
  -			writer.write("#include <axis/common/AxisWrapperAPI.h>\n\n");
  +			writer.write("#include <axis/server/WrapperClassHandler.h>\n");
  +			writer.write("#include <axis/server/IMessageData.h>\n");
  +			writer.write("#include <axis/server/GDefine.h>\n");
  +			writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
   		}catch(IOException e){
   			throw new WrapperFault(e);
   		}
  
  
  
  1.14      +6 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
  
  Index: ClientStubWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ClientStubWriter.java	27 Mar 2004 15:24:42 -0000	1.13
  +++ ClientStubWriter.java	29 Mar 2004 04:20:31 -0000	1.14
  @@ -68,6 +68,7 @@
   
   import javax.xml.namespace.QName;
   
  +import org.apache.axis.wsdl.wsdl2ws.WrapperConstants;
   import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
   import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
   import org.apache.axis.wsdl.wsdl2ws.CUtils;
  @@ -292,7 +293,9 @@
   				//TODO initialize return parameter appropriately.
   			}
   		}
  -		writer.write("\tif (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER, false_)) return ");
  +		String channelSecurityType = (WrapperConstants.CHANNEL_SECURITY_SSL.equals(wscontext.getWrapInfo().getChannelSecurity()))?
  +										"SSL_CHANNEL" : "NORMAL_CHANNEL";
  +		writer.write("\tif (AXIS_SUCCESS != m_pCall->Initialize(CPP_DOC_PROVIDER, "+channelSecurityType+")) return ");
   		if (returntype != null){
   			writer.write((returntypeisarray?"RetArray":returntypeissimple?"Ret":"pReturn")+";\n\t");
   		}
  @@ -454,6 +457,8 @@
   				if (typeName.startsWith(">")) continue;
   				typeSet.add(typeName);
   			}
  +			writer.write("bool CallBase::bInitialized;\n" +
  +				"CallFunctions CallBase::ms_VFtable;\n");
   			Iterator itr = typeSet.iterator();
   			while(itr.hasNext())
   			{
  
  
  
  1.9       +0 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParamCPPFileWriter.java
  
  Index: ParamCPPFileWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParamCPPFileWriter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ParamCPPFileWriter.java	27 Mar 2004 16:58:50 -0000	1.8
  +++ ParamCPPFileWriter.java	29 Mar 2004 04:20:31 -0000	1.9
  @@ -118,7 +118,6 @@
   	try {
   		writer.write("#include <malloc.h>\n");
   		writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
  -		writer.write("#include <axis/server/AxisTrace.h>\n\n");		
   		writer.write("#include \""+this.classname + ".h\"\n");
   		writer.write("extern AxisTrace* g_pAT;\n");
   	} catch (IOException e) {
  
  
  
  1.6       +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ServiceHeaderWriter.java
  
  Index: ServiceHeaderWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ServiceHeaderWriter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ServiceHeaderWriter.java	16 Mar 2004 08:26:28 -0000	1.5
  +++ ServiceHeaderWriter.java	29 Mar 2004 04:20:31 -0000	1.6
  @@ -197,7 +197,7 @@
   			Type atype;
   			Iterator types = this.wscontext.getTypemap().getTypes().iterator();
   			HashSet typeSet = new HashSet();
  -			writer.write("#include <axis/common/AxisUserAPI.h>\n\n");
  +			writer.write("#include <axis/server/AxisUserAPI.h>\n\n");
   			while(types.hasNext()){
   				atype = (Type)types.next();
   				if (atype.getLanguageSpecificName().startsWith(">")) continue;				
  
  
  
  1.4       +4 -4      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapHeaderWriter.java
  
  Index: WrapHeaderWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapHeaderWriter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WrapHeaderWriter.java	15 Jan 2004 13:45:24 -0000	1.3
  +++ WrapHeaderWriter.java	29 Mar 2004 04:20:32 -0000	1.4
  @@ -152,10 +152,10 @@
   	protected void writePreprocssorStatements() throws WrapperFault {
   		try{
   			writer.write("#include \""+CUtils.getWebServiceNameFromWrapperName(classname)+".h\"\n");
  -			writer.write("#include <axis/common/WrapperClassHandler.h>\n");
  -			writer.write("#include <axis/common/IMessageData.h>\n");
  -			writer.write("#include <axis/common/GDefine.h>\n");
  -			writer.write("#include <axis/common/AxisWrapperAPI.h>\n\n");
  +			writer.write("#include <axis/server/WrapperClassHandler.h>\n");
  +			writer.write("#include <axis/server/IMessageData.h>\n");
  +			writer.write("#include <axis/server/GDefine.h>\n");
  +			writer.write("#include <axis/server/AxisWrapperAPI.h>\n\n");
   		}catch(IOException e){
   			throw new WrapperFault(e);
   		}
  
  
  
  1.7       +44 -44    ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/TypeMap.java
  
  Index: TypeMap.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/TypeMap.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TypeMap.java	22 Mar 2004 11:18:04 -0000	1.6
  +++ TypeMap.java	29 Mar 2004 04:20:32 -0000	1.7
  @@ -97,53 +97,53 @@
   	private static Hashtable cppkeywords = new Hashtable();
   
   	static {
  -		// java -> xml type mapping
  +		// c -> xml type mapping
   		
  -		basicTypeClass2QNamemap.put("int", new QName(WrapperConstants.SCHEMA_NAMESPACE, "int"));
  -		basicTypeClass2QNamemap.put("byte", new QName(WrapperConstants.SCHEMA_NAMESPACE, "byte"));
  -		basicTypeClass2QNamemap.put("float", new QName(WrapperConstants.SCHEMA_NAMESPACE, "float"));
  -		basicTypeClass2QNamemap.put("long", new QName(WrapperConstants.SCHEMA_NAMESPACE, "long"));
  -		basicTypeClass2QNamemap.put("double", new QName(WrapperConstants.SCHEMA_NAMESPACE, "double"));
  -		basicTypeClass2QNamemap.put("boolean", new QName(WrapperConstants.SCHEMA_NAMESPACE, "boolean"));
  -		basicTypeClass2QNamemap.put("char", new QName(WrapperConstants.SCHEMA_NAMESPACE, "char"));
  -		basicTypeClass2QNamemap.put("short", new QName(WrapperConstants.SCHEMA_NAMESPACE, "short"));
  -		basicTypeClass2QNamemap.put("java.lang.String", new QName(WrapperConstants.SCHEMA_NAMESPACE, "string"));
  -		basicTypeClass2QNamemap.put("java.math.BigDecimal", new QName(WrapperConstants.SCHEMA_NAMESPACE, "decimal"));
  -		basicTypeClass2QNamemap.put("java.math.BigInteger", new QName(WrapperConstants.SCHEMA_NAMESPACE, "integer"));
  -		basicTypeClass2QNamemap.put("java.utils.Calendar", new QName(WrapperConstants.SCHEMA_NAMESPACE, "dateTime"));
  -		basicTypeClass2QNamemap.put("java.utils.Date", new QName(WrapperConstants.SCHEMA_NAMESPACE, "dateTime"));
  +		basicTypeClass2QNamemap.put("xsd__int", new QName(WrapperConstants.SCHEMA_NAMESPACE, "int"));
  +		basicTypeClass2QNamemap.put("xsd__byte", new QName(WrapperConstants.SCHEMA_NAMESPACE, "byte"));
  +		basicTypeClass2QNamemap.put("xsd__float", new QName(WrapperConstants.SCHEMA_NAMESPACE, "float"));
  +		basicTypeClass2QNamemap.put("xsd__long", new QName(WrapperConstants.SCHEMA_NAMESPACE, "long"));
  +		basicTypeClass2QNamemap.put("xsd__double", new QName(WrapperConstants.SCHEMA_NAMESPACE, "double"));
  +		basicTypeClass2QNamemap.put("xsd__boolean", new QName(WrapperConstants.SCHEMA_NAMESPACE, "boolean"));
  +		basicTypeClass2QNamemap.put("xsd__integer", new QName(WrapperConstants.SCHEMA_NAMESPACE, "integer"));
  +		basicTypeClass2QNamemap.put("xsd__short", new QName(WrapperConstants.SCHEMA_NAMESPACE, "short"));
  +		basicTypeClass2QNamemap.put("xsd__string", new QName(WrapperConstants.SCHEMA_NAMESPACE, "string"));
  +		basicTypeClass2QNamemap.put("xsd__decimal", new QName(WrapperConstants.SCHEMA_NAMESPACE, "decimal"));
  +		basicTypeClass2QNamemap.put("xsd__dateTime", new QName(WrapperConstants.SCHEMA_NAMESPACE, "dateTime"));
  +		basicTypeClass2QNamemap.put("xsd__time", new QName(WrapperConstants.SCHEMA_NAMESPACE, "time"));
  +		basicTypeClass2QNamemap.put("xsd__QName", new QName(WrapperConstants.SCHEMA_NAMESPACE, "Qname"));
  +		basicTypeClass2QNamemap.put("xsd__date", new QName(WrapperConstants.SCHEMA_NAMESPACE, "date"));
  +		basicTypeClass2QNamemap.put("xsd__base64Binary", new QName(WrapperConstants.SCHEMA_NAMESPACE, "base64Binary"));
  +		basicTypeClass2QNamemap.put("xsd__hexBinary", new QName(WrapperConstants.SCHEMA_NAMESPACE, "hexBinary"));
  +		basicTypeClass2QNamemap.put("xsd__unsignedByte", new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedByte"));
  +		basicTypeClass2QNamemap.put("xsd__unsignedInt", new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedInt"));
  +		basicTypeClass2QNamemap.put("xsd__unsignedLong", new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedLong"));
  +		basicTypeClass2QNamemap.put("xsd__unsignedShort", new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedShort"));
  +		basicTypeClass2QNamemap.put("xsd__anyURI", new QName(WrapperConstants.SCHEMA_NAMESPACE, "anyURI"));
   		
  -		// xml -> java type mapping 
  +		// xml -> c type mapping 
   	
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "int"), "int");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "byte"), "byte");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "float"), "float");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "long"), "long");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "integer"), "long");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "double"), "double");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "boolean"), "boolean");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "char"), "char");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "short"), "short");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "string"), "java.lang.String");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "decimal"), "java.math.BigDecimal");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "Qname"), "javax.xml.namespace.QName");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "dateTime"), "java.utils.Date");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "date"), "java.utils.Date");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "time"), "java.utils.Date");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "base64Binary"), "byte[]");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "hexBinary"), "byte[]");
  -		
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "int"), "java.lang.Integer");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "byte"), "java.lang.Byte");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "float"), "java.lang.Float");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "long"), "java.lang.Long");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "double"), "java.lang.Double");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "boolean"), "java.lang.Boolean");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "char"), "java.lang.Charcter");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "short"), "java.lang.Short");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SOAPENC_NAMESPACE, "string"), "java.lang.String");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "decimal"), "java.math.BigDecimal");
  -		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "QName"), "javax.xml.namespace.QName");		
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "integer"), "xsd__integer");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "string"), "xsd__string");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "decimal"), "xsd__decimal");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "Qname"), "xsd__QName");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "dateTime"), "xsd__dateTime");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "date"), "xsd__date");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "time"), "xsd__time");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "base64Binary"), "xsd__base64Binary");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "hexBinary"), "xsd__hexBinary");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "int"), "xsd__int");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "byte"), "xsd__byte");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "float"), "xsd__float");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "long"), "xsd__long");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "double"), "xsd__double");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "boolean"), "xsd__boolean");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "short"), "xsd__short");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedByte"), "xsd__unsignedByte");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedInt"), "xsd__unsignedInt");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedLong"), "xsd__unsignedLong");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "unsignedShort"), "xsd__unsignedShort");
  +		basicTypeQname2classmap.put(new QName(WrapperConstants.SCHEMA_NAMESPACE, "anyURI"), "xsd__anyURI");
   
   		String[] words1 ={"abstract","default","if","private","this","boolean","do","implements",
   			"protected","throw","break","double","import","public","throws","byte","else","instanceof",
  
  
  
  1.5       +14 -1     ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java
  
  Index: WrapperInfo.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WrapperInfo.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WrapperInfo.java	12 Jan 2004 10:51:35 -0000	1.4
  +++ WrapperInfo.java	29 Mar 2004 04:20:32 -0000	1.5
  @@ -82,6 +82,8 @@
   	private String targetEndpointURI; 
   	//private target name space of the wsdl file 
   	private String targetNameSpaceOfWSDL;
  +	//channel security type
  +	private String channelSecurity;
   	
       public WrapperInfo(String wrapperStyle,
       					String wrapperLanguage,
  @@ -91,7 +93,8 @@
       					String targetEngine,
       					String trasportUri,
   						String targetEndpointURI,
  -						String targetNameSpaceOfWSDL) {
  +						String targetNameSpaceOfWSDL,
  +						String channelSecurity) {
           this.wrapperStyle = wrapperStyle;
           this.wrapperLanguage = wrapperLanguage;
    //       this.encodingStyle = encodingStyle;
  @@ -133,6 +136,10 @@
   		else	
   			this.targetEndpointURI = targetEndpointURI;	
   		this.targetNameSpaceOfWSDL = (targetNameSpaceOfWSDL == null)?"":targetNameSpaceOfWSDL;
  +		if (channelSecurity == null)
  +			this.channelSecurity = WrapperConstants.CHANNEL_SECURITY_NONE;
  +		else
  +			this.channelSecurity = channelSecurity;
   	
       }
   
  @@ -215,4 +222,10 @@
   		return trasportUri;
   	}
   
  +	/**
  +	 * @return String
  +	 */
  +	public String getChannelSecurity() {
  +		return channelSecurity;
  +	}	
   }
  
  
  
  1.3       +20 -60    ws-axis/c/vc/common/CommonLibrary.dsp
  
  Index: CommonLibrary.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/common/CommonLibrary.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CommonLibrary.dsp	26 Mar 2004 07:36:05 -0000	1.2
  +++ CommonLibrary.dsp	29 Mar 2004 04:20:32 -0000	1.3
  @@ -142,123 +142,83 @@
   # PROP Default_Filter "h;hpp;hxx;hm;inl"
   # Begin Source File
   
  -SOURCE=..\..\src\common\ArrayBean.h
  +SOURCE=..\..\include\axis\server\AxisConfig.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\AxisConfig.h
  +SOURCE=..\..\include\axis\server\AxisException.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\AxisException.h
  +SOURCE=..\..\include\axis\server\AxisTime.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\src\common\AxisSocketUtils.h
  +SOURCE=..\..\include\axis\server\AxisTrace.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\AxisTime.h
  +SOURCE=..\..\include\axis\server\AxisUserAPI.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\AxisTrace.h
  +SOURCE=..\..\include\axis\server\AxisWrapperAPI.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\AxisUserAPI.h
  +SOURCE=..\..\include\axis\server\BasicTypeSerializer.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\src\common\AxisUtils.h
  +SOURCE=..\..\include\axis\server\GDefine.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\AxisWrapperAPI.h
  +SOURCE=..\..\include\axis\server\IHandlerSoapDeSerializer.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\BasicHandler.h
  +SOURCE=..\..\include\axis\server\IHandlerSoapSerializer.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\BasicTypeSerializer.h
  +SOURCE=..\..\include\axis\server\IMessageData.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\GDefine.h
  +SOURCE=..\..\include\axis\server\IParam.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\Handler.h
  +SOURCE=..\..\include\axis\server\IWrapperSoapDeSerializer.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\src\common\IArrayBean.h
  +SOURCE=..\..\include\axis\server\IWrapperSoapSerializer.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\src\common\IDeployerUtils.h
  +SOURCE=..\..\include\axis\server\MessageData.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\IHandlerSoapDeSerializer.h
  +SOURCE=..\..\include\axis\server\Packet.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\IHandlerSoapSerializer.h
  +SOURCE=..\..\include\axis\server\Param.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\IHeaderBlock.h
  +SOURCE=..\..\include\axis\server\SoapEnvVersions.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\IMessageData.h
  +SOURCE=..\..\include\axis\server\TypeMapping.h
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\include\axis\common\IParam.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\include\axis\common\ISoapDeSerializer.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\include\axis\common\ISoapHeader.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\src\common\ISoapMethod.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\include\axis\common\ISoapSerializer.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\include\axis\common\IWrapperSoapDeSerializer.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\include\axis\common\IWrapperSoapSerializer.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\src\common\MessageData.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\include\axis\common\Packet.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\include\axis\common\Param.h
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=..\..\include\axis\common\TypeMapping.h
  +SOURCE=..\..\include\axis\server\WrapperClassHandler.h
   # End Source File
   # End Group
   # End Target
  
  
  
  1.5       +2 -2      ws-axis/c/vc/samples/client/interoptests/base/base.dsp
  
  Index: base.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/samples/client/interoptests/base/base.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- base.dsp	27 Mar 2004 13:18:26 -0000	1.4
  +++ base.dsp	29 Mar 2004 04:20:32 -0000	1.5
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_EXPAT_PARSER" /YX /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -66,7 +66,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_EXPAT_PARSER" /FD /GZ /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
   # SUBTRACT CPP /Fr /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.5       +2 -2      ws-axis/c/vc/samples/client/interoptests/cbase/cbase.dsp
  
  Index: cbase.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/samples/client/interoptests/cbase/cbase.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- cbase.dsp	27 Mar 2004 13:18:26 -0000	1.4
  +++ cbase.dsp	29 Mar 2004 04:20:32 -0000	1.5
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /YX /Yc /Yu
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -67,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_EXPAT_PARSER" /FD /GZ /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
   # SUBTRACT CPP /YX /Yc /Yu
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.5       +2 -2      ws-axis/c/vc/samples/client/interoptests/cgroupB/cgroupB.dsp
  
  Index: cgroupB.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/samples/client/interoptests/cgroupB/cgroupB.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- cgroupB.dsp	27 Mar 2004 13:18:26 -0000	1.4
  +++ cgroupB.dsp	29 Mar 2004 04:20:32 -0000	1.5
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
  -# ADD CPP /nologo /W3 /GX /O1 /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
  +# ADD CPP /nologo /W3 /GX /O1 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -66,7 +66,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
  -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_EXPAT_PARSER" /FD /GZ /c
  +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
   # SUBTRACT CPP /YX /Yc /Yu
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.5       +2 -2      ws-axis/c/vc/samples/client/interoptests/doclitbase/doclitbase.dsp
  
  Index: doclitbase.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/samples/client/interoptests/doclitbase/doclitbase.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- doclitbase.dsp	27 Mar 2004 13:18:26 -0000	1.4
  +++ doclitbase.dsp	29 Mar 2004 04:20:32 -0000	1.5
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -66,7 +66,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  
  
  
  1.5       +2 -2      ws-axis/c/vc/samples/client/interoptests/doclitgroupB/doclitgroupB.dsp
  
  Index: doclitgroupB.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/samples/client/interoptests/doclitgroupB/doclitgroupB.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- doclitgroupB.dsp	27 Mar 2004 13:18:26 -0000	1.4
  +++ doclitgroupB.dsp	29 Mar 2004 04:20:32 -0000	1.5
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -66,7 +66,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  
  
  
  1.5       +2 -2      ws-axis/c/vc/samples/client/interoptests/groupB/groupB.dsp
  
  Index: groupB.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/samples/client/interoptests/groupB/groupB.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- groupB.dsp	27 Mar 2004 13:18:26 -0000	1.4
  +++ groupB.dsp	29 Mar 2004 04:20:32 -0000	1.5
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -66,7 +66,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../include" /I "C:\Expat-1.95.7\Source\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_EXPAT_PARSER" /YX /FD /GZ /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  
  
  
  1.5       +2 -2      ws-axis/c/vc/samples/client/interoptests/groupC/groupC.dsp
  
  Index: groupC.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/samples/client/interoptests/groupC/groupC.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- groupC.dsp	27 Mar 2004 13:18:26 -0000	1.4
  +++ groupC.dsp	29 Mar 2004 04:20:32 -0000	1.5
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O1 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -66,7 +66,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  
  
  
  1.5       +2 -6      ws-axis/c/vc/server/apache1_3/Apache1_3Module.dsp
  
  Index: Apache1_3Module.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/server/apache1_3/Apache1_3Module.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Apache1_3Module.dsp	27 Mar 2004 11:24:31 -0000	1.4
  +++ Apache1_3Module.dsp	29 Mar 2004 04:20:32 -0000	1.5
  @@ -54,7 +54,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 /nologo /dll /machine:I386
  -# ADD LINK32 AxisServer.lib ApacheCore.lib /nologo /dll /pdb:none /machine:I386 /out:"../../../bin/mod_axis.dll" /libpath:"../../../release/win32" /libpath:"../../../lib/apache1_3"
  +# ADD LINK32 AxisServer.lib ApacheCore.lib /nologo /dll /pdb:none /machine:I386 /out:"../../../bin/mod_axis.dll" /libpath:"../../../bin" /libpath:"../../../lib/apache1_3"
   # SUBTRACT LINK32 /profile
   # Begin Special Build Tool
   SOURCE="$(InputPath)"
  @@ -85,12 +85,8 @@
   # 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 /nologo /dll /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 AxisServer_D.lib ApacheCore.lib /nologo /dll /debug /machine:I386 /out:"../../../bin/mod_axis.dll" /pdbtype:sept /libpath:"../../../release/win32" /libpath:"../../../lib/apache1_3"
  +# ADD LINK32 AxisServer_D.lib ApacheCore.lib /nologo /dll /debug /machine:I386 /out:"C:\Program Files\Apache Group\Apache\modules/mod_axis.dll" /pdbtype:sept /libpath:"../../../bin" /libpath:"../../../lib/apache1_3"
   # SUBTRACT LINK32 /profile
  -# Begin Special Build Tool
  -SOURCE="$(InputPath)"
  -PostBuild_Cmds=copy ..\..\..\bin\mod_axis.dll "%AXIS_HOME%\..\modules\."
  -# End Special Build Tool
   
   !ENDIF 
   
  
  
  
  1.5       +1 -1      ws-axis/c/vc/server/apache2_0/Apache2_0Module.dsp
  
  Index: Apache2_0Module.dsp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/vc/server/apache2_0/Apache2_0Module.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Apache2_0Module.dsp	27 Mar 2004 11:24:31 -0000	1.4
  +++ Apache2_0Module.dsp	29 Mar 2004 04:20:32 -0000	1.5
  @@ -79,7 +79,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 /nologo /dll /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 AxisServer_D.lib libapr.lib libhttpd.lib /nologo /dll /debug /machine:I386 /out:"../../../bin/mod_axis2.dll" /pdbtype:sept /libpath:"../../../lib/axis" /libpath:"../../../lib/apache2_0" /libpath:"../../../lib/expat"
  +# ADD LINK32 AxisServer_D.lib libapr.lib libhttpd.lib /nologo /dll /debug /machine:I386 /out:"../../../bin/mod_axis2.dll" /pdbtype:sept /libpath:"../../../bin" /libpath:"../../../lib/apache2_0"
   
   !ENDIF 
   
  
  
  

Mime
View raw message