You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2004/03/24 07:57:34 UTC

cvs commit: ws-axis/c/src/xml Event.h QName.h

damitha     2004/03/23 22:57:34

  Modified:    c/include/axis/client Call.h
               c/include/axis/server Attribute.h AxisEngine.h
                        AxisException.h AxisTime.h BasicNode.h
                        HandlerChain.h HeaderBlock.h
                        IHandlerSoapDeSerializer.h IHandlerSoapSerializer.h
                        IHeaderBlock.h IMessageData.h MessageData.h
                        SoapDeSerializer.h SoapEnvVersions.h SoapHeader.h
                        SoapSerializer.h WSDDHandler.h XMLParser.h
               c/samples/client/interoptests/cbase InteropTestPortType.h
                        SOAPStruct.c SOAPStruct.h
               c/samples/server/interoptests/cbase InteropTestPortType.c
                        InteropTestPortTypeWrapper.h SOAPStruct.c
                        SOAPStruct.h
               c/src/client Call.cpp
               c/src/client/transport/axis AxisTransport.cpp
                        AxisTransport.h Channel.cpp HttpTransport.cpp
                        Receiver.cpp Receiver.hpp SecureChannel.cpp
                        SecureChannel.hpp Sender.cpp Sender.hpp
                        Transport.cpp TransportFactory.cpp Url.cpp
               c/src/common ArrayBean.cpp ArrayBean.h AxisConfig.cpp
                        AxisException.cpp AxisSocketUtils.cpp AxisTime.cpp
                        AxisTrace.cpp AxisUtils.cpp AxisUtils.h
                        BasicTypeSerializer.cpp GDefine.cpp IArrayBean.h
                        IDeployerUtils.h MessageData.cpp Packet.cpp
                        Param.cpp TypeMapping.cpp WrapperClassHandler.h
               c/src/engine AppScopeHandlerPool.h Axis.cpp AxisEngine.cpp
                        ClientAxisEngine.cpp DeserializerPool.cpp
                        DeserializerPool.h HandlerChain.cpp
                        HandlerLoader.cpp HandlerLoader.h HandlerPool.cpp
                        HandlerPool.h RequestScopeHandlerPool.h
                        SerializerPool.cpp SerializerPool.h
                        ServerAxisEngine.cpp ServerAxisEngine.h
                        SessionScopeHandlerPool.h SharedObject.h
               c/src/server/apache mod_axis.c
               c/src/server/apache2 mod_axis2.c
               c/src/soap Attribute.cpp BasicNode.cpp CharacterElement.cpp
                        ComplexElement.cpp ComplexElement.h HeaderBlock.cpp
                        SoapBody.cpp SoapBody.h SoapDeSerializer.cpp
                        SoapEnvelope.cpp SoapEnvelope.h SoapFault.cpp
                        SoapHeader.cpp SoapKeywordMapping.cpp
                        SoapKeywordMapping.h SoapMethod.cpp SoapMethod.h
                        SoapParserExpat.h SoapSerializer.cpp URIMapping.h
                        XMLStreamHandler.cpp XMLStreamHandler.h
               c/src/wsdd WSDDDeployment.cpp WSDDDeployment.h
                        WSDDDocument.cpp WSDDDocument.h WSDDHandler.cpp
                        WSDDKeywords.h WSDDService.cpp WSDDTransport.h
               c/src/xml Event.h QName.h
  Log:
  Source restructuring
  
  Revision  Changes    Path
  1.2       +6 -6      ws-axis/c/include/axis/client/Call.h
  
  Index: Call.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/client/Call.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Call.h	23 Mar 2004 05:38:58 -0000	1.1
  +++ Call.h	24 Mar 2004 06:57:29 -0000	1.2
  @@ -65,18 +65,18 @@
   #if !defined(AFX_CALL_H__D13E5626_0A9B_43EA_B606_364B98CEDAA8__INCLUDED_)
   #define AFX_CALL_H__D13E5626_0A9B_43EA_B606_364B98CEDAA8__INCLUDED_
   
  -#include "../axis/common/AxisWrapperAPI.h"
  -#include "../axis/soap/SoapEnvVersions.h"
  -#include "../axis/wsdd/WSDDDefines.h"
  +#include "../server/AxisWrapperAPI.h"
  +#include "../server/SoapEnvVersions.h"
  +#include "../server/WSDDDefines.h"
   
   #ifdef __cplusplus
  -#include "../axis/common/IParam.h"
  -#include "../axis/engine/ClientAxisEngine.h"
  +#include "../server/IParam.h"
  +#include "../server/ClientAxisEngine.h"
   #include <list>
   using namespace std;
   class AxisTransport;
   #else
  -#include "../axis/common/Packet.h"
  +#include "../server/Packet.h"
   #endif
   
   typedef struct {
  
  
  
  1.6       +1 -1      ws-axis/c/include/axis/server/Attribute.h
  
  Index: Attribute.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/Attribute.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Attribute.h	28 Feb 2004 06:27:56 -0000	1.5
  +++ Attribute.h	24 Mar 2004 06:57:29 -0000	1.6
  @@ -66,7 +66,7 @@
   
   #include <string>
   #include <list>
  -#include "../common/GDefine.h"
  +#include "GDefine.h"
   
   using namespace std;
   
  
  
  
  1.5       +6 -6      ws-axis/c/include/axis/server/AxisEngine.h
  
  Index: AxisEngine.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisEngine.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AxisEngine.h	3 Feb 2004 13:04:45 -0000	1.4
  +++ AxisEngine.h	24 Mar 2004 06:57:29 -0000	1.5
  @@ -64,12 +64,12 @@
   #define __AXISENGINE_INCLUDED__
   
   
  -#include "../common/GDefine.h"
  -#include "../common/Packet.h"
  -#include "../soap/SoapSerializer.h"
  -#include "../soap/SoapDeSerializer.h"
  -#include "../common/BasicHandler.h"
  -#include "../common/MessageData.h"
  +#include "GDefine.h"
  +#include "Packet.h"
  +#include "SoapSerializer.h"
  +#include "SoapDeSerializer.h"
  +#include "BasicHandler.h"
  +#include "MessageData.h"
   #include "HandlerChain.h"
   /**
       @class AxisEngine
  
  
  
  1.2       +1 -1      ws-axis/c/include/axis/server/AxisException.h
  
  Index: AxisException.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisException.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AxisException.h	20 Oct 2003 03:18:19 -0000	1.1
  +++ AxisException.h	24 Mar 2004 06:57:29 -0000	1.2
  @@ -64,7 +64,7 @@
   
   #include <string>
   #include <exception>
  -#include "../soap/SoapFault.h"
  +#include "SoapFault.h"
   using namespace std;
   
   #define TEST_EXCEPTION FAULT_LAST+1
  
  
  
  1.9       +2 -2      ws-axis/c/include/axis/server/AxisTime.h
  
  Index: AxisTime.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisTime.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AxisTime.h	23 Mar 2004 07:04:50 -0000	1.8
  +++ AxisTime.h	24 Mar 2004 06:57:29 -0000	1.9
  @@ -60,8 +60,8 @@
   
   #include <time.h>
   #include <string>
  -#include <axis/common/TypeMapping.h>
  -#include <axis/common/IParam.h>
  +#include "TypeMapping.h"
  +#include "IParam.h"
   
   using namespace std;
   
  
  
  
  1.6       +1 -1      ws-axis/c/include/axis/server/BasicNode.h
  
  Index: BasicNode.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/BasicNode.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BasicNode.h	8 Mar 2004 13:22:02 -0000	1.5
  +++ BasicNode.h	24 Mar 2004 06:57:29 -0000	1.6
  @@ -70,7 +70,7 @@
   
   #include <string>
   #include <list>
  -#include "../common/GDefine.h"
  +#include "GDefine.h"
   
   using namespace std;
   
  
  
  
  1.5       +2 -2      ws-axis/c/include/axis/server/HandlerChain.h
  
  Index: HandlerChain.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/HandlerChain.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HandlerChain.h	3 Feb 2004 13:04:45 -0000	1.4
  +++ HandlerChain.h	24 Mar 2004 06:57:29 -0000	1.5
  @@ -61,8 +61,8 @@
   #if !defined(AFX_HANDLERCHAIN_H__675E51BF_2FD7_4860_B3DE_F8B5A978EB99__INCLUDED_)
   #define AFX_HANDLERCHAIN_H__675E51BF_2FD7_4860_B3DE_F8B5A978EB99__INCLUDED_
   
  -#include "../common/BasicHandler.h"
  -#include "../common/Handler.h"
  +#include "BasicHandler.h"
  +#include "Handler.h"
   #include <list>
   
   using namespace std;
  
  
  
  1.8       +2 -2      ws-axis/c/include/axis/server/HeaderBlock.h
  
  Index: HeaderBlock.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/HeaderBlock.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HeaderBlock.h	8 Mar 2004 13:22:02 -0000	1.7
  +++ HeaderBlock.h	24 Mar 2004 06:57:29 -0000	1.8
  @@ -71,8 +71,8 @@
   using namespace std;
   
   class BasicNode;
  -#include "../common/IHeaderBlock.h"
  -#include "../soap/SoapEnvVersions.h"
  +#include "IHeaderBlock.h"
  +#include "SoapEnvVersions.h"
   
   /**
       @class BasicNode
  
  
  
  1.6       +3 -3      ws-axis/c/include/axis/server/IHandlerSoapDeSerializer.h
  
  Index: IHandlerSoapDeSerializer.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/IHandlerSoapDeSerializer.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- IHandlerSoapDeSerializer.h	13 Feb 2004 07:42:44 -0000	1.5
  +++ IHandlerSoapDeSerializer.h	24 Mar 2004 06:57:29 -0000	1.6
  @@ -63,9 +63,9 @@
   #if !defined(AFX_IHANDLERSOAPDESERIALIZER_H__EAD744F9_FEB3_4885_9510_D7BAD8C5AD1C__INCLUDED_)
   #define AFX_IHANDLERSOAPDESERIALIZER_H__EAD744F9_FEB3_4885_9510_D7BAD8C5AD1C__INCLUDED_
   
  -#include "../common/IWrapperSoapDeSerializer.h"
  -#include "../common/IHeaderBlock.h"
  -#include "../common/AxisUserAPI.h"
  +#include "IWrapperSoapDeSerializer.h"
  +#include "IHeaderBlock.h"
  +#include "AxisUserAPI.h"
   /**
       @class IHandlerSoapDeSerializer
       @brief interface for the IHandlerSoapDeSerializer class.
  
  
  
  1.4       +1 -1      ws-axis/c/include/axis/server/IHandlerSoapSerializer.h
  
  Index: IHandlerSoapSerializer.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/IHandlerSoapSerializer.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IHandlerSoapSerializer.h	14 Jan 2004 12:57:09 -0000	1.3
  +++ IHandlerSoapSerializer.h	24 Mar 2004 06:57:29 -0000	1.4
  @@ -63,7 +63,7 @@
   #if !defined(AFX_IHANDLERSOAPSERIALIZER_H__DE308D72_BC3E_407A_9252_649D0399C90F__INCLUDED_)
   #define AFX_IHANDLERSOAPSERIALIZER_H__DE308D72_BC3E_407A_9252_649D0399C90F__INCLUDED_
   
  -#include "../common/IWrapperSoapSerializer.h"
  +#include "IWrapperSoapSerializer.h"
   class IHeaderBlock;
   /**
       @class IHandlerSoapSerializer
  
  
  
  1.7       +3 -3      ws-axis/c/include/axis/server/IHeaderBlock.h
  
  Index: IHeaderBlock.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/IHeaderBlock.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- IHeaderBlock.h	8 Mar 2004 13:22:02 -0000	1.6
  +++ IHeaderBlock.h	24 Mar 2004 06:57:29 -0000	1.7
  @@ -64,9 +64,9 @@
   #if !defined(AFX_IHEADERBLOCK_H__1FFF90C8_3E12_4EFD_8D97_61E2E92A0BB7__INCLUDED_)
   #define AFX_IHEADERBLOCK_H__1FFF90C8_3E12_4EFD_8D97_61E2E92A0BB7__INCLUDED_
   
  -#include "../soap/BasicNode.h"
  -#include "../soap/SoapEnvVersions.h"
  -#include "../soap/Attribute.h"
  +#include "BasicNode.h"
  +#include "SoapEnvVersions.h"
  +#include "Attribute.h"
   
   enum HEADER_BLOCK_STD_ATTR_TYPE { ROLE_NEXT=1, ROLE_NONE=2, 
   	ROLE_ULTIMATE_RECEIVER=3, ACTOR=4, MUST_UNDERSTAND_TRUE= 5, 
  
  
  
  1.9       +1 -1      ws-axis/c/include/axis/server/IMessageData.h
  
  Index: IMessageData.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/IMessageData.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- IMessageData.h	28 Feb 2004 06:27:56 -0000	1.8
  +++ IMessageData.h	24 Mar 2004 06:57:29 -0000	1.9
  @@ -65,7 +65,7 @@
   
   #ifdef __cplusplus
   
  -#include "../wsdd/WSDDService.h"
  +#include "WSDDService.h"
   #include <string>
   using namespace std;
   
  
  
  
  1.5       +3 -3      ws-axis/c/include/axis/server/MessageData.h
  
  Index: MessageData.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/MessageData.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MessageData.h	28 Feb 2004 06:27:56 -0000	1.4
  +++ MessageData.h	24 Mar 2004 06:57:29 -0000	1.5
  @@ -66,9 +66,9 @@
   
   #include "GDefine.h"
   #include "IMessageData.h"
  -#include "../wsdd/WSDDService.h"
  -#include "../soap/SoapSerializer.h"
  -#include "../soap/SoapDeSerializer.h"
  +#include "WSDDService.h"
  +#include "SoapSerializer.h"
  +#include "SoapDeSerializer.h"
   #include "Param.h"
   
   #include <string>
  
  
  
  1.9       +4 -4      ws-axis/c/include/axis/server/SoapDeSerializer.h
  
  Index: SoapDeSerializer.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/SoapDeSerializer.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SoapDeSerializer.h	23 Mar 2004 06:50:06 -0000	1.8
  +++ SoapDeSerializer.h	24 Mar 2004 06:57:29 -0000	1.9
  @@ -63,12 +63,12 @@
   #if !defined(AFX_SOAPDESERIALIZER_H__FD0E7C3B_B887_480A_9E2A_20736A88B09B__INCLUDED_)
   #define AFX_SOAPDESERIALIZER_H__FD0E7C3B_B887_480A_9E2A_20736A88B09B__INCLUDED_
   
  -#include "../common/IHandlerSoapDeSerializer.h"
  +#include "IHandlerSoapDeSerializer.h"
   #include "SoapEnvVersions.h"
   #include "HeaderBlock.h"
  -#include "../wsdd/WSDDDefines.h"
  -#include "../xml/XMLParser.h"
  -#include "../xml/AnyElement.h"
  +#include "WSDDDefines.h"
  +#include "XMLParser.h"
  +#include "AnyElement.h"
   
   class SoapFault;
   class SoapMethod;
  
  
  
  1.5       +1 -1      ws-axis/c/include/axis/server/SoapEnvVersions.h
  
  Index: SoapEnvVersions.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/SoapEnvVersions.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SoapEnvVersions.h	28 Feb 2004 06:27:56 -0000	1.4
  +++ SoapEnvVersions.h	24 Mar 2004 06:57:29 -0000	1.5
  @@ -71,7 +71,7 @@
   #define __SOAPENVVERSIONS_H_INCLUDED___
   
   #include <stdlib.h>
  -#include "../common/GDefine.h"
  +#include "GDefine.h"
   
   /*
    *Here SKW stands for SoapKeyWord. This is a internal naming convension
  
  
  
  1.5       +1 -1      ws-axis/c/include/axis/server/SoapHeader.h
  
  Index: SoapHeader.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/SoapHeader.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SoapHeader.h	13 Feb 2004 07:42:44 -0000	1.4
  +++ SoapHeader.h	24 Mar 2004 06:57:29 -0000	1.5
  @@ -65,7 +65,7 @@
   
   #include "HeaderBlock.h"
   #include "SoapEnvVersions.h"
  -#include "../common/ISoapHeader.h"
  +#include "ISoapHeader.h"
   
   /**
       @class SoapHeader
  
  
  
  1.11      +5 -5      ws-axis/c/include/axis/server/SoapSerializer.h
  
  Index: SoapSerializer.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/SoapSerializer.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SoapSerializer.h	23 Mar 2004 06:50:06 -0000	1.10
  +++ SoapSerializer.h	24 Mar 2004 06:57:29 -0000	1.11
  @@ -63,11 +63,11 @@
   #if !defined(AFX_SOAPSERIALIZER_H__C37229AD_BD54_430D_9619_E4574CF95334__INCLUDED_)
   #define AFX_SOAPSERIALIZER_H__C37229AD_BD54_430D_9619_E4574CF95334__INCLUDED_
   
  -#include "../common/IHandlerSoapSerializer.h"
  -#include "../common/BasicTypeSerializer.h"
  -#include "../common/AxisTime.h"
  -#include "../common/Packet.h"
  -#include "../wsdd/WSDDDefines.h"
  +#include "IHandlerSoapSerializer.h"
  +#include "BasicTypeSerializer.h"
  +#include "AxisTime.h"
  +#include "Packet.h"
  +#include "WSDDDefines.h"
   #include "SoapEnvVersions.h"
   
   class SoapEnvelope;
  
  
  
  1.5       +1 -1      ws-axis/c/include/axis/server/WSDDHandler.h
  
  Index: WSDDHandler.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/WSDDHandler.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WSDDHandler.h	23 Mar 2004 13:24:33 -0000	1.4
  +++ WSDDHandler.h	24 Mar 2004 06:57:29 -0000	1.5
  @@ -67,7 +67,7 @@
   #if !defined(AFX_WSDDHANDLER_H__51DC7642_033D_443B_9D97_5825C38B23DB__INCLUDED_)
   #define AFX_WSDDHANDLER_H__51DC7642_033D_443B_9D97_5825C38B23DB__INCLUDED_
   
  -#include "../common/GDefine.h"
  +#include "GDefine.h"
   #include <string>
   #include <map>
   #include <list>
  
  
  
  1.5       +1 -1      ws-axis/c/include/axis/server/XMLParser.h
  
  Index: XMLParser.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/server/XMLParser.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLParser.h	23 Mar 2004 06:41:22 -0000	1.4
  +++ XMLParser.h	24 Mar 2004 06:57:29 -0000	1.5
  @@ -58,7 +58,7 @@
    */
   
   #include "AnyElement.h"
  -#include <axis/common/Packet.h>
  +#include "Packet.h"
   
   #if !defined(__XMLPARSER_H_INCLUDED__)
   #define __XMLPARSER_H_INCLUDED__
  
  
  
  1.6       +2 -2      ws-axis/c/samples/client/interoptests/cbase/InteropTestPortType.h
  
  Index: InteropTestPortType.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cbase/InteropTestPortType.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InteropTestPortType.h	23 Mar 2004 05:30:07 -0000	1.5
  +++ InteropTestPortType.h	24 Mar 2004 06:57:30 -0000	1.6
  @@ -6,8 +6,8 @@
   #if !defined(__INTEROPTESTPORTTYPE_H__INCLUDED_)
   #define __INTEROPTESTPORTTYPE_H__INCLUDED_
   
  -#include <client/Call.h>
  -#include <axis/common/AxisWrapperAPI.h>
  +#include <axis/client/Call.h>
  +#include <axis/server/AxisWrapperAPI.h>
   #include "SOAPStruct_Array.h"
   #include "SOAPStruct.h"
   
  
  
  
  1.4       +1 -1      ws-axis/c/samples/client/interoptests/cbase/SOAPStruct.c
  
  Index: SOAPStruct.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cbase/SOAPStruct.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SOAPStruct.c	3 Feb 2004 13:04:46 -0000	1.3
  +++ SOAPStruct.c	24 Mar 2004 06:57:30 -0000	1.4
  @@ -6,7 +6,7 @@
   
   #include <malloc.h>
   #include "SOAPStruct.h"
  -#include <axis/common/AxisWrapperAPI.h>
  +#include <axis/server/AxisWrapperAPI.h>
   
   /**
    * This static method serialize a SOAPStruct type of object
  
  
  
  1.3       +1 -1      ws-axis/c/samples/client/interoptests/cbase/SOAPStruct.h
  
  Index: SOAPStruct.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/cbase/SOAPStruct.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPStruct.h	29 Jan 2004 08:08:32 -0000	1.2
  +++ SOAPStruct.h	24 Mar 2004 06:57:30 -0000	1.3
  @@ -7,7 +7,7 @@
   #if !defined(__SOAPSTRUCT_H__INCLUDED_)
   #define __SOAPSTRUCT_H__INCLUDED_
   
  -#include <axis/common/AxisUserAPI.h>
  +#include <axis/server/AxisUserAPI.h>
   
   /*Local name and the URI for the type*/
   static const char* Axis_URI_SOAPStruct = "http://soapinterop.org/xsd";
  
  
  
  1.3       +1 -1      ws-axis/c/samples/server/interoptests/cbase/InteropTestPortType.c
  
  Index: InteropTestPortType.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cbase/InteropTestPortType.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InteropTestPortType.c	3 Feb 2004 13:04:46 -0000	1.2
  +++ InteropTestPortType.c	24 Mar 2004 06:57:30 -0000	1.3
  @@ -3,7 +3,7 @@
    * InteropTestPortType.c
    *
    */
  -#include <axis/common/AxisUserAPI.h>
  +#include <axis/server/AxisUserAPI.h>
   #include "SOAPStruct_Array.h"
   #include "SOAPStruct.h"
   
  
  
  
  1.3       +2 -2      ws-axis/c/samples/server/interoptests/cbase/InteropTestPortTypeWrapper.h
  
  Index: InteropTestPortTypeWrapper.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cbase/InteropTestPortTypeWrapper.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InteropTestPortTypeWrapper.h	3 Feb 2004 13:04:46 -0000	1.2
  +++ InteropTestPortTypeWrapper.h	24 Mar 2004 06:57:30 -0000	1.3
  @@ -5,8 +5,8 @@
   #if !defined(__INTEROPTESTPORTTYPEWRAPPER_H__INCLUDED_)
   #define __INTEROPTESTPORTTYPEWRAPPER_H__INCLUDED_
   
  -#include <axis/common/IMessageData.h>
  -#include <axis/common/AxisWrapperAPI.h>
  +#include <axis/server/IMessageData.h>
  +#include <axis/server/AxisWrapperAPI.h>
   
   /*implementation of BasicHandler interface*/
   int AXISCALL InteropTestPortTypeWrapper_Invoke(void*p, void* mc);
  
  
  
  1.3       +1 -1      ws-axis/c/samples/server/interoptests/cbase/SOAPStruct.c
  
  Index: SOAPStruct.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cbase/SOAPStruct.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SOAPStruct.c	3 Feb 2004 13:04:46 -0000	1.2
  +++ SOAPStruct.c	24 Mar 2004 06:57:30 -0000	1.3
  @@ -6,7 +6,7 @@
   
   #include <malloc.h>
   #include "SOAPStruct.h"
  -#include <axis/common/AxisWrapperAPI.h>
  +#include <axis/server/AxisWrapperAPI.h>
   
   /**
    * This static method serialize a SOAPStruct type of object
  
  
  
  1.2       +1 -1      ws-axis/c/samples/server/interoptests/cbase/SOAPStruct.h
  
  Index: SOAPStruct.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/interoptests/cbase/SOAPStruct.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SOAPStruct.h	29 Jan 2004 08:08:33 -0000	1.1
  +++ SOAPStruct.h	24 Mar 2004 06:57:30 -0000	1.2
  @@ -7,7 +7,7 @@
   #if !defined(__SOAPSTRUCT_H__INCLUDED_)
   #define __SOAPSTRUCT_H__INCLUDED_
   
  -#include <axis/common/AxisUserAPI.h>
  +#include <axis/server/AxisUserAPI.h>
   
   /*Local name and the URI for the type*/
   static const char* Axis_URI_SOAPStruct = "http://soapinterop.org/xsd";
  
  
  
  1.31      +4 -4      ws-axis/c/src/client/Call.cpp
  
  Index: Call.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/Call.cpp,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Call.cpp	23 Mar 2004 07:38:59 -0000	1.30
  +++ Call.cpp	24 Mar 2004 06:57:30 -0000	1.31
  @@ -63,10 +63,10 @@
   //
   //////////////////////////////////////////////////////////////////////
   
  -#include <client/Call.h>
  -#include <axis/common/AxisConfig.h>
  -#include <client/transport/AxisTransport.h>
  -#include <client/transport/axis/Channel.hpp>
  +#include <axis/client/Call.h>
  +#include <axis/server/AxisConfig.h>
  +#include "transport/axis/AxisTransport.h"
  +#include "transport/axis/Channel.hpp"
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
   //////////////////////////////////////////////////////////////////////
  
  
  
  1.17      +2 -2      ws-axis/c/src/client/transport/axis/AxisTransport.cpp
  
  Index: AxisTransport.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/AxisTransport.cpp,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AxisTransport.cpp	23 Mar 2004 07:38:59 -0000	1.16
  +++ AxisTransport.cpp	24 Mar 2004 06:57:30 -0000	1.17
  @@ -62,8 +62,8 @@
   #pragma warning (disable : 4786)
   #endif
   
  -#include <client/transport/AxisTransport.h>
  -#include <client/transport/axis/TransportFactory.hpp>
  +#include "AxisTransport.h"
  +#include "TransportFactory.hpp"
   
   AxisTransport::AxisTransport(Ax_soapstream* pSoap)
   {
  
  
  
  1.2       +3 -3      ws-axis/c/src/client/transport/axis/AxisTransport.h
  
  Index: AxisTransport.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/AxisTransport.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AxisTransport.h	23 Mar 2004 05:38:58 -0000	1.1
  +++ AxisTransport.h	24 Mar 2004 06:57:30 -0000	1.2
  @@ -62,9 +62,9 @@
   #if !defined(_AXIS_AXIS_TRANSPORT_HPP)
   #define _AXIS_AXIS_TRANSPORT_HPP
   
  -#include <axis/common/Packet.h>
  -#include "axis/Sender.hpp"
  -#include "axis/Receiver.hpp"
  +#include <axis/server/Packet.h>
  +#include "Sender.hpp"
  +#include "Receiver.hpp"
   
   class AxisTransport
   {
  
  
  
  1.9       +3 -3      ws-axis/c/src/client/transport/axis/Channel.cpp
  
  Index: Channel.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/Channel.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Channel.cpp	23 Mar 2004 07:38:59 -0000	1.8
  +++ Channel.cpp	24 Mar 2004 06:57:31 -0000	1.9
  @@ -61,10 +61,10 @@
    * @author Damitha Kumarage (damitha@jkcsworld.com, damitha@opensource.lk)
    *
    */
  -#include <client/transport/axis/Platform.hpp>
  -#include <client/transport/axis/Channel.hpp>
  +#include "Platform.hpp"
  +#include "Channel.hpp"
   #include <iostream>
  -#include <client/transport/axis/Transport.hpp>
  +#include "Transport.hpp"
   
   using namespace std;
   /**
  
  
  
  1.18      +3 -3      ws-axis/c/src/client/transport/axis/HttpTransport.cpp
  
  Index: HttpTransport.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/HttpTransport.cpp,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- HttpTransport.cpp	23 Mar 2004 07:38:59 -0000	1.17
  +++ HttpTransport.cpp	24 Mar 2004 06:57:31 -0000	1.18
  @@ -64,10 +64,10 @@
    */
   
   
  -#include <client/transport/axis/Platform.hpp>
  -#include <client/transport/axis/HttpTransport.hpp>
  +#include "Platform.hpp"
  +#include "HttpTransport.hpp"
   #include <iostream>
  -#include <axis/common/AxisException.h>
  +#include <axis/server/AxisException.h>
   
   using namespace std;
   
  
  
  
  1.10      +3 -3      ws-axis/c/src/client/transport/axis/Receiver.cpp
  
  Index: Receiver.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/Receiver.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Receiver.cpp	23 Mar 2004 07:38:59 -0000	1.9
  +++ Receiver.cpp	24 Mar 2004 06:57:31 -0000	1.10
  @@ -62,9 +62,9 @@
    *
    */
   
  -#include <client/transport/axis/Platform.hpp>
  -#include <client/transport/axis/Receiver.hpp>
  -#include <client/transport/axis/HttpTransport.hpp>
  +#include "Platform.hpp"
  +#include "Receiver.hpp"
  +#include "HttpTransport.hpp"
   #include <iostream>
   
   
  
  
  
  1.2       +1 -1      ws-axis/c/src/client/transport/axis/Receiver.hpp
  
  Index: Receiver.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/Receiver.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Receiver.hpp	23 Mar 2004 05:38:58 -0000	1.1
  +++ Receiver.hpp	24 Mar 2004 06:57:31 -0000	1.2
  @@ -67,7 +67,7 @@
   #if !defined(_AXIS_RECEIVER_HPP)
   #define _AXIS_RECEIVER_HPP
   
  -#include <axis/common/AxisException.h>
  +#include <axis/server/AxisException.h>
   
   #include "Transport.hpp"
   
  
  
  
  1.2       +4 -4      ws-axis/c/src/client/transport/axis/SecureChannel.cpp
  
  Index: SecureChannel.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/SecureChannel.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SecureChannel.cpp	27 Jan 2004 05:43:49 -0000	1.1
  +++ SecureChannel.cpp	24 Mar 2004 06:57:31 -0000	1.2
  @@ -1,9 +1,9 @@
   #include <iostream>
   #include <errno.h>
   
  -#include <axis/client/transport/axis/Platform.hpp>
  -#include <axis/client/transport/axis/SecureChannel.hpp>
  -#include <axis/client/transport/axis/Transport.hpp>
  +#include "Platform.hpp"
  +#include "SecureChannel.hpp"
  +#include "Transport.hpp"
   
   
   using namespace std;
  @@ -415,4 +415,4 @@
   #ifdef _DEBUG
   	std::cerr << err << std::endl;
   #endif
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2       +1 -1      ws-axis/c/src/client/transport/axis/SecureChannel.hpp
  
  Index: SecureChannel.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/SecureChannel.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SecureChannel.hpp	23 Mar 2004 05:38:58 -0000	1.1
  +++ SecureChannel.hpp	24 Mar 2004 06:57:31 -0000	1.2
  @@ -67,7 +67,7 @@
   #if !defined(_AXIS_SECURECHANNEL_HPP)
   #define _AXIS_SECURECHANNEL_HPP
   
  -#include <axis/common/AxisException.h>
  +#include <axis/server/AxisException.h>
   #include "Channel.hpp"
   #include <openssl/ssl.h>
   #include <openssl/err.h>
  
  
  
  1.8       +2 -2      ws-axis/c/src/client/transport/axis/Sender.cpp
  
  Index: Sender.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/Sender.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Sender.cpp	23 Mar 2004 07:38:59 -0000	1.7
  +++ Sender.cpp	24 Mar 2004 06:57:31 -0000	1.8
  @@ -61,8 +61,8 @@
    * @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
    *
    */
  -#include <client/transport/axis/Platform.hpp>
  -#include <client/transport/axis/Sender.hpp>
  +#include "Platform.hpp"
  +#include "Sender.hpp"
   
   
   Sender::Sender(Transport *pTr)
  
  
  
  1.3       +1 -1      ws-axis/c/src/client/transport/axis/Sender.hpp
  
  Index: Sender.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/Sender.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Sender.hpp	23 Mar 2004 07:38:59 -0000	1.2
  +++ Sender.hpp	24 Mar 2004 06:57:31 -0000	1.3
  @@ -67,7 +67,7 @@
   #if !defined(_AXIS_SENDER_HPP)
   #define _AXIS_SENDER_HPP
   
  -#include "../../../axis/common/AxisException.h"
  +#include "axis/server/AxisException.h"
   
   #include "Transport.hpp"
   
  
  
  
  1.6       +2 -2      ws-axis/c/src/client/transport/axis/Transport.cpp
  
  Index: Transport.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/Transport.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Transport.cpp	23 Mar 2004 07:38:59 -0000	1.5
  +++ Transport.cpp	24 Mar 2004 06:57:31 -0000	1.6
  @@ -56,8 +56,8 @@
    */
   
   
  -#include <client/transport/axis/Transport.hpp>
  -#include <client/transport/axis/Platform.hpp>
  +#include "Transport.hpp"
  +#include "Platform.hpp"
   
   Transport::Transport()
   {
  
  
  
  1.7       +3 -3      ws-axis/c/src/client/transport/axis/TransportFactory.cpp
  
  Index: TransportFactory.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/TransportFactory.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TransportFactory.cpp	23 Mar 2004 07:38:59 -0000	1.6
  +++ TransportFactory.cpp	24 Mar 2004 06:57:31 -0000	1.7
  @@ -56,9 +56,9 @@
    */
   
   
  -#include <client/transport/axis/Platform.hpp>
  -#include <client/transport/axis/TransportFactory.hpp>
  -#include <client/transport/axis/HttpTransport.hpp>
  +#include "Platform.hpp"
  +#include "TransportFactory.hpp"
  +#include "HttpTransport.hpp"
   
   
   Transport* TransportFactory::GetTransport(Url& url, bool secure)
  
  
  
  1.5       +2 -2      ws-axis/c/src/client/transport/axis/Url.cpp
  
  Index: Url.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/client/transport/axis/Url.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Url.cpp	23 Mar 2004 07:38:59 -0000	1.4
  +++ Url.cpp	24 Mar 2004 06:57:31 -0000	1.5
  @@ -63,8 +63,8 @@
    */
   
   
  -#include <client/transport/axis/Platform.hpp>
  -#include <client/transport/axis/Url.hpp>
  +#include "Platform.hpp"
  +#include "Url.hpp"
   #include <ctype.h>
   #include <iostream>
   using namespace std;
  
  
  
  1.21      +3 -3      ws-axis/c/src/common/ArrayBean.cpp
  
  Index: ArrayBean.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/ArrayBean.cpp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ArrayBean.cpp	23 Mar 2004 07:04:50 -0000	1.20
  +++ ArrayBean.cpp	24 Mar 2004 06:57:31 -0000	1.21
  @@ -61,10 +61,10 @@
   // ArrayBean.cpp: implementation of the ArrayBean class.
   //
   //////////////////////////////////////////////////////////////////////
  -#include <axis/common/Param.h>
  +#include <axis/server/Param.h>
   #include "ArrayBean.h"
  -#include <axis/common/BasicTypeSerializer.h>
  -#include <axis/engine/AxisEngine.h>
  +#include <axis/server/BasicTypeSerializer.h>
  +#include <axis/server/AxisEngine.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.11      +2 -2      ws-axis/c/src/common/ArrayBean.h
  
  Index: ArrayBean.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/ArrayBean.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ArrayBean.h	23 Mar 2004 05:30:07 -0000	1.10
  +++ ArrayBean.h	24 Mar 2004 06:57:31 -0000	1.11
  @@ -64,8 +64,8 @@
   #define AFX_ARRAYBEAN_H__374BEDCF_E850_4907_9CF0_F2EBC61E54CF__INCLUDED_
   
   #include "IArrayBean.h"
  -#include <axis/common/IParam.h>
  -#include <axis/common/BasicTypeSerializer.h>
  +#include <axis/server/IParam.h>
  +#include <axis/server/BasicTypeSerializer.h>
   
   #include <list>
   using namespace std;
  
  
  
  1.13      +2 -2      ws-axis/c/src/common/AxisConfig.cpp
  
  Index: AxisConfig.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/AxisConfig.cpp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AxisConfig.cpp	23 Mar 2004 05:30:07 -0000	1.12
  +++ AxisConfig.cpp	24 Mar 2004 06:57:31 -0000	1.13
  @@ -59,8 +59,8 @@
    *
    */
   
  -#include <axis/common/AxisConfig.h>
  -#include <axis/common/GDefine.h>
  +#include <axis/server/AxisConfig.h>
  +#include <axis/server/GDefine.h>
   #include "AxisUtils.h"
   #include <stdlib.h>
   #include <stdio.h>
  
  
  
  1.12      +1 -1      ws-axis/c/src/common/AxisException.cpp
  
  Index: AxisException.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/AxisException.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AxisException.cpp	23 Oct 2003 08:26:33 -0000	1.11
  +++ AxisException.cpp	24 Mar 2004 06:57:31 -0000	1.12
  @@ -59,7 +59,7 @@
    *
    */
   
  -#include <axis/common/AxisException.h>
  +#include <axis/server/AxisException.h>
   
   #include <exception>
   using namespace std;
  
  
  
  1.7       +1 -1      ws-axis/c/src/common/AxisSocketUtils.cpp
  
  Index: AxisSocketUtils.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/AxisSocketUtils.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AxisSocketUtils.cpp	23 Mar 2004 05:30:07 -0000	1.6
  +++ AxisSocketUtils.cpp	24 Mar 2004 06:57:31 -0000	1.7
  @@ -64,7 +64,7 @@
   //////////////////////////////////////////////////////////////////////
   
   #include "AxisSocketUtils.h"
  -#include <axis/common/GDefine.h>
  +#include <axis/server/GDefine.h>
   #include <stdio.h>
   #if defined(WIN32) && !defined(CYGWIN)
   #include <winsock.h>    /* for socket(),... */
  
  
  
  1.17      +1 -1      ws-axis/c/src/common/AxisTime.cpp
  
  Index: AxisTime.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/AxisTime.cpp,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AxisTime.cpp	23 Mar 2004 07:04:50 -0000	1.16
  +++ AxisTime.cpp	24 Mar 2004 06:57:31 -0000	1.17
  @@ -60,7 +60,7 @@
    */
   #include <stdio.h>
   
  -#include <axis/common/AxisTime.h>
  +#include <axis/server/AxisTime.h>
   #include "AxisUtils.h"
   
   #define TIMEBUFFSIZE 80
  
  
  
  1.13      +3 -3      ws-axis/c/src/common/AxisTrace.cpp
  
  Index: AxisTrace.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.cpp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AxisTrace.cpp	23 Mar 2004 05:30:07 -0000	1.12
  +++ AxisTrace.cpp	24 Mar 2004 06:57:31 -0000	1.13
  @@ -59,12 +59,12 @@
    *
    */
   
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   #include <time.h>
   #include <stdio.h>
   #include "AxisUtils.h"
  -#include <axis/common/GDefine.h>
  -#include <axis/common/AxisConfig.h>
  +#include <axis/server/GDefine.h>
  +#include <axis/server/AxisConfig.h>
   
   
   extern AxisConfig* g_pConfig;
  
  
  
  1.14      +1 -1      ws-axis/c/src/common/AxisUtils.cpp
  
  Index: AxisUtils.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/AxisUtils.cpp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AxisUtils.cpp	23 Mar 2004 05:30:07 -0000	1.13
  +++ AxisUtils.cpp	24 Mar 2004 06:57:31 -0000	1.14
  @@ -65,7 +65,7 @@
   //////////////////////////////////////////////////////////////////////
   
   #include "AxisUtils.h"
  -#include <axis/common/GDefine.h>
  +#include <axis/server/GDefine.h>
   
   AxisXMLCh AxisUtils::m_Buffer[CONVERT_BUFFER_SIZE]; 
   
  
  
  
  1.12      +1 -1      ws-axis/c/src/common/AxisUtils.h
  
  Index: AxisUtils.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/AxisUtils.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AxisUtils.h	23 Mar 2004 05:30:07 -0000	1.11
  +++ AxisUtils.h	24 Mar 2004 06:57:31 -0000	1.12
  @@ -62,7 +62,7 @@
   #if !defined(AFX_AXISUTILS_H__B5175A8C_0210_417D_BA43_6AAAF7E03551__INCLUDED_)
   #define AFX_AXISUTILS_H__B5175A8C_0210_417D_BA43_6AAAF7E03551__INCLUDED_
   
  -#include <axis/common/GDefine.h>
  +#include <axis/server/GDefine.h>
   
   #include <string>
   using namespace std;
  
  
  
  1.22      +1 -1      ws-axis/c/src/common/BasicTypeSerializer.cpp
  
  Index: BasicTypeSerializer.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/BasicTypeSerializer.cpp,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- BasicTypeSerializer.cpp	19 Mar 2004 09:54:31 -0000	1.21
  +++ BasicTypeSerializer.cpp	24 Mar 2004 06:57:31 -0000	1.22
  @@ -66,7 +66,7 @@
   //////////////////////////////////////////////////////////////////////
   
   #include <stdio.h>
  -#include <axis/common/BasicTypeSerializer.h>
  +#include <axis/server/BasicTypeSerializer.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.5       +1 -1      ws-axis/c/src/common/GDefine.cpp
  
  Index: GDefine.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/GDefine.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GDefine.cpp	20 Oct 2003 03:24:29 -0000	1.4
  +++ GDefine.cpp	24 Mar 2004 06:57:31 -0000	1.5
  @@ -59,5 +59,5 @@
    *
    */
   
  -#include <axis/common/GDefine.h>
  +#include <axis/server/GDefine.h>
   
  
  
  
  1.8       +2 -2      ws-axis/c/src/common/IArrayBean.h
  
  Index: IArrayBean.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/IArrayBean.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- IArrayBean.h	23 Mar 2004 05:30:07 -0000	1.7
  +++ IArrayBean.h	24 Mar 2004 06:57:31 -0000	1.8
  @@ -61,8 +61,8 @@
   #if !defined(AFX_IARRAYBEAN_H__6E27008D_DCA0_4F28_AC82_FEEBE1A1CBBB__INCLUDED_)
   #define AFX_IARRAYBEAN_H__6E27008D_DCA0_4F28_AC82_FEEBE1A1CBBB__INCLUDED_
   
  -#include <axis/common/GDefine.h>
  -#include <axis/common/AxisUserAPI.h>
  +#include <axis/server/GDefine.h>
  +#include <axis/server/AxisUserAPI.h>
   /**
       @class IArrayBean
       @brief interface for the IArrayBean class.
  
  
  
  1.4       +1 -1      ws-axis/c/src/common/IDeployerUtils.h
  
  Index: IDeployerUtils.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/IDeployerUtils.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IDeployerUtils.h	23 Mar 2004 05:30:07 -0000	1.3
  +++ IDeployerUtils.h	24 Mar 2004 06:57:31 -0000	1.4
  @@ -74,7 +74,7 @@
   #pragma once
   #endif // _MSC_VER > 1000
   
  -#include <axis/common/AxisUserAPI.h>
  +#include <axis/server/AxisUserAPI.h>
   /**
       @class IDeployerUtils
       @brief interface for the IDeployerUtils class.
  
  
  
  1.19      +1 -1      ws-axis/c/src/common/MessageData.cpp
  
  Index: MessageData.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/MessageData.cpp,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- MessageData.cpp	23 Mar 2004 05:30:07 -0000	1.18
  +++ MessageData.cpp	24 Mar 2004 06:57:31 -0000	1.19
  @@ -65,7 +65,7 @@
   //
   //////////////////////////////////////////////////////////////////////
   
  -#include <axis/common/MessageData.h>
  +#include <axis/server/MessageData.h>
   #include "IDeployerUtils.h"
   #include "../wsdd/WSDDDeployment.h"
   //////////////////////////////////////////////////////////////////////
  
  
  
  1.12      +3 -3      ws-axis/c/src/common/Packet.cpp
  
  Index: Packet.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/Packet.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Packet.cpp	14 Jan 2004 09:37:56 -0000	1.11
  +++ Packet.cpp	24 Mar 2004 06:57:31 -0000	1.12
  @@ -59,11 +59,11 @@
    *
    */
   
  -#include <axis/common/Packet.h>
  +#include <axis/server/Packet.h>
   #include <string.h>
   #include <stdlib.h>
   #include <stdio.h>
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   extern AxisTrace* g_pAT;
   
   extern "C"
  @@ -163,4 +163,4 @@
   	return NULL;
   }
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.31      +3 -3      ws-axis/c/src/common/Param.cpp
  
  Index: Param.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/Param.cpp,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Param.cpp	23 Mar 2004 07:04:50 -0000	1.30
  +++ Param.cpp	24 Mar 2004 06:57:31 -0000	1.31
  @@ -65,10 +65,10 @@
   //
   //////////////////////////////////////////////////////////////////////
   
  -#include <axis/engine/AxisEngine.h>
  -#include <axis/common/Param.h>
  +#include <axis/server/AxisEngine.h>
  +#include <axis/server/Param.h>
   #include "ArrayBean.h"
  -#include <axis/common/BasicTypeSerializer.h>
  +#include <axis/server/BasicTypeSerializer.h>
   #include <stdlib.h>
   #include <stdio.h>
   #include "AxisUtils.h"
  
  
  
  1.12      +1 -1      ws-axis/c/src/common/TypeMapping.cpp
  
  Index: TypeMapping.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/TypeMapping.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TypeMapping.cpp	23 Mar 2004 05:30:07 -0000	1.11
  +++ TypeMapping.cpp	24 Mar 2004 06:57:31 -0000	1.12
  @@ -65,7 +65,7 @@
   //
   //////////////////////////////////////////////////////////////////////
   
  -#include <axis/common/TypeMapping.h>
  +#include <axis/server/TypeMapping.h>
   #include "AxisUtils.h"
   #define __TRC(X) AxisUtils::Convert(X)
   
  
  
  
  1.6       +1 -1      ws-axis/c/src/common/WrapperClassHandler.h
  
  Index: WrapperClassHandler.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/common/WrapperClassHandler.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WrapperClassHandler.h	23 Mar 2004 05:30:07 -0000	1.5
  +++ WrapperClassHandler.h	24 Mar 2004 06:57:31 -0000	1.6
  @@ -60,7 +60,7 @@
   #if !defined(__WRAPPERCLASSHANDLER_INCLUDED__)
   #define __WRAPPERCLASSHANDLER_INCLUDED__
   
  -#include <axis/common/BasicHandler.h>
  +#include <axis/server/BasicHandler.h>
   /**
       @class WrapperClassHandler
       @brief
  
  
  
  1.6       +1 -1      ws-axis/c/src/engine/AppScopeHandlerPool.h
  
  Index: AppScopeHandlerPool.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/AppScopeHandlerPool.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AppScopeHandlerPool.h	23 Mar 2004 05:30:08 -0000	1.5
  +++ AppScopeHandlerPool.h	24 Mar 2004 06:57:32 -0000	1.6
  @@ -59,7 +59,7 @@
   #define AFX_APPSCOPEHANDLERPOOL_H__A94BE166_F35A_40B9_8B17_9ED3D1886503__INCLUDED_
   
   #include "SharedObject.h"
  -#include <axis/common/BasicHandler.h>
  +#include <axis/server/BasicHandler.h>
   
   #include <map>
   #include <list>
  
  
  
  1.36      +5 -5      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.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Axis.cpp	23 Mar 2004 05:30:08 -0000	1.35
  +++ Axis.cpp	24 Mar 2004 06:57:32 -0000	1.36
  @@ -73,11 +73,11 @@
   #include <stdio.h>
   #include <stdlib.h>
   #include <malloc.h>
  -#include <axis/common/Packet.h>
  +#include <axis/server/Packet.h>
   #include <string>
   #include <map>
   
  -#include "../soap/SoapFault.h"
  +#include <axis/server/SoapFault.h>
   #include "../soap/URIMapping.h"
   #include "../soap/SoapKeywordMapping.h"
   #include "HandlerLoader.h"
  @@ -89,11 +89,11 @@
   #include "DeserializerPool.h"
   #include "../wsdd/WSDDDeployment.h"
   #include "../common/AxisUtils.h"
  -#include <axis/common/AxisConfig.h>
  +#include <axis/server/AxisConfig.h>
   #include "../wsdd/WSDDKeywords.h"
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   
  -#include <client/Call.h>
  +#include <axis/client/Call.h>
   
   #define BYTESTOREAD 64
   //the relative location of the wsdl files hardcoded
  
  
  
  1.28      +2 -2      ws-axis/c/src/engine/AxisEngine.cpp
  
  Index: AxisEngine.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngine.cpp,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- AxisEngine.cpp	23 Mar 2004 05:30:08 -0000	1.27
  +++ AxisEngine.cpp	24 Mar 2004 06:57:32 -0000	1.28
  @@ -61,13 +61,13 @@
    *
    */
   
  -#include <axis/engine/AxisEngine.h>
  +#include <axis/server/AxisEngine.h>
   #include <stdio.h>
   
   #include "HandlerPool.h"
   #include "DeserializerPool.h"
   #include "SerializerPool.h"
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   extern AxisTrace* g_pAT;
   
   extern DeserializerPool* g_pDeserializerPool;
  
  
  
  1.13      +2 -2      ws-axis/c/src/engine/ClientAxisEngine.cpp
  
  Index: ClientAxisEngine.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/ClientAxisEngine.cpp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ClientAxisEngine.cpp	23 Mar 2004 05:30:08 -0000	1.12
  +++ ClientAxisEngine.cpp	24 Mar 2004 06:57:32 -0000	1.13
  @@ -2,10 +2,10 @@
   //
   //////////////////////////////////////////////////////////////////////
   
  -#include <axis/engine/ClientAxisEngine.h>
  +#include <axis/server/ClientAxisEngine.h>
   #include "../wsdd/WSDDDeployment.h"
   #include "HandlerPool.h"
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   extern AxisTrace* g_pAT;
   
   extern WSDDDeployment* g_pWSDDDeployment;
  
  
  
  1.9       +1 -1      ws-axis/c/src/engine/DeserializerPool.cpp
  
  Index: DeserializerPool.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/DeserializerPool.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DeserializerPool.cpp	23 Mar 2004 05:30:08 -0000	1.8
  +++ DeserializerPool.cpp	24 Mar 2004 06:57:32 -0000	1.9
  @@ -64,7 +64,7 @@
   //////////////////////////////////////////////////////////////////////
   
   #include "DeserializerPool.h"
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   extern AxisTrace* g_pAT;
   
   //////////////////////////////////////////////////////////////////////
  
  
  
  1.6       +2 -2      ws-axis/c/src/engine/DeserializerPool.h
  
  Index: DeserializerPool.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/DeserializerPool.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DeserializerPool.h	23 Mar 2004 05:30:08 -0000	1.5
  +++ DeserializerPool.h	24 Mar 2004 06:57:32 -0000	1.6
  @@ -62,8 +62,8 @@
   #define AFX_DESERIALIZERPOOL_H__702116EF_3134_4ED4_8252_BEC1FC30E825__INCLUDED_
   
   #include "SharedObject.h"
  -#include <axis/soap/SoapDeSerializer.h>
  -#include <axis/common/GDefine.h>
  +#include <axis/server/SoapDeSerializer.h>
  +#include <axis/server/GDefine.h>
   #include <list>
   
   using namespace std;
  
  
  
  1.14      +2 -2      ws-axis/c/src/engine/HandlerChain.cpp
  
  Index: HandlerChain.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/HandlerChain.cpp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- HandlerChain.cpp	13 Feb 2004 07:47:54 -0000	1.13
  +++ HandlerChain.cpp	24 Mar 2004 06:57:32 -0000	1.14
  @@ -65,8 +65,8 @@
   //
   //////////////////////////////////////////////////////////////////////
   
  -#include <axis/engine/HandlerChain.h>
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/HandlerChain.h>
  +#include <axis/server/AxisTrace.h>
   extern AxisTrace* g_pAT;
   
   //////////////////////////////////////////////////////////////////////
  
  
  
  1.22      +1 -1      ws-axis/c/src/engine/HandlerLoader.cpp
  
  Index: HandlerLoader.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/HandlerLoader.cpp,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- HandlerLoader.cpp	23 Mar 2004 05:30:08 -0000	1.21
  +++ HandlerLoader.cpp	24 Mar 2004 06:57:32 -0000	1.22
  @@ -69,7 +69,7 @@
   #include <stdio.h>
   #include "../common/AxisUtils.h"
   #include "../wsdd/WSDDDeployment.h"
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   extern AxisTrace* g_pAT;
   
   extern WSDDDeployment* g_pWSDDDeployment;
  
  
  
  1.6       +2 -2      ws-axis/c/src/engine/HandlerLoader.h
  
  Index: HandlerLoader.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/HandlerLoader.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HandlerLoader.h	23 Mar 2004 05:30:08 -0000	1.5
  +++ HandlerLoader.h	24 Mar 2004 06:57:32 -0000	1.6
  @@ -60,8 +60,8 @@
   #if !defined(__HANDLERLOADER_H_INCLUDED__)
   #define __HANDLERLOADER_H_INCLUDED__
   
  -#include <axis/common/MessageData.h>
  -#include <axis/common/GDefine.h>
  +#include <axis/server/MessageData.h>
  +#include <axis/server/GDefine.h>
   #include "../common/WrapperClassHandler.h"
   #include "SharedObject.h"
   
  
  
  
  1.22      +1 -1      ws-axis/c/src/engine/HandlerPool.cpp
  
  Index: HandlerPool.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/HandlerPool.cpp,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- HandlerPool.cpp	23 Mar 2004 07:04:50 -0000	1.21
  +++ HandlerPool.cpp	24 Mar 2004 06:57:32 -0000	1.22
  @@ -70,7 +70,7 @@
   #include "RequestScopeHandlerPool.h"
   #include "SessionScopeHandlerPool.h"
   #include "../wsdd/WSDDDeployment.h"
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   extern AxisTrace* g_pAT;
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.7       +4 -4      ws-axis/c/src/engine/HandlerPool.h
  
  Index: HandlerPool.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/HandlerPool.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HandlerPool.h	23 Mar 2004 05:30:08 -0000	1.6
  +++ HandlerPool.h	24 Mar 2004 06:57:32 -0000	1.7
  @@ -64,11 +64,11 @@
   #if !defined(AFX_HANDLERPOOL_H__6C2A4C96_7115_43C6_9EFA_CDAC9247D109__INCLUDED_)
   #define AFX_HANDLERPOOL_H__6C2A4C96_7115_43C6_9EFA_CDAC9247D109__INCLUDED_
   
  -#include <axis/wsdd/WSDDHandler.h>
  -#include <axis/wsdd/WSDDService.h>
  -#include <axis/common/BasicHandler.h>
  +#include <axis/server/WSDDHandler.h>
  +#include <axis/server/WSDDService.h>
  +#include <axis/server/BasicHandler.h>
   #include "HandlerLoader.h"
  -#include <axis/engine/HandlerChain.h>
  +#include <axis/server/HandlerChain.h>
   #include "SharedObject.h"
   
   #include <list>
  
  
  
  1.6       +1 -1      ws-axis/c/src/engine/RequestScopeHandlerPool.h
  
  Index: RequestScopeHandlerPool.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/RequestScopeHandlerPool.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RequestScopeHandlerPool.h	23 Mar 2004 05:30:08 -0000	1.5
  +++ RequestScopeHandlerPool.h	24 Mar 2004 06:57:32 -0000	1.6
  @@ -59,7 +59,7 @@
   #define AFX_REQUESTSCOPEHANDLERPOOL_H__310FD607_517E_4644_8922_0B1CFDE9E5BE__INCLUDED_
   
   #include "SharedObject.h"
  -#include <axis/common/BasicHandler.h>
  +#include <axis/server/BasicHandler.h>
   
   #include <map>
   #include <list>
  
  
  
  1.10      +1 -1      ws-axis/c/src/engine/SerializerPool.cpp
  
  Index: SerializerPool.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/SerializerPool.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SerializerPool.cpp	23 Mar 2004 05:30:08 -0000	1.9
  +++ SerializerPool.cpp	24 Mar 2004 06:57:32 -0000	1.10
  @@ -64,7 +64,7 @@
   //////////////////////////////////////////////////////////////////////
   
   #include "SerializerPool.h"
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   extern AxisTrace* g_pAT;
   
   //////////////////////////////////////////////////////////////////////
  
  
  
  1.6       +2 -2      ws-axis/c/src/engine/SerializerPool.h
  
  Index: SerializerPool.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/SerializerPool.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SerializerPool.h	23 Mar 2004 05:30:08 -0000	1.5
  +++ SerializerPool.h	24 Mar 2004 06:57:32 -0000	1.6
  @@ -62,8 +62,8 @@
   #define AFX_SERIALIZERPOOL_H__45283A27_9196_4ACF_952F_88C564A4BD40__INCLUDED_
   
   #include "SharedObject.h"
  -#include <axis/soap/SoapSerializer.h>
  -#include <axis/common/GDefine.h>
  +#include <axis/server/SoapSerializer.h>
  +#include <axis/server/GDefine.h>
   #include <list>
   
   using namespace std;
  
  
  
  1.19      +2 -2      ws-axis/c/src/engine/ServerAxisEngine.cpp
  
  Index: ServerAxisEngine.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/ServerAxisEngine.cpp,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ServerAxisEngine.cpp	23 Mar 2004 05:30:08 -0000	1.18
  +++ ServerAxisEngine.cpp	24 Mar 2004 06:57:32 -0000	1.19
  @@ -6,11 +6,11 @@
   #include "../soap/SoapMethod.h"
   #include "ServerAxisEngine.h"
   #include <stdio.h>
  -#include <axis/common/AxisException.h>
  +#include <axis/server/AxisException.h>
   #include "../common/AxisUtils.h"
   #include "../wsdd/WSDDDeployment.h"
   #include "HandlerPool.h"
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   extern AxisTrace* g_pAT;
   
   extern HandlerPool* g_pHandlerPool;
  
  
  
  1.5       +1 -1      ws-axis/c/src/engine/ServerAxisEngine.h
  
  Index: ServerAxisEngine.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/ServerAxisEngine.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServerAxisEngine.h	23 Mar 2004 05:30:08 -0000	1.4
  +++ ServerAxisEngine.h	24 Mar 2004 06:57:32 -0000	1.5
  @@ -5,7 +5,7 @@
   #if !defined(AFX_SERVERAXISENGINE_H__8E421346_17A9_47EF_9003_6DC9C6F7787A__INCLUDED_)
   #define AFX_SERVERAXISENGINE_H__8E421346_17A9_47EF_9003_6DC9C6F7787A__INCLUDED_
   
  -#include <axis/engine/AxisEngine.h>
  +#include <axis/server/AxisEngine.h>
   /**
       @class ServerAxisEngine
       @brief interface for the ServerAxisEngine class.
  
  
  
  1.6       +1 -1      ws-axis/c/src/engine/SessionScopeHandlerPool.h
  
  Index: SessionScopeHandlerPool.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/SessionScopeHandlerPool.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SessionScopeHandlerPool.h	23 Mar 2004 05:30:08 -0000	1.5
  +++ SessionScopeHandlerPool.h	24 Mar 2004 06:57:32 -0000	1.6
  @@ -65,7 +65,7 @@
   #define SESSIONLESSHANDLERS	"0aaaaa"
   
   #include "SharedObject.h"
  -#include <axis/common/BasicHandler.h>
  +#include <axis/server/BasicHandler.h>
   
   #include <map>
   #include <list>
  
  
  
  1.11      +1 -1      ws-axis/c/src/engine/SharedObject.h
  
  Index: SharedObject.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/SharedObject.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SharedObject.h	23 Mar 2004 05:30:08 -0000	1.10
  +++ SharedObject.h	24 Mar 2004 06:57:32 -0000	1.11
  @@ -64,7 +64,7 @@
   #if !defined(AFX_SHAREDOBJECT_H__0805D25C_2F7E_4B19_BECE_0A8BFE9F0830__INCLUDED_)
   #define AFX_SHAREDOBJECT_H__0805D25C_2F7E_4B19_BECE_0A8BFE9F0830__INCLUDED_
   
  -#include <axis/common/GDefine.h>
  +#include <axis/server/GDefine.h>
   #ifdef WIN32
   #else //Linux
   #include "pthread.h"
  
  
  
  1.23      +7 -7      ws-axis/c/src/server/apache/mod_axis.c
  
  Index: mod_axis.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/apache/mod_axis.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_axis.c	23 Mar 2004 12:35:05 -0000	1.22
  +++ mod_axis.c	24 Mar 2004 06:57:32 -0000	1.23
  @@ -1,10 +1,10 @@
  -#include <server/apache1_3/httpd.h>
  -#include <server/apache1_3/http_config.h>
  -#include <server/apache1_3/http_core.h>
  -#include <server/apache1_3/http_log.h>
  -#include <server/apache1_3/http_protocol.h>
  -#include <server/apache1_3/http_main.h>
  -#include <axis/common/Packet.h>
  +#include <apache1_3/httpd.h>
  +#include <apache1_3/http_config.h>
  +#include <apache1_3/http_core.h>
  +#include <apache1_3/http_log.h>
  +#include <apache1_3/http_protocol.h>
  +#include <apache1_3/http_main.h>
  +#include <axis/server/Packet.h>
   #include <string.h>
   #include <malloc.h>
   
  
  
  
  1.7       +8 -8      ws-axis/c/src/server/apache2/mod_axis2.c
  
  Index: mod_axis2.c
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/apache2/mod_axis2.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_axis2.c	23 Mar 2004 12:35:05 -0000	1.6
  +++ mod_axis2.c	24 Mar 2004 06:57:32 -0000	1.7
  @@ -65,14 +65,14 @@
   #define PATH_MAX 4096
   #endif
   
  -#include <server/apache2_0/httpd.h>
  -#include <server/apache2_0/http_config.h>
  -#include <server/apache2_0/http_core.h>
  -#include <server/apache2_0/http_protocol.h>
  -#include <server/apache2_0/http_log.h>
  -#include <server/apache2_0/ap_compat.h>
  -#include <server/apache2_0/apr_tables.h>
  -#include <axis/common/Packet.h>
  +#include <apache2_0/httpd.h>
  +#include <apache2_0/http_config.h>
  +#include <apache2_0/http_core.h>
  +#include <apache2_0/http_protocol.h>
  +#include <apache2_0/http_log.h>
  +#include <apache2_0/ap_compat.h>
  +#include <apache2_0/apr_tables.h>
  +#include <axis/server/Packet.h>
   #include <malloc.h>
   
   #define AXIS_URI_EXTENSION "/axis"
  
  
  
  1.13      +3 -3      ws-axis/c/src/soap/Attribute.cpp
  
  Index: Attribute.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/Attribute.cpp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Attribute.cpp	28 Feb 2004 06:27:56 -0000	1.12
  +++ Attribute.cpp	24 Mar 2004 06:57:33 -0000	1.13
  @@ -69,9 +69,9 @@
   #pragma warning (disable : 4786)
   #endif
   
  -#include <axis/soap/Attribute.h>
  -#include <axis/common/GDefine.h>
  -#include <axis/soap/SoapSerializer.h>
  +#include <axis/server/Attribute.h>
  +#include <axis/server/GDefine.h>
  +#include <axis/server/SoapSerializer.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.4       +1 -1      ws-axis/c/src/soap/BasicNode.cpp
  
  Index: BasicNode.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/BasicNode.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BasicNode.cpp	20 Oct 2003 03:25:19 -0000	1.3
  +++ BasicNode.cpp	24 Mar 2004 06:57:33 -0000	1.4
  @@ -65,7 +65,7 @@
   //
   //////////////////////////////////////////////////////////////////////
   
  -#include <axis/soap/BasicNode.h>
  +#include <axis/server/BasicNode.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.11      +3 -3      ws-axis/c/src/soap/CharacterElement.cpp
  
  Index: CharacterElement.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/CharacterElement.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CharacterElement.cpp	8 Mar 2004 13:22:02 -0000	1.10
  +++ CharacterElement.cpp	24 Mar 2004 06:57:33 -0000	1.11
  @@ -65,9 +65,9 @@
   //
   //////////////////////////////////////////////////////////////////////
   
  -#include <axis/soap/CharacterElement.h>
  -#include <axis/soap/SoapSerializer.h>
  -#include <axis/common/GDefine.h>
  +#include <axis/server/CharacterElement.h>
  +#include <axis/server/SoapSerializer.h>
  +#include <axis/server/GDefine.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.12      +2 -2      ws-axis/c/src/soap/ComplexElement.cpp
  
  Index: ComplexElement.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/ComplexElement.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ComplexElement.cpp	23 Mar 2004 07:04:50 -0000	1.11
  +++ ComplexElement.cpp	24 Mar 2004 06:57:33 -0000	1.12
  @@ -66,8 +66,8 @@
   //////////////////////////////////////////////////////////////////////
   
   #include "ComplexElement.h"
  -#include <axis/soap/SoapSerializer.h>
  -#include <axis/common/GDefine.h>
  +#include <axis/server/SoapSerializer.h>
  +#include <axis/server/GDefine.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.8       +1 -1      ws-axis/c/src/soap/ComplexElement.h
  
  Index: ComplexElement.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/ComplexElement.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ComplexElement.h	23 Mar 2004 06:11:44 -0000	1.7
  +++ ComplexElement.h	24 Mar 2004 06:57:33 -0000	1.8
  @@ -69,7 +69,7 @@
   #endif
   
   #include <list>
  -#include <axis/soap/BasicNode.h>
  +#include <axis/server/BasicNode.h>
   
   using namespace std;
   /**
  
  
  
  1.15      +5 -5      ws-axis/c/src/soap/HeaderBlock.cpp
  
  Index: HeaderBlock.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/HeaderBlock.cpp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- HeaderBlock.cpp	23 Mar 2004 07:04:50 -0000	1.14
  +++ HeaderBlock.cpp	24 Mar 2004 06:57:33 -0000	1.15
  @@ -69,12 +69,12 @@
   #pragma warning (disable : 4786)
   #endif
   
  -#include <axis/soap/HeaderBlock.h>
  -#include <axis/soap/SoapSerializer.h>
  -#include <axis/common/GDefine.h>
  -#include <axis/soap/BasicNode.h>
  +#include <axis/server/HeaderBlock.h>
  +#include <axis/server/SoapSerializer.h>
  +#include <axis/server/GDefine.h>
  +#include <axis/server/BasicNode.h>
   #include "ComplexElement.h"
  -#include <axis/soap/CharacterElement.h>
  +#include <axis/server/CharacterElement.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.16      +3 -3      ws-axis/c/src/soap/SoapBody.cpp
  
  Index: SoapBody.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapBody.cpp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- SoapBody.cpp	23 Mar 2004 05:30:09 -0000	1.15
  +++ SoapBody.cpp	24 Mar 2004 06:57:33 -0000	1.16
  @@ -66,9 +66,9 @@
   //////////////////////////////////////////////////////////////////////
   
   #include "SoapBody.h"
  -#include <axis/soap/SoapSerializer.h>
  -#include <axis/common/GDefine.h>
  -#include <axis/soap/Attribute.h>
  +#include <axis/server/SoapSerializer.h>
  +#include <axis/server/GDefine.h>
  +#include <axis/server/Attribute.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.8       +2 -2      ws-axis/c/src/soap/SoapBody.h
  
  Index: SoapBody.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapBody.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SoapBody.h	23 Mar 2004 06:11:44 -0000	1.7
  +++ SoapBody.h	24 Mar 2004 06:57:33 -0000	1.8
  @@ -65,8 +65,8 @@
   #define AFX_SOAPBODY_H__D1A60F04_287F_4688_A8F0_10BE0EA25775__INCLUDED_
   
   #include "SoapMethod.h"
  -#include "SoapFault.h"
  -#include <axis/soap/SoapEnvVersions.h>
  +#include <axis/server/SoapFault.h>
  +#include <axis/server/SoapEnvVersions.h>
   
   class Attribute;
   
  
  
  
  1.33      +7 -7      ws-axis/c/src/soap/SoapDeSerializer.cpp
  
  Index: SoapDeSerializer.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.cpp,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- SoapDeSerializer.cpp	23 Mar 2004 07:04:50 -0000	1.32
  +++ SoapDeSerializer.cpp	24 Mar 2004 06:57:33 -0000	1.33
  @@ -64,19 +64,19 @@
   // SoapDeSerializer.cpp: implementation of the SoapDeSerializer class.
   //
   //////////////////////////////////////////////////////////////////////
  -#include <axis/soap/SoapDeSerializer.h>
  +#include <axis/server/SoapDeSerializer.h>
   #include "SoapEnvelope.h"
   #include "SoapKeywordMapping.h"
   #include "URIMapping.h"
  -#include <axis/soap/SoapHeader.h>
  +#include <axis/server/SoapHeader.h>
   #include "SoapMethod.h"
   #include "SoapBody.h"
  -#include "SoapFault.h"
  +#include <axis/server/SoapFault.h>
   #include "ComplexElement.h"
  -#include <axis/soap/CharacterElement.h>
  -#include <axis/common/GDefine.h>
  -#include <axis/common/Packet.h>
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/CharacterElement.h>
  +#include <axis/server/GDefine.h>
  +#include <axis/server/Packet.h>
  +#include <axis/server/AxisTrace.h>
   
   #ifdef USE_EXPAT_PARSER
   #include "SoapParserExpat.h"
  
  
  
  1.15      +2 -2      ws-axis/c/src/soap/SoapEnvelope.cpp
  
  Index: SoapEnvelope.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapEnvelope.cpp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SoapEnvelope.cpp	23 Mar 2004 07:04:50 -0000	1.14
  +++ SoapEnvelope.cpp	24 Mar 2004 06:57:33 -0000	1.15
  @@ -70,8 +70,8 @@
   #endif
   
   #include "SoapEnvelope.h"
  -#include <axis/common/GDefine.h>
  -#include <axis/soap/SoapSerializer.h>
  +#include <axis/server/GDefine.h>
  +#include <axis/server/SoapSerializer.h>
   
   #include <stdio.h>
   
  
  
  
  1.9       +2 -2      ws-axis/c/src/soap/SoapEnvelope.h
  
  Index: SoapEnvelope.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapEnvelope.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SoapEnvelope.h	23 Mar 2004 06:11:44 -0000	1.8
  +++ SoapEnvelope.h	24 Mar 2004 06:57:33 -0000	1.9
  @@ -64,9 +64,9 @@
   #if !defined(AFX_SOAPENVELOPE_H__285E1A2E_AC87_4F69_BAF2_4D556F43EC7C__INCLUDED_)
   #define AFX_SOAPENVELOPE_H__285E1A2E_AC87_4F69_BAF2_4D556F43EC7C__INCLUDED_
   
  -#include <axis/soap/SoapHeader.h>
  +#include <axis/server/SoapHeader.h>
   #include "SoapBody.h"
  -#include <axis/soap/SoapEnvVersions.h>
  +#include <axis/server/SoapEnvVersions.h>
   /**
       @class SoapEnvelope
       @brief interface for the SoapEnvelope class.
  
  
  
  1.14      +4 -4      ws-axis/c/src/soap/SoapFault.cpp
  
  Index: SoapFault.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapFault.cpp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SoapFault.cpp	23 Mar 2004 05:30:09 -0000	1.13
  +++ SoapFault.cpp	24 Mar 2004 06:57:33 -0000	1.14
  @@ -65,10 +65,10 @@
   //
   //////////////////////////////////////////////////////////////////////
   
  -#include "SoapFault.h"
  -#include <axis/soap/SoapSerializer.h>
  -#include <axis/soap/SoapEnvVersions.h>
  -#include <axis/common/GDefine.h>
  +#include <axis/server/SoapFault.h>
  +#include <axis/server/SoapSerializer.h>
  +#include <axis/server/SoapEnvVersions.h>
  +#include <axis/server/GDefine.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.15      +3 -3      ws-axis/c/src/soap/SoapHeader.cpp
  
  Index: SoapHeader.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapHeader.cpp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SoapHeader.cpp	28 Feb 2004 06:27:56 -0000	1.14
  +++ SoapHeader.cpp	24 Mar 2004 06:57:33 -0000	1.15
  @@ -69,9 +69,9 @@
   #pragma warning (disable : 4786)
   #endif
   
  -#include <axis/soap/SoapHeader.h>
  -#include <axis/soap/SoapSerializer.h>
  -#include <axis/common/GDefine.h>
  +#include <axis/server/SoapHeader.h>
  +#include <axis/server/SoapSerializer.h>
  +#include <axis/server/GDefine.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.6       +1 -1      ws-axis/c/src/soap/SoapKeywordMapping.cpp
  
  Index: SoapKeywordMapping.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapKeywordMapping.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SoapKeywordMapping.cpp	23 Mar 2004 13:23:04 -0000	1.5
  +++ SoapKeywordMapping.cpp	24 Mar 2004 06:57:33 -0000	1.6
  @@ -63,7 +63,7 @@
   //////////////////////////////////////////////////////////////////////
   
   #include "SoapKeywordMapping.h"
  -#include <axis/soap/Attribute.h>
  +#include <axis/server/Attribute.h>
   #include "../common/AxisUtils.h"
   
   //////////////////////////////////////////////////////////////////////
  
  
  
  1.6       +1 -1      ws-axis/c/src/soap/SoapKeywordMapping.h
  
  Index: SoapKeywordMapping.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapKeywordMapping.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SoapKeywordMapping.h	23 Mar 2004 06:11:44 -0000	1.5
  +++ SoapKeywordMapping.h	24 Mar 2004 06:57:33 -0000	1.6
  @@ -60,7 +60,7 @@
   #if !defined(AFX_SOAPKEYWORDMAPPING_H__7ED17E2B_F729_4256_985A_0D8F70D55D2A__INCLUDED_)
   #define AFX_SOAPKEYWORDMAPPING_H__7ED17E2B_F729_4256_985A_0D8F70D55D2A__INCLUDED_
   
  -#include <axis/soap/SoapEnvVersions.h>
  +#include <axis/server/SoapEnvVersions.h>
   #include <map>
   
   using namespace std;
  
  
  
  1.20      +2 -2      ws-axis/c/src/soap/SoapMethod.cpp
  
  Index: SoapMethod.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapMethod.cpp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- SoapMethod.cpp	23 Mar 2004 05:30:09 -0000	1.19
  +++ SoapMethod.cpp	24 Mar 2004 06:57:33 -0000	1.20
  @@ -66,8 +66,8 @@
   //////////////////////////////////////////////////////////////////////
   
   #include "SoapMethod.h"
  -#include <axis/soap/Attribute.h>
  -#include <axis/common/GDefine.h>
  +#include <axis/server/Attribute.h>
  +#include <axis/server/GDefine.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  
  
  
  1.15      +2 -2      ws-axis/c/src/soap/SoapMethod.h
  
  Index: SoapMethod.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapMethod.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SoapMethod.h	23 Mar 2004 07:04:50 -0000	1.14
  +++ SoapMethod.h	24 Mar 2004 06:57:33 -0000	1.15
  @@ -63,9 +63,9 @@
   #if !defined(AFX_SOAPMETHOD_H__85B1A3F0_CD15_4607_AAAB_665A66AA8546__INCLUDED_)
   #define AFX_SOAPMETHOD_H__85B1A3F0_CD15_4607_AAAB_665A66AA8546__INCLUDED_
   
  -#include <axis/common/Param.h>
  +#include <axis/server/Param.h>
   #include "../common/ISoapMethod.h"
  -#include <axis/soap/SoapSerializer.h>
  +#include <axis/server/SoapSerializer.h>
   #include <list>
   
   class Attribute;
  
  
  
  1.2       +3 -3      ws-axis/c/src/soap/SoapParserExpat.h
  
  Index: SoapParserExpat.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapParserExpat.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SoapParserExpat.h	23 Mar 2004 06:11:44 -0000	1.1
  +++ SoapParserExpat.h	24 Mar 2004 06:57:33 -0000	1.2
  @@ -68,12 +68,12 @@
   #define __SoapParserExpat_H_INCLUDED__
   
   #include <expat/expat.h>
  -#include <axis/common/Packet.h>
  +#include <axis/server/Packet.h>
   
   #include "../xml/QName.h"
  -#include <axis/xml/AnyElement.h>
  +#include <axis/server/AnyElement.h>
   #include "../xml/Event.h"
  -#include <axis/xml/XMLParser.h>
  +#include <axis/server/XMLParser.h>
   
   #include <queue>
   #include <map>
  
  
  
  1.40      +6 -6      ws-axis/c/src/soap/SoapSerializer.cpp
  
  Index: SoapSerializer.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.cpp,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- SoapSerializer.cpp	23 Mar 2004 05:30:09 -0000	1.39
  +++ SoapSerializer.cpp	24 Mar 2004 06:57:33 -0000	1.40
  @@ -73,17 +73,17 @@
   #endif
   
   #include "SoapEnvelope.h"
  -#include <axis/soap/SoapSerializer.h>
  -#include <axis/soap/HeaderBlock.h>
  -#include <axis/common/GDefine.h>
  -#include <axis/common/Packet.h>
  +#include <axis/server/SoapSerializer.h>
  +#include <axis/server/HeaderBlock.h>
  +#include <axis/server/GDefine.h>
  +#include <axis/server/Packet.h>
   #include "../common/ArrayBean.h"
  -#include <axis/common/BasicTypeSerializer.h>
  +#include <axis/server/BasicTypeSerializer.h>
   #include "../soap/SoapKeywordMapping.h"
   #include <stdio.h>
   #include <stdarg.h>
   
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   extern AxisTrace* g_pAT;
   
   //////////////////////////////////////////////////////////////////////
  
  
  
  1.10      +1 -1      ws-axis/c/src/soap/URIMapping.h
  
  Index: URIMapping.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/URIMapping.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- URIMapping.h	23 Mar 2004 06:11:44 -0000	1.9
  +++ URIMapping.h	24 Mar 2004 06:57:33 -0000	1.10
  @@ -69,7 +69,7 @@
   enum URITYPE { URI_XSI, URI_XSD, URI_ENC, URI_ENVELOPE, URI_UNKNOWN};
   #include <map>
   #include <string>
  -#include <axis/common/GDefine.h>
  +#include <axis/server/GDefine.h>
   
   using namespace std;
   /**
  
  
  
  1.21      +3 -3      ws-axis/c/src/soap/XMLStreamHandler.cpp
  
  Index: XMLStreamHandler.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/XMLStreamHandler.cpp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- XMLStreamHandler.cpp	23 Mar 2004 05:30:09 -0000	1.20
  +++ XMLStreamHandler.cpp	24 Mar 2004 06:57:33 -0000	1.21
  @@ -64,9 +64,9 @@
   #include "../soap/XMLStreamHandler.h"
   #include "../common/TypeMapping.h"
   #include "../soap/URIMapping.h"
  -#include <axis/soap/Attribute.h>
  -#include <axis/soap/SoapEnvVersions.h>
  -#include <axis/soap/CharacterElement.h>
  +#include <axis/server/Attribute.h>
  +#include <axis/server/SoapEnvVersions.h>
  +#include <axis/server/CharacterElement.h>
   #include "../common/AxisUtils.h"
   
   XMLStreamHandler::XMLStreamHandler()
  
  
  
  1.11      +2 -2      ws-axis/c/src/soap/XMLStreamHandler.h
  
  Index: XMLStreamHandler.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/XMLStreamHandler.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XMLStreamHandler.h	23 Mar 2004 06:11:44 -0000	1.10
  +++ XMLStreamHandler.h	24 Mar 2004 06:57:33 -0000	1.11
  @@ -69,14 +69,14 @@
   #include <xercesc/util/PlatformUtils.hpp>
   #include <xercesc/framework/MemBufInputSource.hpp>
   
  -#include <axis/common/Param.h>
  +#include <axis/server/Param.h>
   #include "../common/ArrayBean.h"
   #include "SoapEnvelope.h"
   #include "SoapHeader.h"
   #include "SoapMethod.h"
   #include "SoapBody.h"
   #include "SoapFault.h"
  -#include <axis/common/GDefine.h>
  +#include <axis/server/GDefine.h>
   #include "SoapKeywordMapping.h"
   
   #define TRANSCODE_BUFFER_SIZE 256
  
  
  
  1.24      +3 -3      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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- WSDDDeployment.cpp	23 Mar 2004 13:25:01 -0000	1.23
  +++ WSDDDeployment.cpp	24 Mar 2004 06:57:33 -0000	1.24
  @@ -68,9 +68,9 @@
   
   #include "WSDDDeployment.h"
   #include "WSDDDocument.h"
  -#include <axis/common/GDefine.h>
  -#include <axis/common/AxisConfig.h>
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/GDefine.h>
  +#include <axis/server/AxisConfig.h>
  +#include <axis/server/AxisTrace.h>
   
   extern AxisTrace* g_pAT;
   
  
  
  
  1.13      +2 -2      ws-axis/c/src/wsdd/WSDDDeployment.h
  
  Index: WSDDDeployment.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDeployment.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- WSDDDeployment.h	23 Mar 2004 06:23:00 -0000	1.12
  +++ WSDDDeployment.h	24 Mar 2004 06:57:33 -0000	1.13
  @@ -67,8 +67,8 @@
   #if !defined(AFX_WSDDDEPLOYMENT_H__2B3E0205_06F3_47C1_8D9C_479CBFB8ACC2__INCLUDED_)
   #define AFX_WSDDDEPLOYMENT_H__2B3E0205_06F3_47C1_8D9C_479CBFB8ACC2__INCLUDED_
   
  -#include <axis/wsdd/WSDDService.h>
  -#include <axis/wsdd/WSDDHandler.h>
  +#include <axis/server/WSDDService.h>
  +#include <axis/server/WSDDHandler.h>
   #include "WSDDTransport.h"
   #include "../common/IDeployerUtils.h"
   
  
  
  
  1.28      +1 -1      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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- WSDDDocument.cpp	23 Mar 2004 07:04:50 -0000	1.27
  +++ WSDDDocument.cpp	24 Mar 2004 06:57:33 -0000	1.28
  @@ -65,7 +65,7 @@
   #include "WSDDDocument.h"
   #include "WSDDKeywords.h"
   #include <string>
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/AxisTrace.h>
   
   #define NAMESPACESEPARATOR 0x03 /*Heart*/
   #define FILEBUFFSIZE 1024
  
  
  
  1.11      +1 -1      ws-axis/c/src/wsdd/WSDDDocument.h
  
  Index: WSDDDocument.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDocument.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- WSDDDocument.h	23 Mar 2004 06:23:00 -0000	1.10
  +++ WSDDDocument.h	24 Mar 2004 06:57:33 -0000	1.11
  @@ -64,7 +64,7 @@
   #define __WSDDDOCUMENTS_H_INCLUDED__
   
   #include "WSDDDeployment.h"
  -#include <axis/wsdd/WSDDService.h>
  +#include <axis/server/WSDDService.h>
   #include "../xml/QName.h"
   
   #include <expat/expat.h>
  
  
  
  1.11      +2 -2      ws-axis/c/src/wsdd/WSDDHandler.cpp
  
  Index: WSDDHandler.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDHandler.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- WSDDHandler.cpp	23 Mar 2004 13:25:01 -0000	1.10
  +++ WSDDHandler.cpp	24 Mar 2004 06:57:33 -0000	1.11
  @@ -65,7 +65,7 @@
   //
   //////////////////////////////////////////////////////////////////////
   
  -#include <axis/wsdd/WSDDHandler.h>
  +#include <axis/server/WSDDHandler.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  @@ -174,4 +174,4 @@
   void WSDDHandler::PrintTabs(int count)
   {
   	for (int x=0; x<count; x++) *this << "\t";
  -}
  \ No newline at end of file
  +}
  
  
  
  1.4       +1 -1      ws-axis/c/src/wsdd/WSDDKeywords.h
  
  Index: WSDDKeywords.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDKeywords.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WSDDKeywords.h	23 Mar 2004 06:23:00 -0000	1.3
  +++ WSDDKeywords.h	24 Mar 2004 06:57:33 -0000	1.4
  @@ -5,7 +5,7 @@
   #if !defined(AFX_WSDDKEYWORDS_H__870A488E_084E_4EAB_8162_25A1DDF2CD74__INCLUDED_)
   #define AFX_WSDDKEYWORDS_H__870A488E_084E_4EAB_8162_25A1DDF2CD74__INCLUDED_
   
  -#include <axis/common/GDefine.h>
  +#include <axis/server/GDefine.h>
   
   //keywords used in the wsdd file
   extern const AxisXMLCh* kw_depl;
  
  
  
  1.16      +3 -3      ws-axis/c/src/wsdd/WSDDService.cpp
  
  Index: WSDDService.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDService.cpp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- WSDDService.cpp	23 Mar 2004 13:25:01 -0000	1.15
  +++ WSDDService.cpp	24 Mar 2004 06:57:33 -0000	1.16
  @@ -65,8 +65,8 @@
   //
   //////////////////////////////////////////////////////////////////////
   
  -#include <axis/wsdd/WSDDService.h>
  -#include <axis/common/AxisTrace.h>
  +#include <axis/server/WSDDService.h>
  +#include <axis/server/AxisTrace.h>
   
   //////////////////////////////////////////////////////////////////////
   // Construction/Destruction
  @@ -259,4 +259,4 @@
   	default: return "unknown";
   	}
   	return 0;
  -}
  \ No newline at end of file
  +}
  
  
  
  1.7       +1 -1      ws-axis/c/src/wsdd/WSDDTransport.h
  
  Index: WSDDTransport.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDTransport.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WSDDTransport.h	23 Mar 2004 13:25:01 -0000	1.6
  +++ WSDDTransport.h	24 Mar 2004 06:57:33 -0000	1.7
  @@ -64,7 +64,7 @@
   #if !defined(AFX_WSDDTRANSPORT_H__A7F3A046_7764_4EAB_8867_B26A18F1A931__INCLUDED_)
   #define AFX_WSDDTRANSPORT_H__A7F3A046_7764_4EAB_8867_B26A18F1A931__INCLUDED_
   
  -#include <axis/wsdd/WSDDHandler.h>
  +#include <axis/server/WSDDHandler.h>
   #include <map>
   /**
       @class WSDDTransport
  
  
  
  1.2       +1 -1      ws-axis/c/src/xml/Event.h
  
  Index: Event.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/Event.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Event.h	23 Mar 2004 06:23:00 -0000	1.1
  +++ Event.h	24 Mar 2004 06:57:33 -0000	1.2
  @@ -66,7 +66,7 @@
   #if !defined(AFX_Event_H__165AA74B_3F51_4B2E_8081_86CD8DCD86FA__INCLUDED_)
   #define AFX_Event_H__165AA74B_3F51_4B2E_8081_86CD8DCD86FA__INCLUDED_
   
  -#include <axis/xml/AnyElement.h>
  +#include <axis/server/AnyElement.h>
   
   #include <string>
   using namespace std;
  
  
  
  1.5       +1 -1      ws-axis/c/src/xml/QName.h
  
  Index: QName.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/QName.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- QName.h	23 Mar 2004 06:23:00 -0000	1.4
  +++ QName.h	24 Mar 2004 06:57:33 -0000	1.5
  @@ -68,7 +68,7 @@
   #if !defined(AFX_QNAME_H__7E4E7E7B_F051_4989_89A6_F0248109C410__INCLUDED_)
   #define AFX_QNAME_H__7E4E7E7B_F051_4989_89A6_F0248109C410__INCLUDED_
   
  -#include <axis/common/GDefine.h>
  +#include <axis/server/GDefine.h>
   
   /**
    *	Qualified name according to "Namespaces in XML" specification.