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 wh...@apache.org on 2004/11/23 18:21:08 UTC
cvs commit: ws-axis/c/src/xml/xerces XercesHandler.h
whitlock 2004/11/23 09:21:08
Modified: c/include/axis SoapEnvVersions.hpp
c/src/client/adminclient AxisAdminService.cpp
c/src/common AxisConfig.cpp AxisConfig.h
AxisConfigException.h AxisFile.h AxisMessage.h
AxisSocketUtils.cpp AxisTime.h AxisTrace.cpp
AxisUserAPI.cpp AxisUtils.cpp AxisUtils.h
BasicTypeSerializer.h ComplexObjectHandler.h
GDefine.cpp IAdminUtils.h IArrayBean.h
IDeployerUtils.h MessageData.h Param.cpp
SoapEnvVersions.cpp TypeMapping.cpp
c/src/engine AppScopeHandlerPool.cpp AppScopeHandlerPool.h
AxisEngineException.h DeserializerPool.h
HandlerChain.h HandlerLoader.h HandlerPool.cpp
HandlerPool.h RequestScopeHandlerPool.h
SOAPTransportFactory.h SerializerPool.h
SessionScopeHandlerPool.h SharedObject.h
XMLParserFactory.h
c/src/engine/client Call.cpp ClientAxisEngine.cpp Stub.cpp
c/src/server/adminservice AxisAdminServiceWrapper.h
c/src/soap Attribute.h AxisSoapException.h BasicNode.cpp
CharacterElement.cpp CharacterElement.h
ComplexElement.cpp ComplexElement.h HeaderBlock.cpp
HeaderBlock.h SoapBody.cpp SoapBody.h
SoapDeSerializer.cpp SoapDeSerializer.h
SoapEnvelope.cpp SoapEnvelope.h SoapFault.cpp
SoapFault.h SoapHeader.cpp SoapKeywordMapping.h
SoapMethod.cpp SoapSerializer.cpp SoapSerializer.h
URIMapping.h
c/src/transport SOAPTransport.h
c/src/transport/axis2 AxisTransportException.h
c/src/wsdd AxisWsddException.h WSDDDeployment.cpp
WSDDHandler.h WSDDKeywords.h WSDDService.h
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
ArrayParamWriter.java ClientStubWriter.java
ExceptionHeaderWriter.java ExceptionWriter.java
ParamCPPFileWriter.java ParmHeaderFileWriter.java
ServiceHeaderWriter.java WrapHeaderWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
ClientStubWriter.java ParamCPPFileWriter.java
ParmHeaderFileWriter.java ServiceHeaderWriter.java
c/src/xml AxisParseException.h QName.h XMLParser.h
c/src/xml/xerces XercesHandler.h
Log:
Move common header files to include/axis
Revision Changes Path
1.2 +1 -1 ws-axis/c/include/axis/SoapEnvVersions.hpp
Index: SoapEnvVersions.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/SoapEnvVersions.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoapEnvVersions.hpp 23 Nov 2004 11:11:11 -0000 1.1
+++ SoapEnvVersions.hpp 23 Nov 2004 17:21:02 -0000 1.2
@@ -20,7 +20,7 @@
/* SoapEnvVersions.h:*/
-#include "../server/GDefine.hpp"
+#include "GDefine.hpp"
#ifdef WIN32
#pragma warning (disable : 4786)
1.6 +1 -1 ws-axis/c/src/client/adminclient/AxisAdminService.cpp
Index: AxisAdminService.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/adminclient/AxisAdminService.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AxisAdminService.cpp 26 Oct 2004 09:37:00 -0000 1.5
+++ AxisAdminService.cpp 23 Nov 2004 17:21:02 -0000 1.6
@@ -22,7 +22,7 @@
*/
#include "AxisAdminService.h"
-#include <axis/server/AxisWrapperAPI.hpp>
+#include <axis/AxisWrapperAPI.hpp>
bool CallBase::bInitialized;
CallFunctions CallBase::ms_VFtable;
1.57 +1 -1 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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- AxisConfig.cpp 1 Nov 2004 15:04:49 -0000 1.56
+++ AxisConfig.cpp 23 Nov 2004 17:21:02 -0000 1.57
@@ -24,7 +24,7 @@
#include "../platforms/PlatformAutoSense.hpp"
#include "AxisConfig.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include "../common/AxisFile.h"
#include "AxisUtils.h"
#include <stdlib.h>
1.15 +1 -1 ws-axis/c/src/common/AxisConfig.h
Index: AxisConfig.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfig.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AxisConfig.h 26 Oct 2004 09:37:57 -0000 1.14
+++ AxisConfig.h 23 Nov 2004 17:21:02 -0000 1.15
@@ -26,7 +26,7 @@
#define __AXIS_AXISCONFIG_H_OF_AXIS_INCLUDED__
#define CONFBUFFSIZE 256
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include <string>
/**
* @class AxisConfig
1.7 +1 -1 ws-axis/c/src/common/AxisConfigException.h
Index: AxisConfigException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfigException.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AxisConfigException.h 26 Oct 2004 09:37:57 -0000 1.6
+++ AxisConfigException.h 23 Nov 2004 17:21:02 -0000 1.7
@@ -22,7 +22,7 @@
#define __AXISCONFIGEXCEPTION_H_OF_AXIS_INCLUDED_
#include <string>
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
AXIS_CPP_NAMESPACE_START
1.4 +1 -1 ws-axis/c/src/common/AxisFile.h
Index: AxisFile.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisFile.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisFile.h 26 Oct 2004 09:37:57 -0000 1.3
+++ AxisFile.h 23 Nov 2004 17:21:02 -0000 1.4
@@ -23,7 +23,7 @@
#if !defined(__AXIS_AXISFILE_H_OF_AXIS_INCLUDED__)
#define __AXIS_AXISFILE_H_OF_AXIS_INCLUDED__
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include <stdio.h>
#include <string.h>
1.4 +1 -1 ws-axis/c/src/common/AxisMessage.h
Index: AxisMessage.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisMessage.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisMessage.h 26 Oct 2004 09:37:57 -0000 1.3
+++ AxisMessage.h 23 Nov 2004 17:21:02 -0000 1.4
@@ -26,7 +26,7 @@
#define __AXISMESSAGE_H_OF_AXIS_INCLUDED_
#include <string>
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
AXIS_CPP_NAMESPACE_START
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AxisSocketUtils.cpp 26 Oct 2004 09:37:57 -0000 1.9
+++ AxisSocketUtils.cpp 23 Nov 2004 17:21:02 -0000 1.10
@@ -20,7 +20,7 @@
*/
#include "AxisSocketUtils.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include <stdio.h>
#if defined(WIN32) && !defined(CYGWIN)
#include <winsock.h> /* for socket(),... */
1.13 +1 -1 ws-axis/c/src/common/AxisTime.h
Index: AxisTime.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTime.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AxisTime.h 22 Nov 2004 10:40:00 -0000 1.12
+++ AxisTime.h 23 Nov 2004 17:21:02 -0000 1.13
@@ -24,7 +24,7 @@
#ifndef __AXISTIME_H_OF_AXIS_INCLUDED_
#define __AXISTIME_H_OF_AXIS_INCLUDED_
-#include <axis/server/TypeMapping.hpp>
+#include <axis/TypeMapping.hpp>
#include "Param.h"
using namespace std;
1.45 +1 -1 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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- AxisTrace.cpp 22 Nov 2004 16:10:07 -0000 1.44
+++ AxisTrace.cpp 23 Nov 2004 17:21:02 -0000 1.45
@@ -25,7 +25,7 @@
#include <stdarg.h>
#include <stdlib.h>
#include "AxisUtils.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include "AxisConfig.h"
#include <string>
// cctype is needed to make isprint compile on linux
1.3 +1 -1 ws-axis/c/src/common/AxisUserAPI.cpp
Index: AxisUserAPI.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisUserAPI.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AxisUserAPI.cpp 12 Nov 2004 12:49:01 -0000 1.2
+++ AxisUserAPI.cpp 23 Nov 2004 17:21:02 -0000 1.3
@@ -16,7 +16,7 @@
* @author Mark Whitlock
*/
-#include <axis/server/AxisUserAPI.hpp>
+#include <axis/AxisUserAPI.hpp>
AXIS_CPP_NAMESPACE_START
1.20 +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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AxisUtils.cpp 26 Oct 2004 09:37:57 -0000 1.19
+++ AxisUtils.cpp 23 Nov 2004 17:21:02 -0000 1.20
@@ -22,7 +22,7 @@
#include "AxisUtils.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
AXIS_CPP_NAMESPACE_START
1.17 +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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AxisUtils.h 26 Oct 2004 09:37:57 -0000 1.16
+++ AxisUtils.h 23 Nov 2004 17:21:02 -0000 1.17
@@ -19,7 +19,7 @@
#if !defined(AXIS_AXISUTILS_H__OF_AXIS_INCLUDED_)
#define AXIS_AXISUTILS_H__OF_AXIS_INCLUDED_
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include <string>
using namespace std;
1.20 +1 -1 ws-axis/c/src/common/BasicTypeSerializer.h
Index: BasicTypeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/BasicTypeSerializer.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- BasicTypeSerializer.h 26 Oct 2004 09:37:57 -0000 1.19
+++ BasicTypeSerializer.h 23 Nov 2004 17:21:02 -0000 1.20
@@ -26,7 +26,7 @@
#if !defined(_BASICTYPESERIALIZER_H____OF_AXIS_INCLUDED_)
#define _BASICTYPESERIALIZER_H____OF_AXIS_INCLUDED_
-#include <axis/server/TypeMapping.hpp>
+#include <axis/TypeMapping.hpp>
#include "AxisTime.h"
#include <string>
using namespace std;
1.2 +2 -2 ws-axis/c/src/common/ComplexObjectHandler.h
Index: ComplexObjectHandler.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/ComplexObjectHandler.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComplexObjectHandler.h 22 Nov 2004 10:40:00 -0000 1.1
+++ ComplexObjectHandler.h 23 Nov 2004 17:21:02 -0000 1.2
@@ -17,8 +17,8 @@
#if !defined(_COMPLEXOBJECTHANDLER_H____OF_AXIS_INCLUDED_)
#define _COMPLEXOBJECTHANDLER_H____OF_AXIS_INCLUDED_
-#include <axis/server/AxisUserAPI.hpp>
-#include <axis/server/AxisWrapperAPI.hpp>
+#include <axis/AxisUserAPI.hpp>
+#include <axis/AxisWrapperAPI.hpp>
AXIS_CPP_NAMESPACE_START
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GDefine.cpp 26 Oct 2004 09:37:57 -0000 1.7
+++ GDefine.cpp 23 Nov 2004 17:21:02 -0000 1.8
@@ -19,4 +19,4 @@
*
*/
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
1.4 +1 -1 ws-axis/c/src/common/IAdminUtils.h
Index: IAdminUtils.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/IAdminUtils.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IAdminUtils.h 26 Oct 2004 09:37:57 -0000 1.3
+++ IAdminUtils.h 23 Nov 2004 17:21:02 -0000 1.4
@@ -26,7 +26,7 @@
#if !defined(_IADMINUTILS_H____OF_AXIS_INCLUDED_)
#define _IADMINUTILS_H____OF_AXIS_INCLUDED_
-#include <axis/server/AxisUserAPI.hpp>
+#include <axis/AxisUserAPI.hpp>
/**
* @interface IAdminUtils
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- IArrayBean.h 26 Oct 2004 09:37:57 -0000 1.12
+++ IArrayBean.h 23 Nov 2004 17:21:02 -0000 1.13
@@ -19,8 +19,8 @@
#if !defined(AXIS_IARRAYBEAN_H__OF_AXIS_INCLUDED_)
#define AXIS_IARRAYBEAN_H__OF_AXIS_INCLUDED_
-#include <axis/server/GDefine.hpp>
-#include <axis/server/AxisUserAPI.hpp>
+#include <axis/GDefine.hpp>
+#include <axis/AxisUserAPI.hpp>
/*
* @class IArrayBean
* @brief interface for the IArrayBean class.
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IDeployerUtils.h 26 Oct 2004 09:37:57 -0000 1.8
+++ IDeployerUtils.h 23 Nov 2004 17:21:02 -0000 1.9
@@ -20,7 +20,7 @@
#if !defined(AXIS_IDEPLOYERUTILS_H__OF_AXIS_INCLUDED_)
#define AXIS_IDEPLOYERUTILS_H__OF_AXIS_INCLUDED_
-#include <axis/server/AxisUserAPI.hpp>
+#include <axis/AxisUserAPI.hpp>
/*
* @class IDeployerUtils
1.18 +1 -1 ws-axis/c/src/common/MessageData.h
Index: MessageData.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/MessageData.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MessageData.h 26 Oct 2004 09:37:57 -0000 1.17
+++ MessageData.h 23 Nov 2004 17:21:02 -0000 1.18
@@ -17,7 +17,7 @@
#if !defined(_MESSAGEDATA_H____OF_AXIS_INCLUDED_)
#define _MESSAGEDATA_H____OF_AXIS_INCLUDED_
-#include <axis/server/IMessageData.hpp>
+#include <axis/IMessageData.hpp>
#include "AdminUtils.h"
/*
1.46 +1 -1 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Param.cpp 11 Nov 2004 10:51:35 -0000 1.45
+++ Param.cpp 23 Nov 2004 17:21:02 -0000 1.46
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <stdio.h>
#include "AxisUtils.h"
-#include <axis/server/AxisUserAPI.hpp>
+#include <axis/AxisUserAPI.hpp>
AXIS_CPP_NAMESPACE_START
1.2 +1 -1 ws-axis/c/src/common/SoapEnvVersions.cpp
Index: SoapEnvVersions.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/SoapEnvVersions.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoapEnvVersions.cpp 16 Nov 2004 10:09:32 -0000 1.1
+++ SoapEnvVersions.cpp 23 Nov 2004 17:21:02 -0000 1.2
@@ -18,7 +18,7 @@
*
*/
-#include <axis/server/SoapEnvVersions.hpp>
+#include <axis/SoapEnvVersions.hpp>
SoapEnvVersionsStruct gs_SoapEnvVersionsStruct[VERSION_LAST]=
{
1.19 +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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TypeMapping.cpp 26 Oct 2004 09:37:57 -0000 1.18
+++ TypeMapping.cpp 23 Nov 2004 17:21:02 -0000 1.19
@@ -20,7 +20,7 @@
*/
-#include <axis/server/TypeMapping.hpp>
+#include <axis/TypeMapping.hpp>
#include "AxisUtils.h"
#define __TRC(X) AxisUtils::Convert(X)
1.20 +1 -1 ws-axis/c/src/engine/AppScopeHandlerPool.cpp
Index: AppScopeHandlerPool.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AppScopeHandlerPool.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AppScopeHandlerPool.cpp 19 Nov 2004 16:22:06 -0000 1.19
+++ AppScopeHandlerPool.cpp 23 Nov 2004 17:21:03 -0000 1.20
@@ -22,7 +22,7 @@
#include "AppScopeHandlerPool.h"
#include "HandlerLoader.h"
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
#include "../common/AxisTrace.h"
extern AXIS_CPP_NAMESPACE_PREFIX HandlerLoader* g_pHandlerLoader;
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AppScopeHandlerPool.h 26 Oct 2004 10:21:59 -0000 1.10
+++ AppScopeHandlerPool.h 23 Nov 2004 17:21:03 -0000 1.11
@@ -20,7 +20,7 @@
#define AXIS_APPSCOPEHANDLERPOOL_H__OF_AXIS_INCLUDED_
#include "SharedObject.h"
-#include <axis/server/BasicHandler.hpp>
+#include <axis/BasicHandler.hpp>
#include <map>
#include <list>
1.7 +1 -1 ws-axis/c/src/engine/AxisEngineException.h
Index: AxisEngineException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngineException.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AxisEngineException.h 26 Oct 2004 10:21:59 -0000 1.6
+++ AxisEngineException.h 23 Nov 2004 17:21:03 -0000 1.7
@@ -22,7 +22,7 @@
#define __AXISENGINEEXCEPTION_H_OF_AXIS_INCLUDED_
#include <string>
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
AXIS_CPP_NAMESPACE_START
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DeserializerPool.h 26 Oct 2004 10:21:59 -0000 1.12
+++ DeserializerPool.h 23 Nov 2004 17:21:03 -0000 1.13
@@ -21,12 +21,12 @@
#include "SharedObject.h"
#ifdef USER_DESERIALIZER
-#include <axis/server/IWrapperSoapDeSerializer.hpp>
+#include <axis/IWrapperSoapDeSerializer.hpp>
extern void* GetUserDeSerializer();
#else
#include "../soap/SoapDeSerializer.h"
#endif
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include <list>
AXIS_CPP_NAMESPACE_START
1.11 +1 -1 ws-axis/c/src/engine/HandlerChain.h
Index: HandlerChain.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/HandlerChain.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HandlerChain.h 26 Oct 2004 10:21:59 -0000 1.10
+++ HandlerChain.h 23 Nov 2004 17:21:03 -0000 1.11
@@ -18,7 +18,7 @@
#if !defined(_HANDLERCHAIN_H____OF_AXIS_INCLUDED_)
#define _HANDLERCHAIN_H____OF_AXIS_INCLUDED_
-#include <axis/server/Handler.hpp>
+#include <axis/Handler.hpp>
/*
* @class HandlerChain
1.18 +1 -1 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- HandlerLoader.h 1 Nov 2004 15:04:49 -0000 1.17
+++ HandlerLoader.h 23 Nov 2004 17:21:03 -0000 1.18
@@ -22,7 +22,7 @@
#include "../platforms/PlatformAutoSense.hpp"
#include "../common/MessageData.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include <axis/server/WrapperClassHandler.hpp>
#include "SharedObject.h"
#include "AxisEngineException.h"
1.34 +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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- HandlerPool.cpp 19 Nov 2004 16:22:06 -0000 1.33
+++ HandlerPool.cpp 23 Nov 2004 17:21:03 -0000 1.34
@@ -25,7 +25,7 @@
#include "RequestScopeHandlerPool.h"
#include "SessionScopeHandlerPool.h"
#include "../wsdd/WSDDDeployment.h"
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
#include "../common/AxisTrace.h"
extern AXIS_CPP_NAMESPACE_PREFIX AppScopeHandlerPool* g_pAppScopeHandlerPool;
1.13 +1 -1 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HandlerPool.h 26 Oct 2004 10:21:59 -0000 1.12
+++ HandlerPool.h 23 Nov 2004 17:21:03 -0000 1.13
@@ -25,7 +25,7 @@
#include "../wsdd/WSDDHandler.h"
#include "../wsdd/WSDDService.h"
-#include <axis/server/BasicHandler.hpp>
+#include <axis/BasicHandler.hpp>
#include "HandlerLoader.h"
#include "HandlerChain.h"
#include "SharedObject.h"
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RequestScopeHandlerPool.h 26 Oct 2004 10:21:59 -0000 1.10
+++ RequestScopeHandlerPool.h 23 Nov 2004 17:21:03 -0000 1.11
@@ -19,7 +19,7 @@
#define AXIS_REQUESTSCOPEHANDLERPOOL_H__OF_AXIS_INCLUDED_
#include "SharedObject.h"
-#include <axis/server/BasicHandler.hpp>
+#include <axis/BasicHandler.hpp>
#include <map>
#include <list>
1.8 +1 -1 ws-axis/c/src/engine/SOAPTransportFactory.h
Index: SOAPTransportFactory.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/SOAPTransportFactory.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SOAPTransportFactory.h 1 Nov 2004 15:04:49 -0000 1.7
+++ SOAPTransportFactory.h 23 Nov 2004 17:21:03 -0000 1.8
@@ -27,7 +27,7 @@
#include "../platforms/PlatformAutoSense.hpp"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#define CREATE_FUNCTION1 "CreateInstance"
#define DELETE_FUNCTION1 "DestroyInstance"
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SerializerPool.h 26 Oct 2004 10:21:59 -0000 1.12
+++ SerializerPool.h 23 Nov 2004 17:21:03 -0000 1.13
@@ -21,12 +21,12 @@
#include "SharedObject.h"
#ifdef USER_SERIALIZER
-#include <axis/server/IWrapperSoapSerializer.hpp>
+#include <axis/IWrapperSoapSerializer.hpp>
extern void* GetUserSerializer();
#else
#include "../soap/SoapSerializer.h"
#endif
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include <list>
AXIS_CPP_NAMESPACE_START
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SessionScopeHandlerPool.h 26 Oct 2004 10:21:59 -0000 1.10
+++ SessionScopeHandlerPool.h 23 Nov 2004 17:21:03 -0000 1.11
@@ -23,7 +23,7 @@
#define SESSIONLESSHANDLERS "0aaaaa"
#include "SharedObject.h"
-#include <axis/server/BasicHandler.hpp>
+#include <axis/BasicHandler.hpp>
#include <map>
#include <list>
1.16 +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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SharedObject.h 26 Oct 2004 10:21:59 -0000 1.15
+++ SharedObject.h 23 Nov 2004 17:21:03 -0000 1.16
@@ -22,7 +22,7 @@
#if !defined(AXIS_SHAREDOBJECT_H__OF_AXIS_INCLUDED_)
#define AXIS_SHAREDOBJECT_H__OF_AXIS_INCLUDED_
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#ifdef WIN32
#else //Linux
#include "pthread.h"
1.7 +1 -1 ws-axis/c/src/engine/XMLParserFactory.h
Index: XMLParserFactory.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/XMLParserFactory.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLParserFactory.h 1 Nov 2004 15:04:49 -0000 1.6
+++ XMLParserFactory.h 23 Nov 2004 17:21:03 -0000 1.7
@@ -27,7 +27,7 @@
#include "../platforms/PlatformAutoSense.hpp"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include "../xml/XMLParser.h"
#define CREATE_FUNCTION2 "CreateInstance"
1.77 +1 -1 ws-axis/c/src/engine/client/Call.cpp
Index: Call.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/Call.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- Call.cpp 22 Nov 2004 11:13:38 -0000 1.76
+++ Call.cpp 23 Nov 2004 17:21:04 -0000 1.77
@@ -27,7 +27,7 @@
#include <axis/client/Call.hpp>
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
#include "../../common/AxisConfig.h"
#include "ClientAxisEngine.h"
#include "../SOAPTransportFactory.h"
1.20 +1 -1 ws-axis/c/src/engine/client/ClientAxisEngine.cpp
Index: ClientAxisEngine.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/ClientAxisEngine.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ClientAxisEngine.cpp 19 Nov 2004 16:22:07 -0000 1.19
+++ ClientAxisEngine.cpp 23 Nov 2004 17:21:04 -0000 1.20
@@ -25,7 +25,7 @@
#include "ClientAxisEngine.h"
#include "../../wsdd/WSDDDeployment.h"
#include "../HandlerPool.h"
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
#include "../../common/AxisTrace.h"
extern AXIS_CPP_NAMESPACE_PREFIX WSDDDeployment* g_pWSDDDeployment;
1.29 +1 -1 ws-axis/c/src/engine/client/Stub.cpp
Index: Stub.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/Stub.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Stub.cpp 12 Nov 2004 09:00:15 -0000 1.28
+++ Stub.cpp 23 Nov 2004 17:21:04 -0000 1.29
@@ -20,7 +20,7 @@
#include <axis/client/Stub.hpp>
#include <stdio.h>
#include "../../transport/SOAPTransport.h"
-#include <axis/server/AxisWrapperAPI.hpp>
+#include <axis/AxisWrapperAPI.hpp>
#include "../../soap/SoapSerializer.h"
#include "../../soap/Attribute.h"
1.7 +3 -3 ws-axis/c/src/server/adminservice/AxisAdminServiceWrapper.h
Index: AxisAdminServiceWrapper.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/adminservice/AxisAdminServiceWrapper.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AxisAdminServiceWrapper.h 26 Oct 2004 10:22:38 -0000 1.6
+++ AxisAdminServiceWrapper.h 23 Nov 2004 17:21:04 -0000 1.7
@@ -24,9 +24,9 @@
#define __AXISADMINSERVICEWRAPPER_SERVERWRAPPER_H__OF_AXIS_INCLUDED_
#include <axis/server/WrapperClassHandler.hpp>
-#include <axis/server/IMessageData.hpp>
-#include <axis/server/GDefine.hpp>
-#include <axis/server/AxisWrapperAPI.hpp>
+#include <axis/IMessageData.hpp>
+#include <axis/GDefine.hpp>
+#include <axis/AxisWrapperAPI.hpp>
class AxisAdminServiceWrapper:public WrapperClassHandler
{
1.10 +1 -1 ws-axis/c/src/soap/Attribute.h
Index: Attribute.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/Attribute.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Attribute.h 2 Nov 2004 13:53:31 -0000 1.9
+++ Attribute.h 23 Nov 2004 17:21:04 -0000 1.10
@@ -23,7 +23,7 @@
#if !defined(_ATTRIBUTE_H____OF_AXIS_INCLUDED_)
#define _ATTRIBUTE_H____OF_AXIS_INCLUDED_
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include <axis/IAttribute.hpp>
#include <list>
#include <string>
1.8 +1 -1 ws-axis/c/src/soap/AxisSoapException.h
Index: AxisSoapException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/AxisSoapException.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AxisSoapException.h 26 Oct 2004 10:40:55 -0000 1.7
+++ AxisSoapException.h 23 Nov 2004 17:21:04 -0000 1.8
@@ -22,7 +22,7 @@
#define __AXISSOAPEXCEPTION_H_OF_AXIS_INCLUDED_
#include <string>
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
AXIS_CPP_NAMESPACE_START
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BasicNode.cpp 3 Nov 2004 16:09:37 -0000 1.10
+++ BasicNode.cpp 23 Nov 2004 17:21:04 -0000 1.11
@@ -34,7 +34,7 @@
*/
-#include <axis/server/BasicNode.hpp>
+#include <axis/BasicNode.hpp>
AXIS_CPP_NAMESPACE_START
1.21 +1 -1 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CharacterElement.cpp 3 Nov 2004 16:09:37 -0000 1.20
+++ CharacterElement.cpp 23 Nov 2004 17:21:04 -0000 1.21
@@ -40,7 +40,7 @@
#include "CharacterElement.h"
#include "SoapSerializer.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
AXIS_CPP_NAMESPACE_START
1.15 +1 -1 ws-axis/c/src/soap/CharacterElement.h
Index: CharacterElement.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/CharacterElement.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CharacterElement.h 26 Oct 2004 10:40:55 -0000 1.14
+++ CharacterElement.h 23 Nov 2004 17:21:04 -0000 1.15
@@ -37,7 +37,7 @@
#pragma warning (disable : 4786)
#endif
-#include <axis/server/BasicNode.hpp>
+#include <axis/BasicNode.hpp>
/**
* @class CharacterElement
1.30 +1 -1 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ComplexElement.cpp 3 Nov 2004 16:09:37 -0000 1.29
+++ ComplexElement.cpp 23 Nov 2004 17:21:04 -0000 1.30
@@ -41,7 +41,7 @@
/* ComplexElement.cpp: implementation of the ComplexElement class. */
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include "Attribute.h"
#include "ComplexElement.h"
#include "SoapSerializer.h"
1.21 +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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ComplexElement.h 2 Nov 2004 13:53:31 -0000 1.20
+++ ComplexElement.h 23 Nov 2004 17:21:04 -0000 1.21
@@ -49,7 +49,7 @@
#endif
#include <list>
-#include <axis/server/BasicNode.hpp>
+#include <axis/BasicNode.hpp>
#include "Attribute.h"
AXIS_CPP_NAMESPACE_START
1.37 +2 -2 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- HeaderBlock.cpp 16 Nov 2004 09:18:26 -0000 1.36
+++ HeaderBlock.cpp 23 Nov 2004 17:21:04 -0000 1.37
@@ -54,8 +54,8 @@
#include "HeaderBlock.h"
#include "SoapSerializer.h"
-#include <axis/server/GDefine.hpp>
-#include <axis/server/BasicNode.hpp>
+#include <axis/GDefine.hpp>
+#include <axis/BasicNode.hpp>
#include "ComplexElement.h"
#include "CharacterElement.h"
1.19 +1 -1 ws-axis/c/src/soap/HeaderBlock.h
Index: HeaderBlock.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/HeaderBlock.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- HeaderBlock.h 16 Nov 2004 09:18:26 -0000 1.18
+++ HeaderBlock.h 23 Nov 2004 17:21:04 -0000 1.19
@@ -18,7 +18,7 @@
#if !defined(_HEADERBLOCK_H____OF_AXIS_INCLUDED_)
#define _HEADERBLOCK_H____OF_AXIS_INCLUDED_
-#include <axis/server/IHeaderBlock.hpp>
+#include <axis/IHeaderBlock.hpp>
#include <string>
AXIS_CPP_NAMESPACE_START
1.32 +1 -1 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- SoapBody.cpp 19 Nov 2004 16:22:07 -0000 1.31
+++ SoapBody.cpp 23 Nov 2004 17:21:04 -0000 1.32
@@ -38,7 +38,7 @@
#include "SoapBody.h"
#include "SoapSerializer.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include "Attribute.h"
#include "../common/AxisTrace.h"
1.17 +1 -1 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SoapBody.h 16 Nov 2004 09:18:26 -0000 1.16
+++ SoapBody.h 23 Nov 2004 17:21:04 -0000 1.17
@@ -19,7 +19,7 @@
#include "SoapMethod.h"
#include "SoapFault.h"
-#include <axis/server/SoapEnvVersions.hpp>
+#include <axis/SoapEnvVersions.hpp>
AXIS_CPP_NAMESPACE_START
1.108 +1 -1 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.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- SoapDeSerializer.cpp 22 Nov 2004 16:10:09 -0000 1.107
+++ SoapDeSerializer.cpp 23 Nov 2004 17:21:04 -0000 1.108
@@ -51,7 +51,7 @@
#include "SoapFault.h"
#include "ComplexElement.h"
#include "CharacterElement.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include "../common/AxisTrace.h"
#include "apr_base64.h"
#include "HexCoder.h"
1.22 +1 -1 ws-axis/c/src/soap/SoapDeSerializer.h
Index: SoapDeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SoapDeSerializer.h 12 Nov 2004 11:40:06 -0000 1.21
+++ SoapDeSerializer.h 23 Nov 2004 17:21:04 -0000 1.22
@@ -17,7 +17,7 @@
#if !defined(_SOAPDESERIALIZER_H____OF_AXIS_INCLUDED_)
#define _SOAPDESERIALIZER_H____OF_AXIS_INCLUDED_
-#include <axis/server/IHandlerSoapDeSerializer.hpp>
+#include <axis/IHandlerSoapDeSerializer.hpp>
#include "HeaderBlock.h"
#include "../xml/XMLParser.h"
1.29 +1 -1 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SoapEnvelope.cpp 19 Nov 2004 16:22:07 -0000 1.28
+++ SoapEnvelope.cpp 23 Nov 2004 17:21:04 -0000 1.29
@@ -23,7 +23,7 @@
#endif
#include "SoapEnvelope.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include "SoapSerializer.h"
#include <stdio.h>
#include "../common/AxisTrace.h"
1.16 +1 -1 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SoapEnvelope.h 28 Oct 2004 10:55:28 -0000 1.15
+++ SoapEnvelope.h 23 Nov 2004 17:21:04 -0000 1.16
@@ -19,7 +19,7 @@
#include "SoapHeader.h"
#include "SoapBody.h"
-#include <axis/server/SoapEnvVersions.hpp>
+#include <axis/SoapEnvVersions.hpp>
/*
* @class SoapEnvelope
1.43 +2 -2 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- SoapFault.cpp 19 Nov 2004 16:22:07 -0000 1.42
+++ SoapFault.cpp 23 Nov 2004 17:21:04 -0000 1.43
@@ -43,8 +43,8 @@
#include "SoapFault.h"
#include "SoapSerializer.h"
#include "SoapDeSerializer.h"
-#include <axis/server/SoapEnvVersions.hpp>
-#include <axis/server/GDefine.hpp>
+#include <axis/SoapEnvVersions.hpp>
+#include <axis/GDefine.hpp>
#include "../common/AxisTrace.h"
#include "../common/AxisConfig.h"
1.9 +2 -2 ws-axis/c/src/soap/SoapFault.h
Index: SoapFault.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapFault.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SoapFault.h 26 Oct 2004 10:40:56 -0000 1.8
+++ SoapFault.h 23 Nov 2004 17:21:04 -0000 1.9
@@ -21,10 +21,10 @@
#if !defined(_SOAPFAULT_H____OF_AXIS_INCLUDED_)
#define _SOAPFAULT_H____OF_AXIS_INCLUDED_
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
#include <axis/ISoapFault.hpp>
#include "../common/Param.h"
-#include <axis/server/SoapEnvVersions.hpp>
+#include <axis/SoapEnvVersions.hpp>
#include <string>
#include <map>
1.31 +1 -1 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- SoapHeader.cpp 16 Nov 2004 09:18:26 -0000 1.30
+++ SoapHeader.cpp 23 Nov 2004 17:21:04 -0000 1.31
@@ -32,7 +32,7 @@
#include "SoapHeader.h"
#include "SoapSerializer.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include "Attribute.h"
#include "HeaderBlock.h"
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SoapKeywordMapping.h 2 Nov 2004 13:53:31 -0000 1.12
+++ SoapKeywordMapping.h 23 Nov 2004 17:21:04 -0000 1.13
@@ -18,7 +18,7 @@
#define AXIS_SOAPKEYWORDMAPPING_H__OF_AXIS_INCLUDED_
#include "../common/AxisUtils.h"
-#include <axis/server/SoapEnvVersions.hpp>
+#include <axis/SoapEnvVersions.hpp>
#include "Attribute.h"
#include <map>
1.29 +1 -1 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SoapMethod.cpp 10 Nov 2004 05:04:01 -0000 1.28
+++ SoapMethod.cpp 23 Nov 2004 17:21:04 -0000 1.29
@@ -22,7 +22,7 @@
#include "SoapMethod.h"
#include "Attribute.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
AXIS_CPP_NAMESPACE_START
1.78 +1 -1 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.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- SoapSerializer.cpp 22 Nov 2004 16:10:09 -0000 1.77
+++ SoapSerializer.cpp 23 Nov 2004 17:21:04 -0000 1.78
@@ -29,7 +29,7 @@
#include "SoapEnvelope.h"
#include "SoapSerializer.h"
#include "HeaderBlock.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include "../common/ArrayBean.h"
#include "../common/BasicTypeSerializer.h"
#include "../soap/SoapKeywordMapping.h"
1.31 +2 -2 ws-axis/c/src/soap/SoapSerializer.h
Index: SoapSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- SoapSerializer.h 22 Nov 2004 11:13:38 -0000 1.30
+++ SoapSerializer.h 23 Nov 2004 17:21:05 -0000 1.31
@@ -17,11 +17,11 @@
#if !defined(_SOAPSERIALIZER_H____OF_AXIS_INCLUDED_)
#define _SOAPSERIALIZER_H____OF_AXIS_INCLUDED_
-#include <axis/server/IHandlerSoapSerializer.hpp>
+#include <axis/IHandlerSoapSerializer.hpp>
#include "../transport/SOAPTransport.h"
#include "../common/BasicTypeSerializer.h"
-#include <axis/server/WSDDDefines.hpp>
+#include <axis/WSDDDefines.hpp>
AXIS_CPP_NAMESPACE_START
1.16 +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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- URIMapping.h 26 Oct 2004 10:40:56 -0000 1.15
+++ URIMapping.h 23 Nov 2004 17:21:05 -0000 1.16
@@ -24,7 +24,7 @@
enum URITYPE { URI_XSI, URI_XSD, URI_ENC, URI_ENVELOPE, URI_UNKNOWN};
#include <map>
#include <string>
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
AXIS_CPP_NAMESPACE_START
1.10 +1 -1 ws-axis/c/src/transport/SOAPTransport.h
Index: SOAPTransport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/SOAPTransport.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SOAPTransport.h 23 Nov 2004 04:00:17 -0000 1.9
+++ SOAPTransport.h 23 Nov 2004 17:21:06 -0000 1.10
@@ -31,7 +31,7 @@
#if !defined(AXIS_SOAPTRANSPORT_H__OF_AXIS_INCLUDED_)
#define AXIS_SOAPTRANSPORT_H__OF_AXIS_INCLUDED_
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
/**
* @file SOAPTransport.h
1.4 +1 -1 ws-axis/c/src/transport/axis2/AxisTransportException.h
Index: AxisTransportException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/AxisTransportException.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisTransportException.h 26 Oct 2004 10:41:35 -0000 1.3
+++ AxisTransportException.h 23 Nov 2004 17:21:06 -0000 1.4
@@ -22,7 +22,7 @@
#define __AXISTRANSPORTEXCEPTION_H_OF_AXIS_INCLUDED_
#include <string>
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
using namespace std;
AXIS_CPP_NAMESPACE_USE
1.8 +1 -1 ws-axis/c/src/wsdd/AxisWsddException.h
Index: AxisWsddException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/AxisWsddException.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AxisWsddException.h 26 Oct 2004 10:59:01 -0000 1.7
+++ AxisWsddException.h 23 Nov 2004 17:21:06 -0000 1.8
@@ -22,7 +22,7 @@
#define __AXISWSDDEXCEPTION_H_OF_AXIS_INCLUDED_
#include <string>
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
AXIS_CPP_NAMESPACE_START
1.45 +1 -1 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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- WSDDDeployment.cpp 19 Nov 2004 16:22:07 -0000 1.44
+++ WSDDDeployment.cpp 23 Nov 2004 17:21:06 -0000 1.45
@@ -22,7 +22,7 @@
#include "WSDDDeployment.h"
#include "WSDDDocument.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include "../common/AxisConfig.h"
#include "../common/AxisTrace.h"
#include "AxisWsddException.h"
1.14 +1 -1 ws-axis/c/src/wsdd/WSDDHandler.h
Index: WSDDHandler.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDHandler.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WSDDHandler.h 26 Oct 2004 10:59:01 -0000 1.13
+++ WSDDHandler.h 23 Nov 2004 17:21:06 -0000 1.14
@@ -21,7 +21,7 @@
#if !defined(_WSDDHANDLER_H__NCLUDED_)
#define _WSDDHANDLER_H__NCLUDED_
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
#include <string>
#include <map>
#include <list>
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WSDDKeywords.h 26 Oct 2004 10:59:01 -0000 1.9
+++ WSDDKeywords.h 23 Nov 2004 17:21:06 -0000 1.10
@@ -17,7 +17,7 @@
#if !defined(_WSDDKEYWORDS_H____OF_AXIS_INCLUDED_)
#define _WSDDKEYWORDS_H____OF_AXIS_INCLUDED_
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
/* keywords used in the wsdd file */
extern const AxisXMLCh* kw_depl;
1.12 +1 -1 ws-axis/c/src/wsdd/WSDDService.h
Index: WSDDService.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDService.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WSDDService.h 26 Oct 2004 10:59:01 -0000 1.11
+++ WSDDService.h 23 Nov 2004 17:21:06 -0000 1.12
@@ -18,7 +18,7 @@
#define _WSDDSERVICE_H__OF_AXIS_INCLUDED_
#include "WSDDHandler.h"
-#include <axis/server/WSDDDefines.hpp>
+#include <axis/WSDDDefines.hpp>
/**
* @class WSDDService
1.22 +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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ArrayParamWriter.java 23 Nov 2004 13:13:55 -0000 1.21
+++ ArrayParamWriter.java 23 Nov 2004 17:21:07 -0000 1.22
@@ -92,7 +92,7 @@
}
else
{
- writer.write("#include <axis/server/AxisUserAPI.hpp>\n\n");
+ writer.write("#include <axis/AxisUserAPI.hpp>\n\n");
}
writeArrayStruct();
this.writer.write(
1.64 +1 -1 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.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ClientStubWriter.java 9 Nov 2004 10:26:20 -0000 1.63
+++ ClientStubWriter.java 23 Nov 2004 17:21:07 -0000 1.64
@@ -172,7 +172,7 @@
+ CUtils.CPP_HEADER_SUFFIX
+ "\"\n\n");
}
- writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
+ writer.write("#include <axis/AxisWrapperAPI.hpp>\n\n");
writer.write("using namespace std;\n\n ");
}
1.16 +1 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionHeaderWriter.java
Index: ExceptionHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionHeaderWriter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ExceptionHeaderWriter.java 12 Nov 2004 12:18:36 -0000 1.15
+++ ExceptionHeaderWriter.java 23 Nov 2004 17:21:07 -0000 1.16
@@ -98,7 +98,7 @@
{
writer.write("#include <string>\n");
writer.write("#include <exception>\n");
- writer.write("#include <axis/server/AxisException.hpp>\n");
+ writer.write("#include <axis/AxisException.hpp>\n");
writer.write("#include <axis/ISoapFault.hpp>\n");
getLangName();
writer.write("using namespace std;\n");
1.14 +1 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java
Index: ExceptionWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ExceptionWriter.java 9 Nov 2004 10:26:20 -0000 1.13
+++ ExceptionWriter.java 23 Nov 2004 17:21:07 -0000 1.14
@@ -135,7 +135,7 @@
+ CUtils.CPP_HEADER_SUFFIX
+ "\"\n\n");
}
- writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
+ writer.write("#include <axis/AxisWrapperAPI.hpp>\n\n");
}
catch (IOException e)
{
1.16 +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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ParamCPPFileWriter.java 9 Nov 2004 10:26:20 -0000 1.15
+++ ParamCPPFileWriter.java 23 Nov 2004 17:21:07 -0000 1.16
@@ -127,7 +127,7 @@
+ this.classname
+ CUtils.CPP_HEADER_SUFFIX
+ "\"\n");
- writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
+ writer.write("#include <axis/AxisWrapperAPI.hpp>\n\n");
}
catch (IOException e)
{
1.25 +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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ParmHeaderFileWriter.java 9 Nov 2004 10:26:20 -0000 1.24
+++ ParmHeaderFileWriter.java 23 Nov 2004 17:21:07 -0000 1.25
@@ -187,7 +187,7 @@
{
try
{
- writer.write("#include <axis/server/AxisUserAPI.hpp>\n");
+ writer.write("#include <axis/AxisUserAPI.hpp>\n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
HashSet typeSet = new HashSet();
for (int i = 0; i < attribs.length; i++)
1.32 +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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ServiceHeaderWriter.java 9 Nov 2004 15:55:26 -0000 1.31
+++ ServiceHeaderWriter.java 23 Nov 2004 17:21:07 -0000 1.32
@@ -212,7 +212,7 @@
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
HashSet typeSet = new HashSet();
- writer.write("#include <axis/server/AxisUserAPI.hpp>\n");
+ writer.write("#include <axis/AxisUserAPI.hpp>\n");
writer.write("#include \"AxisServiceException.hpp\" \n\n");
String typeName = null;
while (types.hasNext())
1.27 +3 -3 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- WrapHeaderWriter.java 9 Nov 2004 15:55:26 -0000 1.26
+++ WrapHeaderWriter.java 23 Nov 2004 17:21:07 -0000 1.27
@@ -142,9 +142,9 @@
+ CUtils.CPP_HEADER_SUFFIX
+ "\"\n");
writer.write("#include <axis/server/WrapperClassHandler.hpp>\n");
- writer.write("#include <axis/server/IMessageData.hpp>\n");
- writer.write("#include <axis/server/GDefine.hpp>\n");
- writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n");
+ writer.write("#include <axis/IMessageData.hpp>\n");
+ writer.write("#include <axis/GDefine.hpp>\n");
+ writer.write("#include <axis/AxisWrapperAPI.hpp>\n");
writer.write("#include \"AxisServiceException.hpp\" \n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
//writeFaultHeaders();
1.56 +1 -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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ClientStubWriter.java 9 Nov 2004 10:26:21 -0000 1.55
+++ ClientStubWriter.java 23 Nov 2004 17:21:07 -0000 1.56
@@ -159,7 +159,7 @@
+ CUtils.CPP_HEADER_SUFFIX
+ "\"\n\n");
}
- writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
+ writer.write("#include <axis/AxisWrapperAPI.hpp>\n\n");
}
catch (IOException e)
{
1.18 +1 -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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ParamCPPFileWriter.java 9 Nov 2004 10:26:21 -0000 1.17
+++ ParamCPPFileWriter.java 23 Nov 2004 17:21:07 -0000 1.18
@@ -108,7 +108,7 @@
{
try
{
- writer.write("#include <axis/server/AxisWrapperAPI.hpp>\n\n");
+ writer.write("#include <axis/AxisWrapperAPI.hpp>\n\n");
writer.write(
"#include \""
+ this.classname
1.29 +2 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java
Index: ParmHeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ParmHeaderFileWriter.java 23 Nov 2004 14:56:00 -0000 1.28
+++ ParmHeaderFileWriter.java 23 Nov 2004 17:21:07 -0000 1.29
@@ -103,7 +103,7 @@
{
try
{
- writer.write("#include <axis/server/AxisUserAPI.hpp>\n");
+ writer.write("#include <axis/AxisUserAPI.hpp>\n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
Vector restrictionData = type.getEnumerationdata();
@@ -397,7 +397,7 @@
{
try
{
- writer.write("#include <axis/server/AxisUserAPI.hpp>\n");
+ writer.write("#include <axis/AxisUserAPI.hpp>\n");
writer.write("AXIS_CPP_NAMESPACE_USE \n\n");
HashSet typeSet = new HashSet();
for (int i = 0; i < attribs.length; i++)
1.22 +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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ServiceHeaderWriter.java 9 Nov 2004 15:55:26 -0000 1.21
+++ ServiceHeaderWriter.java 23 Nov 2004 17:21:07 -0000 1.22
@@ -74,7 +74,7 @@
Type atype;
Iterator types = this.wscontext.getTypemap().getTypes().iterator();
HashSet typeSet = new HashSet();
- writer.write("#include <axis/server/AxisUserAPI.hpp>\n");
+ writer.write("#include <axis/AxisUserAPI.hpp>\n");
writer.write("#include \"AxisServiceException.hpp\" \n\n");
while (types.hasNext())
{
1.5 +1 -1 ws-axis/c/src/xml/AxisParseException.h
Index: AxisParseException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/AxisParseException.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisParseException.h 26 Oct 2004 11:00:53 -0000 1.4
+++ AxisParseException.h 23 Nov 2004 17:21:08 -0000 1.5
@@ -22,7 +22,7 @@
#define __AXISPARSEEXCEPTION_H_OF_AXIS_INCLUDED_
#include <string>
-#include <axis/server/AxisException.hpp>
+#include <axis/AxisException.hpp>
using namespace std;
AXIS_CPP_NAMESPACE_USE
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- QName.h 26 Oct 2004 11:00:53 -0000 1.9
+++ QName.h 23 Nov 2004 17:21:08 -0000 1.10
@@ -22,7 +22,7 @@
#if !defined(AXIS_QNAME_H__OF_AXIS_INCLUDED_)
#define AXIS_QNAME_H__OF_AXIS_INCLUDED_
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
/*
* Qualified name according to "Namespaces in XML" specification.
1.4 +1 -1 ws-axis/c/src/xml/XMLParser.h
Index: XMLParser.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/XMLParser.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLParser.h 26 Oct 2004 11:00:53 -0000 1.3
+++ XMLParser.h 23 Nov 2004 17:21:08 -0000 1.4
@@ -29,7 +29,7 @@
#include "AnyElement.h"
#include "../transport/SOAPTransport.h"
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
AXIS_CPP_NAMESPACE_USE
1.9 +1 -1 ws-axis/c/src/xml/xerces/XercesHandler.h
Index: XercesHandler.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/xerces/XercesHandler.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XercesHandler.h 26 Oct 2004 11:00:53 -0000 1.8
+++ XercesHandler.h 23 Nov 2004 17:21:08 -0000 1.9
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <map>
#include <string>
-#include <axis/server/GDefine.hpp>
+#include <axis/GDefine.hpp>
XERCES_CPP_NAMESPACE_USE