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 su...@apache.org on 2004/07/06 16:16:48 UTC
cvs commit: ws-axis/c/vc AxisClientDLL.dsp AxisServerDLL.dsp
susantha 2004/07/06 07:16:48
Modified: c/include/axis/server IMessageData.h
IWrapperSoapDeSerializer.h
c/src/common AdminUtils.cpp ArrayBean.cpp ArrayBean.h
AxisConfig.cpp AxisConfigException.cpp
AxisGenException.cpp AxisMessage.cpp AxisTime.cpp
AxisTrace.cpp BasicTypeSerializer.cpp
MessageData.cpp Param.cpp
c/src/engine AppScopeHandlerPool.cpp Axis.cpp AxisEngine.cpp
AxisEngineException.cpp DeserializerPool.cpp
DeserializerPool.h HandlerChain.cpp
HandlerLoader.cpp HandlerLoader.h HandlerPool.cpp
HandlerPool.h SOAPTransportFactory.cpp
SerializerPool.cpp SerializerPool.h
XMLParserFactory.cpp XMLParserFactory.h
c/src/engine/client Call.cpp ClientAxisEngine.cpp
ClientAxisEngine.h Stub.cpp
c/src/engine/server ServerAxisEngine.cpp ServerAxisEngine.h
c/src/server/adminservice AxisAdminServiceWrapper.cpp
c/src/server/apache ApacheTransport.h
c/src/server/apache2 Apache2Transport.h
c/src/soap Attribute.cpp AxisSoapException.cpp
CharacterElement.cpp ComplexElement.cpp
HeaderBlock.cpp SoapBody.cpp SoapDeSerializer.cpp
SoapEnvelope.cpp SoapEnvelope.h SoapFault.cpp
SoapFault.h SoapHeader.cpp SoapMethod.h
SoapSerializer.cpp
c/src/transport/axis AxisTransport.h
AxisTransportException.cpp Channel.hpp
HttpTransport.hpp Receiver.hpp Sender.hpp
c/src/wsdd AxisWsddException.cpp WSDDDeployment.cpp
WSDDDeployment.h WSDDDocument.cpp WSDDDocument.h
WSDDHandler.cpp WSDDService.cpp WSDDTransport.h
c/src/xml AxisParseException.cpp Event.h
c/src/xml/expat XMLParserExpat.h
c/src/xml/xerces SoapBinInputStream.h XMLParserXerces.h
XercesHandler.h
c/vc AxisClientDLL.dsp AxisServerDLL.dsp
Added: c/src/common AdminUtils.h AxisConfig.h AxisConfigException.h
AxisFile.h AxisMessage.h AxisTime.h AxisTrace.h
BasicTypeSerializer.h IAdminUtils.h MessageData.h
Param.h
c/src/engine AxisEngine.h AxisEngineException.h
HandlerChain.h
c/src/soap AxisSoapException.h CharacterElement.h
HeaderBlock.h SoapDeSerializer.h SoapHeader.h
SoapSerializer.h
c/src/transport SOAPTransport.h
c/src/transport/axis AxisTransportException.h
c/src/wsdd AxisWsddException.h WSDDHandler.h WSDDService.h
c/src/xml AnyElement.h AxisParseException.h XMLParser.h
Removed: c/include/axis AxisConfigException.h AxisEngineException.h
AxisParseException.h AxisSoapException.h
AxisTransportException.h AxisWsddException.h
SOAPTransport.h
c/include/axis/server AdminUtils.h AnyElement.h AxisConfig.h
AxisEngine.h AxisFile.h AxisMessage.h AxisTime.h
AxisTrace.h BasicTypeSerializer.h
CharacterElement.h ComplexElement.h HandlerChain.h
HeaderBlock.h IAdminUtils.h MessageData.h Param.h
SoapDeSerializer.h SoapHeader.h SoapSerializer.h
WSDDHandler.h WSDDService.h XMLParser.h
Log:
Moving non-API header files from c/include/axis to c/src
Commiting entire codebase changes corresponding to above task
Revision Changes Path
1.14 +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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- IMessageData.h 4 Jul 2004 12:49:15 -0000 1.13
+++ IMessageData.h 6 Jul 2004 14:16:44 -0000 1.14
@@ -22,7 +22,7 @@
#include "GDefine.h"
class WSDDService;
-#include "IAdminUtils.h"
+class IAdminUtils;
#include "IHandlerSoapDeSerializer.h"
#include "IHandlerSoapSerializer.h"
1.24 +4 -5 ws-axis/c/include/axis/server/IWrapperSoapDeSerializer.h
Index: IWrapperSoapDeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/IWrapperSoapDeSerializer.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- IWrapperSoapDeSerializer.h 6 Jul 2004 08:34:41 -0000 1.23
+++ IWrapperSoapDeSerializer.h 6 Jul 2004 14:16:44 -0000 1.24
@@ -20,7 +20,6 @@
#include "AxisUserAPI.h"
#include "TypeMapping.h"
#include "WSDDDefines.h"
-#include <axis/SOAPTransport.h>
#ifdef __cplusplus
@@ -275,10 +274,10 @@
virtual int AXISCALL getStatus()=0;
/* Externalization of deserializer API */
- virtual int setInputStream(SOAPTransport* pInputStream)=0;
- virtual int init()=0;
- virtual PROVIDERTYPE getCurrentProviderType()=0;
- virtual void setCurrentProviderType(PROVIDERTYPE nType)=0;
+// virtual int setInputStream(SOAPTransport* pInputStream)=0;
+// virtual int init()=0;
+// virtual PROVIDERTYPE getCurrentProviderType()=0;
+// virtual void setCurrentProviderType(PROVIDERTYPE nType)=0;
virtual AXIS_BINDING_STYLE getStyle()=0;
virtual void setStyle(AXIS_BINDING_STYLE nStyle)=0;
virtual int getVersion()=0;
1.4 +1 -1 ws-axis/c/src/common/AdminUtils.cpp
Index: AdminUtils.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AdminUtils.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AdminUtils.cpp 26 Apr 2004 04:04:36 -0000 1.3
+++ AdminUtils.cpp 6 Jul 2004 14:16:44 -0000 1.4
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <axis/server/AdminUtils.h>
+#include "AdminUtils.h"
#include "../wsdd/WSDDDeployment.h"
extern WSDDDeployment* g_pWSDDDeployment;
1.25 +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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ArrayBean.cpp 25 May 2004 08:17:30 -0000 1.24
+++ ArrayBean.cpp 6 Jul 2004 14:16:44 -0000 1.25
@@ -20,10 +20,10 @@
*
*/
-#include <axis/server/Param.h>
+#include "Param.h"
#include "ArrayBean.h"
-#include <axis/server/BasicTypeSerializer.h>
-#include <axis/server/AxisEngine.h>
+#include "BasicTypeSerializer.h"
+#include "../engine/AxisEngine.h"
ArrayBean::ArrayBean()
1.14 +1 -1 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ArrayBean.h 26 Apr 2004 04:04:36 -0000 1.13
+++ ArrayBean.h 6 Jul 2004 14:16:44 -0000 1.14
@@ -21,7 +21,7 @@
#include "IArrayBean.h"
#include <axis/server/IParam.h>
-#include <axis/server/BasicTypeSerializer.h>
+#include "BasicTypeSerializer.h"
#include <list>
using namespace std;
1.35 +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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- AxisConfig.cpp 6 Jul 2004 08:34:42 -0000 1.34
+++ AxisConfig.cpp 6 Jul 2004 14:16:44 -0000 1.35
@@ -20,9 +20,9 @@
*
*/
-#include <axis/server/AxisConfig.h>
+#include "AxisConfig.h"
#include <axis/server/GDefine.h>
-#include <axis/server/AxisFile.h>
+#include "../common/AxisFile.h"
#include "AxisUtils.h"
#include <stdlib.h>
#include <stdio.h>
1.12 +3 -5 ws-axis/c/src/common/AxisConfigException.cpp
Index: AxisConfigException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfigException.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AxisConfigException.cpp 6 Jul 2004 08:34:42 -0000 1.11
+++ AxisConfigException.cpp 6 Jul 2004 14:16:44 -0000 1.12
@@ -19,9 +19,7 @@
*
*/
-#include <axis/AxisConfigException.h>
-#include <exception>
-using namespace std;
+#include "AxisConfigException.h"
/**
* Default when no parameter passed. When thrown with no parameter
@@ -89,12 +87,12 @@
delete pcMessage;
}
-const string AxisConfigException::getMessage (const exception* objException)
+const string& AxisConfigException::getMessage (const exception* objException)
{
return objException->what();
}
-const string AxisConfigException::getMessage (const int iExceptionCode)
+const string& AxisConfigException::getMessage (const int iExceptionCode)
{
switch(iExceptionCode)
{
1.5 +1 -1 ws-axis/c/src/common/AxisGenException.cpp
Index: AxisGenException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisGenException.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisGenException.cpp 6 Jul 2004 13:11:03 -0000 1.4
+++ AxisGenException.cpp 6 Jul 2004 14:16:44 -0000 1.5
@@ -50,7 +50,7 @@
AxisGenException::AxisGenException(const char* pcMessage)
{
m_sMessage = pcMessage;
-// if(pcMessage) delete pcMessage;
+/* if(pcMessage) delete pcMessage; */
}
void AxisGenException::processException (const exception* e, const int iExceptionCode)
1.7 +1 -1 ws-axis/c/src/common/AxisMessage.cpp
Index: AxisMessage.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisMessage.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AxisMessage.cpp 4 Jul 2004 12:49:16 -0000 1.6
+++ AxisMessage.cpp 6 Jul 2004 14:16:44 -0000 1.7
@@ -18,7 +18,7 @@
*
*/
-#include <axis/server/AxisMessage.h>
+#include "AxisMessage.h"
const string& AxisMessage::getMessage(int iExceptionCode)
{
1.23 +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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AxisTime.cpp 25 May 2004 03:47:33 -0000 1.22
+++ AxisTime.cpp 6 Jul 2004 14:16:44 -0000 1.23
@@ -20,7 +20,7 @@
*/
#include <stdio.h>
-#include <axis/server/AxisTime.h>
+#include "AxisTime.h"
#include "AxisUtils.h"
#define TIMEBUFFSIZE 80
1.28 +2 -2 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- AxisTrace.cpp 10 Jun 2004 04:41:01 -0000 1.27
+++ AxisTrace.cpp 6 Jul 2004 14:16:44 -0000 1.28
@@ -19,12 +19,12 @@
*
*/
-#include <axis/server/AxisTrace.h>
+#include "AxisTrace.h"
#include <time.h>
#include <stdio.h>
#include "AxisUtils.h"
#include <axis/server/GDefine.h>
-#include <axis/server/AxisConfig.h>
+#include "AxisConfig.h"
extern AxisConfig* g_pConfig;
1.27 +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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- BasicTypeSerializer.cpp 26 Apr 2004 04:04:36 -0000 1.26
+++ BasicTypeSerializer.cpp 6 Jul 2004 14:16:44 -0000 1.27
@@ -21,7 +21,7 @@
#include <stdio.h>
-#include <axis/server/BasicTypeSerializer.h>
+#include "BasicTypeSerializer.h"
#include "../soap/apr_base64.h"
#include "../soap/HexCoder.h"
1.24 +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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- MessageData.cpp 26 Apr 2004 04:04:36 -0000 1.23
+++ MessageData.cpp 6 Jul 2004 14:16:44 -0000 1.24
@@ -20,7 +20,7 @@
*/
-#include <axis/server/MessageData.h>
+#include "../common/MessageData.h"
#include "IDeployerUtils.h"
#include "../wsdd/WSDDDeployment.h"
1.37 +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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Param.cpp 17 Jun 2004 06:02:11 -0000 1.36
+++ Param.cpp 6 Jul 2004 14:16:44 -0000 1.37
@@ -19,10 +19,10 @@
*
*/
-#include <axis/server/AxisEngine.h>
-#include <axis/server/Param.h>
+#include "../engine/AxisEngine.h"
+#include "Param.h"
#include "ArrayBean.h"
-#include <axis/server/BasicTypeSerializer.h>
+#include "BasicTypeSerializer.h"
#include <stdlib.h>
#include <stdio.h>
#include "AxisUtils.h"
1.1 ws-axis/c/src/common/AdminUtils.h
Index: AdminUtils.h
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @file AdminUtils.h
* This file contains all the special functionalities that the Admin Web
* service is provided by the Axis Engine.
*
* @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
*/
#if !defined(_ADMINUTILS_H____OF_AXIS_INCLUDED_)
#define _ADMINUTILS_H____OF_AXIS_INCLUDED_
#include "IAdminUtils.h"
/**
* @class AdminUtils
*
* This class contains all the special functionalities that the Admin Web
* service is provided by the Axis Engine. Such as deploying and undeploying
* services/handlers dynamically.
*
* @brief This class contains the Server side administration
* functionalities
*/
class AdminUtils : public IAdminUtils
{
public:
AdminUtils();
virtual ~AdminUtils();
/**
* Updates the WSDD information of the Axis Engine. This functions is
* called by the Admin Web service when the Admin Client is used to
* deploy a web service.
*
* @brief Updates the WSDD information of Axis Engine.
* @param wsdd A character buffer containing xml of the new wsdd.
* @return AXIS_SUCCESS if the WSDD update successful, AXIS_FAIL otherwise.
*/
int updateWSDD(AxisChar* wsdd);
};
#endif
1.10 +82 -20 ws-axis/c/src/common/AxisConfig.h
1.4 +12 -11 ws-axis/c/src/common/AxisConfigException.h
1.1 ws-axis/c/src/common/AxisFile.h
Index: AxisFile.h
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @file AxisFile.h
*
* @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
*
*/
#if !defined(__AXIS_AXISFILE_H_OF_AXIS_INCLUDED__)
#define __AXIS_AXISFILE_H_OF_AXIS_INCLUDED__
#include <axis/server/GDefine.h>
#include <stdio.h>
#include <string.h>
/**
* @class AxisFile
* @brief class for allocating file resources for Axis C++
*
* The purpose of this class is to provide a mechanism which allows Axis C++
* to use file resources without worrying about releasing resources.
* How to use this class:
* When you need the file resource inside a method do as following
* AxisFile fileConfig;
* fileConfig.fileOpen("char* file name parameter", "<char* file Permission parameter")
* fileGet(<char* line>, <int buffersize>) etc
* No need to worry about file closing because when fileConfig go out of local scope
* it's destructor is called and inside it fclose is called
*
* @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
*/
class AxisFile
{
public:
/**
* Default constructor
*/
AxisFile()
{
pFILEFile = NULL;
}
/**
* Constructor with one paratmer
* @param pointer to a FILE
*/
AxisFile(FILE* pFILEParamFile)
{
pFILEFile = pFILEParamFile;
}
/** Use this to open a file
* @param file name
* @param file permission
* @return error code
*/
int fileOpen(const char* sFileName, const char* sFilePerm)
{
if ((pFILEFile = fopen (sFileName, sFilePerm)) == NULL)
return AXIS_FAIL;
return AXIS_SUCCESS;
}
/** Use this to read a line from the file
* @param char buffer into which line is read
* @param buffer size
* @return error code
*/
int fileGet(char* sLine, int iBufferSize)
{
if(fgets (sLine, iBufferSize, pFILEFile) != NULL )
{
char * newline = strpbrk(sLine, "\n");
if(newline)
{
*newline = '\0';
}
return AXIS_SUCCESS;
}
return AXIS_FAIL;
}
/** Use this to write a line to the file
* @param char buffer to be written to the file
*/
int filePuts (const char* pcWrite)
{
if (-1 < fputs(pcWrite, pFILEFile))
return AXIS_SUCCESS;
return AXIS_FAIL;
}
/** Use this flush the buffer
*/
int fileFlush ()
{
if (0 == fflush(pFILEFile))
return AXIS_SUCCESS;
return AXIS_FAIL;
}
~AxisFile()
{
if(pFILEFile)
fclose(pFILEFile);
}
private:
FILE* pFILEFile;
};
#endif
1.1 ws-axis/c/src/common/AxisMessage.h
Index: AxisMessage.h
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/**
* @file AxisMessage.h
*
* @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
*
*/
#ifndef __AXISMESSAGE_H_OF_AXIS_INCLUDED_
#define __AXISMESSAGE_H_OF_AXIS_INCLUDED_
#include <string>
#include <axis/server/AxisException.h>
using namespace std;
class AxisMessage
{
public:
AxisMessage(){};
virtual ~AxisMessage(){};
const string& getMessage(int iExceptionCode);
private:
string m_sMessage;
int m_iExceptionCode;
};
#endif
1.7 +40 -72 ws-axis/c/src/common/AxisTime.h
1.8 +156 -80 ws-axis/c/src/common/AxisTrace.h
1.16 +71 -102 ws-axis/c/src/common/BasicTypeSerializer.h
1.1 ws-axis/c/src/common/IAdminUtils.h
Index: IAdminUtils.h
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @file IAdminUtils.h
*
* This file contains all the special functionalities that the Admin Web
* service is provided by the Axis Engine.
*
* @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
*/
#if !defined(_IADMINUTILS_H____OF_AXIS_INCLUDED_)
#define _IADMINUTILS_H____OF_AXIS_INCLUDED_
#include <axis/server/AxisUserAPI.h>
/**
* @interface IAdminUtils
*
* This interface contains all the special functionalities that the Admin Web
* service is provided by the Axis Engine. Such as deploying and undeploying
* services/handlers dynamically.
*
* @brief This Interface contains the Server side administration
* functionalities
* @author Suasntha Kumara (skumara@virtusa.com, susantha@opensource.lk)
*/
class IAdminUtils
{
public:
virtual ~IAdminUtils(){};
/**
* Updates the WSDD information of the Axis Engine. This functions is
* called by the Admin Web service when the Admin Client is used to
* deploy a web service.
*
* @brief Updates the WSDD information of Axis Engine.
* @param wsdd A character buffer containing xml of the new wsdd.
* @return AXIS_SUCCESS if the WSDD update successful, AXIS_FAIL otherwise.
*/
virtual int updateWSDD(AxisChar* wsdd)=0;
};
#endif
1.14 +68 -104 ws-axis/c/src/common/MessageData.h
1.21 +45 -89 ws-axis/c/src/common/Param.h
1.14 +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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AppScopeHandlerPool.cpp 10 Jun 2004 10:07:52 -0000 1.13
+++ AppScopeHandlerPool.cpp 6 Jul 2004 14:16:45 -0000 1.14
@@ -23,7 +23,7 @@
#include "AppScopeHandlerPool.h"
#include "HandlerLoader.h"
#include <axis/server/AxisException.h>
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
extern AxisTrace* g_pAT;
extern HandlerLoader* g_pHandlerLoader;
1.64 +3 -3 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.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- Axis.cpp 6 Jul 2004 06:46:36 -0000 1.63
+++ Axis.cpp 6 Jul 2004 14:16:45 -0000 1.64
@@ -31,7 +31,7 @@
#ifdef AXIS_CLIENT_LIB
#include <axis/client/Call.h>
-#include <axis/server/AxisEngine.h>
+#include "AxisEngine.h"
#else
#include "server/ServerAxisEngine.h"
#endif
@@ -55,9 +55,9 @@
#include "DeserializerPool.h"
#include "../wsdd/WSDDDeployment.h"
#include "../common/AxisUtils.h"
-#include <axis/server/AxisConfig.h>
+#include "../common/AxisConfig.h"
#include "../wsdd/WSDDKeywords.h"
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
#include "SOAPTransportFactory.h"
#include "XMLParserFactory.h"
1.31 +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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- AxisEngine.cpp 26 Apr 2004 04:04:36 -0000 1.30
+++ AxisEngine.cpp 6 Jul 2004 14:16:45 -0000 1.31
@@ -18,13 +18,13 @@
*
*/
-#include <axis/server/AxisEngine.h>
+#include "AxisEngine.h"
#include <stdio.h>
#include "HandlerPool.h"
#include "DeserializerPool.h"
#include "SerializerPool.h"
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
extern AxisTrace* g_pAT;
extern DeserializerPool* g_pDeserializerPool;
1.13 +3 -5 ws-axis/c/src/engine/AxisEngineException.cpp
Index: AxisEngineException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngineException.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AxisEngineException.cpp 6 Jul 2004 08:34:42 -0000 1.12
+++ AxisEngineException.cpp 6 Jul 2004 14:16:45 -0000 1.13
@@ -19,9 +19,7 @@
*
*/
-#include <axis/AxisEngineException.h>
-#include <exception>
-using namespace std;
+#include "AxisEngineException.h"
/**
* Default when no parameter passed. When thrown with no parameter
@@ -87,13 +85,13 @@
if(pcMessage)
delete pcMessage;
}
-const string AxisEngineException::getMessage (const exception* objException)
+const string& AxisEngineException::getMessage (const exception* objException)
{
return objException->what();
}
-const string AxisEngineException::getMessage (const int iExceptionCode)
+const string& AxisEngineException::getMessage (const int iExceptionCode)
{
switch(iExceptionCode)
{
1.13 +3 -3 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DeserializerPool.cpp 26 Apr 2004 04:04:36 -0000 1.12
+++ DeserializerPool.cpp 6 Jul 2004 14:16:45 -0000 1.13
@@ -20,7 +20,7 @@
*/
#include "DeserializerPool.h"
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
extern AxisTrace* g_pAT;
DeserializerPool::DeserializerPool ()
@@ -52,7 +52,7 @@
#else
*ppDZ = new SoapDeSerializer ();
#endif
- if (AXIS_SUCCESS != (*ppDZ)->init ())
+ if (AXIS_SUCCESS != ((SoapDeSerializer*)(*ppDZ))->init ())
{
delete* ppDZ;
*ppDZ = NULL;
@@ -67,7 +67,7 @@
int DeserializerPool::putInstance (IWrapperSoapDeSerializer* pDZ)
{
- if (AXIS_SUCCESS != pDZ->init ())
+ if (AXIS_SUCCESS != ((SoapDeSerializer*)pDZ)->init ())
{
delete pDZ;
return AXIS_FAIL;
1.10 +1 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DeserializerPool.h 26 Apr 2004 04:04:36 -0000 1.9
+++ DeserializerPool.h 6 Jul 2004 14:16:45 -0000 1.10
@@ -24,7 +24,7 @@
#include <axis/server/IWrapperSoapDeSerializer.h>
extern void* GetUserDeSerializer();
#else
-#include <axis/server/SoapDeSerializer.h>
+#include "../soap/SoapDeSerializer.h"
#endif
#include <axis/server/GDefine.h>
#include <list>
1.17 +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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- HandlerChain.cpp 26 Apr 2004 04:04:36 -0000 1.16
+++ HandlerChain.cpp 6 Jul 2004 14:16:45 -0000 1.17
@@ -20,8 +20,8 @@
*/
-#include <axis/server/HandlerChain.h>
-#include <axis/server/AxisTrace.h>
+#include "HandlerChain.h"
+#include "../common/AxisTrace.h"
extern AxisTrace* g_pAT;
HandlerChain::HandlerChain ()
1.28 +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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- HandlerLoader.cpp 10 Jun 2004 10:07:52 -0000 1.27
+++ HandlerLoader.cpp 6 Jul 2004 14:16:45 -0000 1.28
@@ -27,7 +27,7 @@
#include <stdio.h>
#include "../common/AxisUtils.h"
#include "../wsdd/WSDDDeployment.h"
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
extern AxisTrace* g_pAT;
extern WSDDDeployment* g_pWSDDDeployment;
1.14 +3 -3 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HandlerLoader.h 13 Jun 2004 11:48:40 -0000 1.13
+++ HandlerLoader.h 6 Jul 2004 14:16:45 -0000 1.14
@@ -19,12 +19,12 @@
#if !defined(__HANDLERLOADER_H_OF_AXIS_INCLUDED__)
#define __HANDLERLOADER_H_OF_AXIS_INCLUDED__
-#include <axis/server/MessageData.h>
+#include "../common/MessageData.h"
#include <axis/server/GDefine.h>
#include <axis/server/WrapperClassHandler.h>
#include "SharedObject.h"
-#include <axis/AxisEngineException.h>
-#include <axis/AxisConfigException.h>
+#include "AxisEngineException.h"
+#include "../common/AxisConfigException.h"
#include <map>
#include <string>
1.29 +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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- HandlerPool.cpp 10 Jun 2004 10:07:52 -0000 1.28
+++ HandlerPool.cpp 6 Jul 2004 14:16:45 -0000 1.29
@@ -26,7 +26,7 @@
#include "SessionScopeHandlerPool.h"
#include "../wsdd/WSDDDeployment.h"
#include <axis/server/AxisException.h>
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
extern AxisTrace* g_pAT;
extern AppScopeHandlerPool* g_pAppScopeHandlerPool;
1.10 +3 -3 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- HandlerPool.h 26 Apr 2004 04:04:36 -0000 1.9
+++ HandlerPool.h 6 Jul 2004 14:16:45 -0000 1.10
@@ -23,11 +23,11 @@
#if !defined(AXIS_HANDLERPOOL_H__OF_AXIS_INCLUDED_)
#define AXIS_HANDLERPOOL_H__OF_AXIS_INCLUDED_
-#include <axis/server/WSDDHandler.h>
-#include <axis/server/WSDDService.h>
+#include "../wsdd/WSDDHandler.h"
+#include "../wsdd/WSDDService.h"
#include <axis/server/BasicHandler.h>
#include "HandlerLoader.h"
-#include <axis/server/HandlerChain.h>
+#include "HandlerChain.h"
#include "SharedObject.h"
#include <list>
1.9 +4 -4 ws-axis/c/src/engine/SOAPTransportFactory.cpp
Index: SOAPTransportFactory.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/SOAPTransportFactory.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SOAPTransportFactory.cpp 28 Jun 2004 04:21:38 -0000 1.8
+++ SOAPTransportFactory.cpp 6 Jul 2004 14:16:45 -0000 1.9
@@ -22,11 +22,11 @@
*/
#include "SOAPTransportFactory.h"
-#include <axis/SOAPTransport.h>
+#include "../transport/SOAPTransport.h"
#include <stdio.h>
-#include <axis/server/AxisConfig.h>
-#include <axis/AxisEngineException.h>
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisConfig.h"
+#include "AxisEngineException.h"
+#include "../common/AxisTrace.h"
extern AxisTrace* g_pAT;
extern AxisConfig* g_pConfig;
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SerializerPool.cpp 4 Jul 2004 12:49:16 -0000 1.14
+++ SerializerPool.cpp 6 Jul 2004 14:16:45 -0000 1.15
@@ -20,7 +20,7 @@
*/
#include "SerializerPool.h"
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
extern AxisTrace* g_pAT;
SerializerPool::SerializerPool ()
1.10 +1 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SerializerPool.h 26 Apr 2004 04:04:36 -0000 1.9
+++ SerializerPool.h 6 Jul 2004 14:16:45 -0000 1.10
@@ -24,7 +24,7 @@
#include <axis/server/IWrapperSoapSerializer.h>
extern void* GetUserSerializer();
#else
-#include <axis/server/SoapSerializer.h>
+#include "../soap/SoapSerializer.h"
#endif
#include <axis/server/GDefine.h>
#include <list>
1.13 +4 -4 ws-axis/c/src/engine/XMLParserFactory.cpp
Index: XMLParserFactory.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/XMLParserFactory.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLParserFactory.cpp 28 Jun 2004 04:21:38 -0000 1.12
+++ XMLParserFactory.cpp 6 Jul 2004 14:16:45 -0000 1.13
@@ -22,11 +22,11 @@
*/
#include "XMLParserFactory.h"
-#include <axis/server/XMLParser.h>
+#include "../xml/XMLParser.h"
#include <stdio.h>
-#include <axis/server/AxisConfig.h>
-#include <axis/AxisEngineException.h>
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisConfig.h"
+#include "AxisEngineException.h"
+#include "../common/AxisTrace.h"
extern AxisTrace* g_pAT;
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLParserFactory.h 25 May 2004 03:47:33 -0000 1.2
+++ XMLParserFactory.h 6 Jul 2004 14:16:45 -0000 1.3
@@ -26,7 +26,7 @@
#define AXIS_XMLPARSERFACTORY_H__OF_AXIS_INCLUDED_
#include <axis/server/GDefine.h>
-#include <axis/server/XMLParser.h>
+#include "../xml/XMLParser.h"
#define CREATE_FUNCTION2 "CreateInstance"
#define DELETE_FUNCTION2 "DestroyInstance"
1.11 +49 -81 ws-axis/c/src/engine/AxisEngine.h
1.3 +12 -10 ws-axis/c/src/engine/AxisEngineException.h
1.8 +42 -88 ws-axis/c/src/engine/HandlerChain.h
1.52 +5 -5 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Call.cpp 6 Jul 2004 08:34:42 -0000 1.51
+++ Call.cpp 6 Jul 2004 14:16:46 -0000 1.52
@@ -27,15 +27,15 @@
#include <axis/client/Call.h>
-#include <axis/server/AxisConfig.h>
+#include "../../common/AxisConfig.h"
#include "../../transport/axis/AxisTransport.h"
#include "../../transport/axis/Channel.hpp"
#include "ClientAxisEngine.h"
#include "../SOAPTransportFactory.h"
-#include <axis/SOAPTransport.h>
-#include <axis/server/SoapSerializer.h>
-#include <axis/server/SoapDeSerializer.h>
-#include <axis/server/HeaderBlock.h>
+#include "../../transport/SOAPTransport.h"
+#include "../../soap/SoapSerializer.h"
+#include "../../soap/SoapDeSerializer.h"
+#include "../../soap/HeaderBlock.h"
extern "C" int initialize_module (int bServer);
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ClientAxisEngine.cpp 28 Jun 2004 04:21:38 -0000 1.12
+++ ClientAxisEngine.cpp 6 Jul 2004 14:16:46 -0000 1.13
@@ -19,7 +19,7 @@
#include "../../wsdd/WSDDDeployment.h"
#include "../HandlerPool.h"
#include <axis/server/AxisException.h>
-#include <axis/server/AxisTrace.h>
+#include "../../common/AxisTrace.h"
extern AxisTrace* g_pAT;
extern WSDDDeployment* g_pWSDDDeployment;
1.8 +1 -1 ws-axis/c/src/engine/client/ClientAxisEngine.h
Index: ClientAxisEngine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/ClientAxisEngine.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClientAxisEngine.h 12 May 2004 07:36:46 -0000 1.7
+++ ClientAxisEngine.h 6 Jul 2004 14:16:46 -0000 1.8
@@ -18,7 +18,7 @@
#if !defined(AXIS_CLIENTAXISENGINE_H__OF_AXIS_INCLUDED_)
#define AXIS_CLIENTAXISENGINE_H__OF_AXIS_INCLUDED_
-#include <axis/server/AxisEngine.h>
+#include "../AxisEngine.h"
/*
* @class ClientAxisEngine
* @brief
1.15 +2 -2 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Stub.cpp 4 Jul 2004 12:49:16 -0000 1.14
+++ Stub.cpp 6 Jul 2004 14:16:46 -0000 1.15
@@ -39,9 +39,9 @@
#include <axis/client/Stub.h>
#include <stdio.h>
-#include <axis/SOAPTransport.h>
+#include "../../transport/SOAPTransport.h"
#include <axis/server/AxisWrapperAPI.h>
-#include <axis/server/SoapSerializer.h>
+#include "../../soap/SoapSerializer.h"
StubFunctions Stub::ms_VFtable;
bool Stub::bInitialized = false;
1.20 +2 -2 ws-axis/c/src/engine/server/ServerAxisEngine.cpp
Index: ServerAxisEngine.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/server/ServerAxisEngine.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ServerAxisEngine.cpp 10 Jun 2004 10:07:53 -0000 1.19
+++ ServerAxisEngine.cpp 6 Jul 2004 14:16:46 -0000 1.20
@@ -22,8 +22,8 @@
#include "../../common/AxisUtils.h"
#include "../../wsdd/WSDDDeployment.h"
#include "../HandlerPool.h"
-#include <axis/server/AxisMessage.h>
-#include <axis/server/AxisTrace.h>
+#include "../../common/AxisMessage.h"
+#include "../../common/AxisTrace.h"
extern AxisTrace* g_pAT;
extern HandlerPool* g_pHandlerPool;
1.9 +5 -5 ws-axis/c/src/engine/server/ServerAxisEngine.h
Index: ServerAxisEngine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/server/ServerAxisEngine.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServerAxisEngine.h 13 Jun 2004 11:48:40 -0000 1.8
+++ ServerAxisEngine.h 6 Jul 2004 14:16:46 -0000 1.9
@@ -18,11 +18,11 @@
#if !defined(AXIS_SERVERAXISENGINE_H__OF_AXIS_INCLUDED_)
#define AXIS_SERVERAXISENGINE_H__OF_AXIS_INCLUDED_
-#include <axis/server/AxisEngine.h>
-#include <axis/AxisEngineException.h>
-#include <axis/AxisSoapException.h>
-#include <axis/AxisWsddException.h>
-#include <axis/AxisConfigException.h>
+#include "../AxisEngine.h"
+#include "../AxisEngineException.h"
+#include "../../soap/AxisSoapException.h"
+#include "../../wsdd/AxisWsddException.h"
+#include "../../common/AxisConfigException.h"
/*
* @class ServerAxisEngine
* @brief interface for the ServerAxisEngine class.
1.5 +1 -0 ws-axis/c/src/server/adminservice/AxisAdminServiceWrapper.cpp
Index: AxisAdminServiceWrapper.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/adminservice/AxisAdminServiceWrapper.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisAdminServiceWrapper.cpp 27 Apr 2004 03:23:08 -0000 1.4
+++ AxisAdminServiceWrapper.cpp 6 Jul 2004 14:16:46 -0000 1.5
@@ -22,6 +22,7 @@
*/
#include "AxisAdminServiceWrapper.h"
+#include "../../common/IAdminUtils.h"
AxisAdminServiceWrapper::AxisAdminServiceWrapper ()
{
1.4 +1 -1 ws-axis/c/src/server/apache/ApacheTransport.h
Index: ApacheTransport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache/ApacheTransport.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheTransport.h 8 Jun 2004 12:02:02 -0000 1.3
+++ ApacheTransport.h 6 Jul 2004 14:16:46 -0000 1.4
@@ -32,7 +32,7 @@
#include <apache1_3/http_log.h>
#include <apache1_3/http_protocol.h>
#include <apache1_3/http_main.h>
-#include <axis/SOAPTransport.h>
+#include "../../transport/SOAPTransport.h"
#include <string.h>
class ApacheTransport : public SOAPTransport
1.3 +1 -1 ws-axis/c/src/server/apache2/Apache2Transport.h
Index: Apache2Transport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache2/Apache2Transport.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Apache2Transport.h 8 Jun 2004 12:02:02 -0000 1.2
+++ Apache2Transport.h 6 Jul 2004 14:16:46 -0000 1.3
@@ -33,7 +33,7 @@
#include <apache2_0/http_log.h>
#include <apache2_0/ap_compat.h>
#include <apache2_0/apr_tables.h>
-#include <axis/SOAPTransport.h>
+#include "../../transport/SOAPTransport.h"
#include <string.h>
class Apache2Transport : public SOAPTransport
1.20 +1 -1 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Attribute.cpp 14 Jun 2004 08:00:46 -0000 1.19
+++ Attribute.cpp 6 Jul 2004 14:16:46 -0000 1.20
@@ -39,7 +39,7 @@
#include <axis/server/Attribute.h>
#include <axis/server/GDefine.h>
-#include <axis/server/SoapSerializer.h>
+#include "SoapSerializer.h"
AttributeFunctions Attribute::ms_VFtable;
bool Attribute::bInitialized = false;
1.13 +3 -5 ws-axis/c/src/soap/AxisSoapException.cpp
Index: AxisSoapException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/AxisSoapException.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AxisSoapException.cpp 6 Jul 2004 08:34:42 -0000 1.12
+++ AxisSoapException.cpp 6 Jul 2004 14:16:46 -0000 1.13
@@ -19,9 +19,7 @@
*
*/
-#include <axis/AxisSoapException.h>
-#include <exception>
-using namespace std;
+#include "AxisSoapException.h"
/**
* Default when no parameter passed. When thrown with no parameter
@@ -87,12 +85,12 @@
if(pcMessage)
delete pcMessage;
}
-const string AxisSoapException::getMessage (const exception* objException)
+const string& AxisSoapException::getMessage (const exception* objException)
{
return objException->what();
}
-const string AxisSoapException::getMessage (const int iExceptionCode)
+const string& AxisSoapException::getMessage (const int iExceptionCode)
{
switch(iExceptionCode)
{
1.16 +2 -2 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CharacterElement.cpp 1 Jun 2004 06:42:18 -0000 1.15
+++ CharacterElement.cpp 6 Jul 2004 14:16:46 -0000 1.16
@@ -38,8 +38,8 @@
/* CharacterElement.cpp: implementation of the CharacterElement class. */
-#include <axis/server/CharacterElement.h>
-#include <axis/server/SoapSerializer.h>
+#include "CharacterElement.h"
+#include "SoapSerializer.h"
#include <axis/server/GDefine.h>
CharacterElement::CharacterElement():BasicNode( NULL, CHARACTER_NODE)
1.18 +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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ComplexElement.cpp 1 Jul 2004 13:42:48 -0000 1.17
+++ ComplexElement.cpp 6 Jul 2004 14:16:46 -0000 1.18
@@ -43,7 +43,7 @@
#include "ComplexElement.h"
-#include <axis/server/SoapSerializer.h>
+#include "SoapSerializer.h"
#include <axis/server/GDefine.h>
ComplexElement::ComplexElement()
1.26 +4 -4 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- HeaderBlock.cpp 6 Jul 2004 08:34:42 -0000 1.25
+++ HeaderBlock.cpp 6 Jul 2004 14:16:46 -0000 1.26
@@ -52,13 +52,13 @@
#pragma warning (disable : 4786)
#endif
-#include <axis/server/HeaderBlock.h>
-#include <axis/server/SoapSerializer.h>
+#include "HeaderBlock.h"
+#include "SoapSerializer.h"
#include <axis/server/GDefine.h>
#include <axis/server/BasicNode.h>
#include "ComplexElement.h"
-#include <axis/server/CharacterElement.h>
-#include <axis/server/Attribute.h>
+#include "CharacterElement.h"
+#include <axis/server/attribute.h>
HeaderBlockFunctions IHeaderBlock::ms_VFtable;
bool IHeaderBlock::bInitialized = false;
1.25 +2 -2 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- SoapBody.cpp 14 Jun 2004 08:00:46 -0000 1.24
+++ SoapBody.cpp 6 Jul 2004 14:16:46 -0000 1.25
@@ -37,10 +37,10 @@
*/
#include "SoapBody.h"
-#include <axis/server/SoapSerializer.h>
+#include "SoapSerializer.h"
#include <axis/server/GDefine.h>
#include <axis/server/Attribute.h>
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
extern AxisTrace* g_pAT;
SoapBody::SoapBody()
1.73 +6 -6 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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- SoapDeSerializer.cpp 6 Jul 2004 08:34:42 -0000 1.72
+++ SoapDeSerializer.cpp 6 Jul 2004 14:16:46 -0000 1.73
@@ -33,26 +33,26 @@
#pragma warning (disable : 4101)
#endif
-#include <axis/server/SoapDeSerializer.h>
+#include "SoapDeSerializer.h"
#include "SoapEnvelope.h"
#include "SoapKeywordMapping.h"
#include "URIMapping.h"
-#include <axis/server/SoapHeader.h>
+#include "SoapHeader.h"
#include "SoapMethod.h"
#include "SoapBody.h"
#include "SoapFault.h"
#include "ComplexElement.h"
-#include <axis/server/CharacterElement.h>
+#include "CharacterElement.h"
#include <axis/server/GDefine.h>
#include <axis/server/Packet.h>
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
#include "apr_base64.h"
#include "HexCoder.h"
#include "../engine/XMLParserFactory.h"
-#include <axis/server/XMLParser.h>
+#include "../xml/XMLParser.h"
#include "../xml/QName.h"
#include <axis/server/Attribute.h>
-#include <axis/AxisSoapException.h>
+#include "AxisSoapException.h"
#include <axis/AxisGenException.h>
#include <list>
1.22 +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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SoapEnvelope.cpp 4 Jul 2004 12:49:16 -0000 1.21
+++ SoapEnvelope.cpp 6 Jul 2004 14:16:46 -0000 1.22
@@ -24,11 +24,11 @@
#include "SoapEnvelope.h"
#include <axis/server/GDefine.h>
-#include <axis/server/SoapSerializer.h>
+#include "SoapSerializer.h"
#include <axis/server/Attribute.h>
#include <stdio.h>
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
extern AxisTrace* g_pAT;
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SoapEnvelope.h 14 Jun 2004 08:00:46 -0000 1.12
+++ SoapEnvelope.h 6 Jul 2004 14:16:46 -0000 1.13
@@ -17,7 +17,7 @@
#if !defined(AXIS_SOAPENVELOPE_H__OF_AXIS_INCLUDED_)
#define AXIS_SOAPENVELOPE_H__OF_AXIS_INCLUDED_
-#include <axis/server/SoapHeader.h>
+#include "SoapHeader.h"
#include "SoapBody.h"
#include <axis/server/SoapEnvVersions.h>
1.35 +4 -5 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- SoapFault.cpp 6 Jul 2004 13:15:58 -0000 1.34
+++ SoapFault.cpp 6 Jul 2004 14:16:46 -0000 1.35
@@ -41,12 +41,12 @@
*/
#include "SoapFault.h"
-#include <axis/server/SoapSerializer.h>
+#include "SoapSerializer.h"
+#include "SoapDeSerializer.h"
#include <axis/server/SoapEnvVersions.h>
#include <axis/server/GDefine.h>
-#include <axis/server/AxisConfig.h>
-#include <axis/server/AxisTrace.h>
-
+#include "../common/AxisTrace.h"
+#include "../common/AxisConfig.h"
extern AxisTrace* g_pAT;
extern AxisConfig* g_pConfig;
@@ -63,7 +63,6 @@
delete m_pFaultstringParam;
delete m_pFaultactorParam;
delete m_pFaultDetail;
-
m_pFaultcodeParam = NULL;
m_pFaultstringParam = NULL;
m_pFaultactorParam = NULL;
1.6 +6 -6 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SoapFault.h 6 Jul 2004 08:34:42 -0000 1.5
+++ SoapFault.h 6 Jul 2004 14:16:46 -0000 1.6
@@ -21,15 +21,15 @@
#if !defined(_SOAPFAULT_H____OF_AXIS_INCLUDED_)
#define _SOAPFAULT_H____OF_AXIS_INCLUDED_
-#include <string>
-#include <map>
#include <axis/server/AxisException.h>
-#include <axis/server/Param.h>
-#include <axis/server/SoapDeSerializer.h>
#include <axis/ISoapFault.h>
-
+#include "../common/Param.h"
+#include <axis/server/SoapEnvVersions.h>
class SoapSerializer;
-//class SoapDeSerializer;
+class SoapDeSerializer;
+
+#include <string>
+#include <map>
using namespace std;
1.22 +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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SoapHeader.cpp 4 Jul 2004 12:49:16 -0000 1.21
+++ SoapHeader.cpp 6 Jul 2004 14:16:46 -0000 1.22
@@ -30,11 +30,11 @@
#pragma warning (disable : 4786)
#endif
-#include <axis/server/SoapHeader.h>
-#include <axis/server/SoapSerializer.h>
+#include "SoapHeader.h"
+#include "SoapSerializer.h"
#include <axis/server/GDefine.h>
#include <axis/server/Attribute.h>
-#include <axis/server/HeaderBlock.h>
+#include "HeaderBlock.h"
SoapHeader::SoapHeader()
{
1.20 +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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SoapMethod.h 14 Jun 2004 08:00:46 -0000 1.19
+++ SoapMethod.h 6 Jul 2004 14:16:46 -0000 1.20
@@ -18,9 +18,9 @@
#if !defined(AXIS_SOAPMETHOD_H__OF_AXIS_INCLUDED_)
#define AXIS_SOAPMETHOD_H__OF_AXIS_INCLUDED_
-#include <axis/server/Param.h>
+#include "../common/Param.h"
#include "../common/ISoapMethod.h"
-#include <axis/server/SoapSerializer.h>
+#include "SoapSerializer.h"
#include <list>
class Attribute;
1.64 +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.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- SoapSerializer.cpp 6 Jul 2004 08:34:42 -0000 1.63
+++ SoapSerializer.cpp 6 Jul 2004 14:16:46 -0000 1.64
@@ -27,19 +27,19 @@
#endif
#include "SoapEnvelope.h"
-#include <axis/server/SoapSerializer.h>
-#include <axis/server/HeaderBlock.h>
+#include "SoapSerializer.h"
+#include "HeaderBlock.h"
#include <axis/server/GDefine.h>
#include <axis/server/Packet.h>
#include "../common/ArrayBean.h"
-#include <axis/server/BasicTypeSerializer.h>
+#include "../common/BasicTypeSerializer.h"
#include "../soap/SoapKeywordMapping.h"
-#include <axis/AxisSoapException.h>
-#include <axis/server/AxisConfig.h>
+#include "AxisSoapException.h"
#include <stdio.h>
#include <stdarg.h>
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
+#include "../common/AxisConfig.h"
extern AxisTrace* g_pAT;
extern AxisConfig* g_pConfig;
1.4 +13 -11 ws-axis/c/src/soap/AxisSoapException.h
1.7 +172 -72 ws-axis/c/src/soap/CharacterElement.h
1.10 +351 -122 ws-axis/c/src/soap/HeaderBlock.h
1.17 +204 -127 ws-axis/c/src/soap/SoapDeSerializer.h
1.8 +122 -99 ws-axis/c/src/soap/SoapHeader.h
1.23 +176 -143 ws-axis/c/src/soap/SoapSerializer.h
1.1 ws-axis/c/src/transport/SOAPTransport.h
Index: SOAPTransport.h
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @author Susantha Kumara (skumara@virtusa.com, susantha@opensource.lk)
* @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*
*/
/*
* Revision 1.1 2004/05/31 samisa
* Added setProxy
*/
/*
* Revision 1.2 2004/06/08 samisa
* Added setTimeout
*/
#if !defined(AXIS_SOAPTRANSPORT_H__OF_AXIS_INCLUDED_)
#define AXIS_SOAPTRANSPORT_H__OF_AXIS_INCLUDED_
#include <axis/server/Packet.h>
/**
* @file SOAPTransport.h
*
* Contains the interfaces that any transport layer should implemnt in order
* for using in Axis. The implementation should be at lease thread safe. The
* Axis Engine creates a separate transport object for each thread.
*/
#ifdef __cplusplus
/**
* @interface AxisIOStream
*
* Interface of the input/output stream of Axis transport. The use of this
* interface is to avoid the parser being provided the full functionalies
* of SOAPTransport interface
*
* @brief Interface of the input/output stream of Axis transport. ISOAPTransport is
* derived from this interface
*/
class AxisIOStream
{
public:
/**
* Sends a buffer to the transport layer. A Caller may call this method
* multiple times to send several buffers. Its upto the transport to
* decide how they are sent (chunked/unchunked etc). But should return the
* appropriate status code.
*
* @brief Sends a buffer to the transport layer.
* @pre 1. Transport connection should have been established by calling
* Openconnection of the SOAPTransport's implementaion.
* 2. If the implementaion of SOAPTransport intends to accumulate
* @param pcSendBuffer Null terminated character buffer to be sent.
* @param pBufferid void* that represents the buffer id. This pointer will
* only be needed by the transport layer when it needs to call
* caller provided callback function to indicate that transport
* layer has finished using the buffer. So when the transport layer
* intends to keep the pcSendBuffer for late sending, the value of
* pBufferid should also be stored. In case when pBufferid is NULL
* the transport layer can keep the buffer for late sending. But
* MUST never call the release buffer callback.
*
* @return Transport status. Three states are possible. They are,
* TRANSPORT_FINISHED - Passed buffer has been sent. So the caller
* can re-use the buffer
* TRANSPORT_IN_PROGRESS - Passed buffer is not yet sent. So the
* caller cannot re-use the buffer
* TRANSPORT_FAILED - Transport layer has failed. So the caller
* should not send any more buffers.
* @post In case this function returns TRANSPORT_IN_PROGRESS. The caller
* should wait till the transport layer calls the provided callback
* function with the bufferid to indicate that it can re-use
* the buffer. The transport layer MUST call the callback function
* for each buffer for which this function returned the status
* code TRANSPORT_IN_PROGRESS.
*/
virtual AXIS_TRANSPORT_STATUS sendBytes(const char* pcSendBuffer,
const void* pBufferid)=0;
/**
* Gets a part of or full SOAP message. A Caller may call this method
* multiple times to get parts of the SOAP message until the function
* return status says that no more data available.
*
* @brief Gets a part of or full SOAP message.
* @pre Transport connection should have been established by calling
* Openconnection of the SOAPTransport's implementaion.
* @param pcBuffer The character buffer provided by the caller to be
* filled by the transport layer. The size of the buffer is given
* by the value of second parameter piRetSize. The transport layer
* should fill the buffer and put the number of bytes filled into
* the inout parameter piRetSize.
* @param piRetSize Inout parameter which contain the size of the buffer
* as the in value. On return the transport layer should populate
* this parameter with the number of bytes copied to the buffer.
*
* @return Transport status. Three states are possible. They are,
* TRANSPORT_FINISHED - Method call successful. No more data
* is available. If pcBuffer contains any
* data this is the final part of the message.
* can re-use the buffer.
* TRANSPORT_IN_PROGRESS - Method call is successful. There can be
* more data of this message for subsequent
* calls to this method. pcBuffer must have
* been filled to its maximum capacity.
* TRANSPORT_FAILED - Transport layer has failed. So the caller
* should not call this method again. Any
* data in the pcBuffer are not reliable and
* should not be used.
*/
virtual AXIS_TRANSPORT_STATUS getBytes(char* pcBuffer, int* piRetSize)=0;
};
/**
* @interface SOAPTransport
*
* Interface of any Axis transport. Every transpor layer should implement this
* interface in order to be used with Axis Engine. This interface contain the
* functionalities independent of the type of transport (whether HTTP, SMTP,
* etc).
*
* @brief Interface of any Axis transport layer.
*
*/
class SOAPTransport : public AxisIOStream
{
public:
virtual ~SOAPTransport(){};
/**
* Opens a connection with the provided endpoint URI. The connection
* type (protocol) is decided by the implementation and the protocol
* set. See example implementation.
*
* @brief Opens a connection with the provided endpoint URI.
* @pre The endpoint URI and the protocol type (if needed) MUST have
* been set.
* @example AxisTransport.h
* @return Returns AXIS_SUCCESS if connection established successfully.
* Else returns AXIS_FAIL
*/
virtual int openConnection()=0;
/**
* @brief Closes the connection established with OpenConnection.
* @example AxisTransport.h
*/
virtual void closeConnection()=0;
/**
* Registers the callback function which is used by transport layer to
* inform the caller that a buffer given to be sent was sent and it can
* be re-used by the caller.
*
* @brief Registers the m_pReleaseBufferCallback callback function.
* @param pFunct Function pointer to caller's function signature of
* this function is defined in Packet.h
*/
virtual void registerReleaseBufferCallback(
AXIS_ENGINE_CALLBACK_RELEASE_SEND_BUFFER pFunct)=0;
/**
* Sets a predefined transport property to be included in the outgoing
* message. This transport property is not persistent in the transport
* layer. These transport properties should be set for each outgoing
* message.
*
* @brief Sets a predefined transport property for outgoing message.
* @param eType Predefined transport property to be set. See Packet.h
* for predefined transport property types.
* @param pcValue Transport property value to be set.
*/
virtual void setTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE eType,
const char* pcValue)=0;
/**
* @brief Gets a predefined transport property in the arrived message
*
* @param eType Predefined transport property to get. See Packet.h
* for predefined transport property types.
* @return Value of the transport property if available. Returns null
* if unavailable.
*/
virtual const char* getTransportProperty(
AXIS_TRANSPORT_INFORMATION_TYPE eType)=0;
/**
* Sets any transport property to be included in the outgoing message.
* This transport property is not persistent in the transport layer.
* These transport properties should be set for each outgoing message.
*
* @brief Sets any transport property.
* @param pcKey Key for the transport property to be set.
* @param pcValue Value for transport property to be set.
*/
virtual void setTransportProperty(const char* pcKey, const char* pcValue)=0;
/**
* @brief Gets any transport property in the arrived message
*
* @param pcKey The key of the transport property to get.
* @return Value of the transport property if available. Returns null
* if unavailable.
*/
virtual const char* getTransportProperty(const char* pcKey)=0;
/**
* Sets a SOAP attachment to be sent with outgoing message. This
* attachment is usually the base64 or hex encoded character buffer
* that is null terminated.
*
* @brief Sets a SOAP attachment to be sent with outgoing message
* @param pcAttachmentid An identifier for the attachment. This identifier also
* will go in to the SOAP message so that the recipient will know that
* there is an attachemet in the message.
* @param pcAttachment The attachment. This is usually a null terminated string
* encoded to base64 or hex binary.
*/
virtual void setAttachment(const char* pcAttachmentid, const char* pcAttachment)=0;
/**
* Gets an attachment arrived in the inbound message. Usually the SOAP message will
* contain the information indicating that there is an attachment arrived at the
* transport. The SOAP message also contain the attachement id which is required
* to request the transport for the particular attachment.
*
* @brief Gets an attachment arrived in the inbound message.
* @pre To get an attachment the attachment id must be provided. The SOAP message
* should contain the attachment id.
* @param pcAttachmentid Attachment identifier that the caller should find from
* the SOAP message and pass in. The transport will use this identifier
* to locate the corresponding attachment.
* @return The attachment if available. Returns null if the attachment
* corresponding to the pcAttachmentid is not found.
*/
virtual const char* getAttachment(const char* pcAttachmentid)=0;
/**
* Sets the the remote endpoint for tranport to connect to. This URI
* depends on the the transport type.
*
* @pre A caller should use the method getProtocol() to get the type
* of the transport. Then the caller should set the endpoint URI
* accordingly. For example if the transport is HTTP this
* endpoint can be "http://www.xxx.com/"and if the transport is
* SMTP this endpoint can be the mail server and port.
*
* @brief Sets the remote endpoint for tranport to connect to.
* @param pcEndpointUri Endpoint URI to connect to.
*/
virtual void setEndpointUri(const char* pcEndpointUri)=0;
/**
* Sets the session id for the transport session. Actual usage of this
* session id is depend on the implementation of the transport.
*
* @brief Sets the session id for the transport session.
* @param pcSessionId The session id.
*/
virtual void setSessionId(const char* pcSessionId)=0;
/**
* Gets the session id of the transport session sent by the remote end if
* any.
*
* @brief Sets the session id for the transport session.
* @return Session id if available. Returns null otherwise.
*/
virtual const char* getSessionId()=0;
/**
* Gets the service name of the web service to be invoked. How this
* service name is found is upto the type of the transport layer. For
* example HTTP transports will look at the value of http header
* "soapAction" and extract the service name. Whereas a SMTP transport
* will look at recepitent address.
*
* @brief Gets the service name of the web service to be invoked.
* @return Service name if available and null otherwise.
*/
virtual const char* getServiceName()=0;
/**
* Gets the protocol type of the transport library. The caller should
* use this function to check the protocol of the transport layer and
* should use the transport accordingly.
*
* @brief Gets the protocol type of the transport library.
* @return The type of the transport. See AXIS_PROTOCOL_TYPE in Packet.h
*/
virtual AXIS_PROTOCOL_TYPE getProtocol()=0;
/**
* Gets the sub protocol. The usefulness of this method and the return
* values depend on the particular implementation. For example HTTP
* transports should return one of the values defined in enumeration
* AXIS_HTTP_METHOD. See Packet.h
*
* @brief Gets the sub protocol.
* @return Type of the sub protocol (Ex: GET, POST, UNSUPPORTED for HTTP).
*/
virtual int getSubProtocol()=0;
/**
* @brief Forces transport to send any remaining data of the outgoing message.
* @return Transport status. Two return status are possible. They are,
* TRANSPORT_FAILED - Sending data has failed.
* TRANSPORT_FINISHED - Sending finished and successful.
*/
virtual AXIS_TRANSPORT_STATUS flushOutput()=0;
/**
* Set proxy server and port for transport.
*
* Setting the proxy is useful for users who are behind proxies.
*
* For some trasports this method may not make sense.
* Hence this method is not pure virtual.
* Those trasports that implement this interface, that wish to use proxy, must provide an implementation.
* Also, the hadling of the proxy is the responsibility of the deriving classes
*
* @param pcProxyHost Host name of proxy server
* @param uiProxyPort Port of proxy server
*/
virtual void setProxy(const char* pcProxyHost, unsigned int uiProxyPort) {}
/**
* Set transport timeout.
*
* @param lSeconds Timeout in seconds
*/
virtual void setTimeout(const long lSeconds) = 0;
protected:
/**
* Outgoing endpoint URI
*/
char* m_pcEndpointUri;
/**
* Release buffer callback function registered. Usefull if the transport
* is accumulating buffers to be sent later. Ex: non-chunked behavior
* of http transports
*/
AXIS_ENGINE_CALLBACK_RELEASE_SEND_BUFFER m_pReleaseBufferCallback;
};
#endif
#endif // !defined(AXIS_SOAPTRANSPORT_H__OF_AXIS_INCLUDED_)
1.11 +1 -1 ws-axis/c/src/transport/axis/AxisTransport.h
Index: AxisTransport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/AxisTransport.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AxisTransport.h 21 Jun 2004 13:59:19 -0000 1.10
+++ AxisTransport.h 6 Jul 2004 14:16:47 -0000 1.11
@@ -33,7 +33,7 @@
#if !defined(_AXIS_AXIS_TRANSPORT_HPP)
#define _AXIS_AXIS_TRANSPORT_HPP
-#include <axis/SOAPTransport.h>
+#include "../SOAPTransport.h"
#include "Sender.hpp"
#include "Receiver.hpp"
1.13 +3 -5 ws-axis/c/src/transport/axis/AxisTransportException.cpp
Index: AxisTransportException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/AxisTransportException.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AxisTransportException.cpp 6 Jul 2004 08:34:42 -0000 1.12
+++ AxisTransportException.cpp 6 Jul 2004 14:16:47 -0000 1.13
@@ -19,9 +19,7 @@
*
*/
-#include <axis/AxisTransportException.h>
-#include <exception>
-using namespace std;
+#include "AxisTransportException.h"
/**
* Default when no parameter passed. When thrown with no parameter
@@ -86,13 +84,13 @@
if(pcMessage)
delete pcMessage;
}
-const string AxisTransportException::getMessage (const exception* objException)
+const string& AxisTransportException::getMessage (const exception* objException)
{
return objException->what();
}
-const string AxisTransportException::getMessage (const int iExceptionCode)
+const string& AxisTransportException::getMessage (const int iExceptionCode)
{
switch(iExceptionCode)
{
1.6 +1 -1 ws-axis/c/src/transport/axis/Channel.hpp
Index: Channel.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Channel.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Channel.hpp 13 Jun 2004 11:27:00 -0000 1.5
+++ Channel.hpp 6 Jul 2004 14:16:47 -0000 1.6
@@ -36,7 +36,7 @@
#include <string>
#include "Transport.hpp"
-#include <axis/AxisTransportException.h>
+#include "AxisTransportException.h"
/* platform specific stuff */
1.9 +2 -2 ws-axis/c/src/transport/axis/HttpTransport.hpp
Index: HttpTransport.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/HttpTransport.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HttpTransport.hpp 23 Jun 2004 09:56:32 -0000 1.8
+++ HttpTransport.hpp 6 Jul 2004 14:16:47 -0000 1.9
@@ -43,9 +43,9 @@
#ifdef _SSL_ENABLED_
#include "SecureChannel.hpp"
#endif
-#include <axis/server/AxisTrace.h>
+#include "../../common/AxisTrace.h"
extern AxisTrace* g_pAT;
-#include <axis/AxisTransportException.h>
+#include "AxisTransportException.h"
/*
* Implements HTTP transport as SOAP-Envelop carrier, for sending/receiving
1.8 +2 -2 ws-axis/c/src/transport/axis/Receiver.hpp
Index: Receiver.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Receiver.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Receiver.hpp 13 Jun 2004 11:48:40 -0000 1.7
+++ Receiver.hpp 6 Jul 2004 14:16:47 -0000 1.8
@@ -24,8 +24,8 @@
#if !defined(_AXIS_RECEIVER_HPP)
#define _AXIS_RECEIVER_HPP
-#include <axis/AxisTransportException.h>
-#include <axis/server/AxisTrace.h>
+#include "AxisTransportException.h"
+#include "../../common/AxisTrace.h"
extern AxisTrace* g_pAT;
#include "Transport.hpp"
1.8 +2 -2 ws-axis/c/src/transport/axis/Sender.hpp
Index: Sender.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Sender.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Sender.hpp 13 Jun 2004 11:48:40 -0000 1.7
+++ Sender.hpp 6 Jul 2004 14:16:47 -0000 1.8
@@ -26,8 +26,8 @@
#if !defined(_AXIS_SENDER_HPP)
#define _AXIS_SENDER_HPP
-#include <axis/AxisTransportException.h>
-#include <axis/server/AxisTrace.h>
+#include "AxisTransportException.h"
+#include "../../common/AxisTrace.h"
extern AxisTrace* g_pAT;
#include "Transport.hpp"
1.3 +12 -10 ws-axis/c/src/transport/axis/AxisTransportException.h
1.12 +3 -5 ws-axis/c/src/wsdd/AxisWsddException.cpp
Index: AxisWsddException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/AxisWsddException.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AxisWsddException.cpp 6 Jul 2004 08:34:42 -0000 1.11
+++ AxisWsddException.cpp 6 Jul 2004 14:16:48 -0000 1.12
@@ -19,9 +19,7 @@
*
*/
-#include <axis/AxisWsddException.h>
-#include <exception>
-using namespace std;
+#include "AxisWsddException.h"
/**
* Default when no parameter passed. When thrown with no parameter
@@ -87,12 +85,12 @@
if(pcMessage)
delete pcMessage;
}
-const string AxisWsddException::getMessage (const exception* objException)
+const string& AxisWsddException::getMessage (const exception* objException)
{
return objException->what();
}
-const string AxisWsddException::getMessage (const int iExceptionCode)
+const string& AxisWsddException::getMessage (const int iExceptionCode)
{
switch(iExceptionCode)
{
1.37 +3 -2 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- WSDDDeployment.cpp 6 Jul 2004 08:34:42 -0000 1.36
+++ WSDDDeployment.cpp 6 Jul 2004 14:16:48 -0000 1.37
@@ -23,8 +23,9 @@
#include "WSDDDocument.h"
#include <axis/server/GDefine.h>
-#include <axis/server/AxisConfig.h>
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisConfig.h"
+#include "../common/AxisTrace.h"
+#include "AxisWsddException.h"
extern AxisTrace* g_pAT;
1.20 +2 -3 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- WSDDDeployment.h 6 Jul 2004 08:34:42 -0000 1.19
+++ WSDDDeployment.h 6 Jul 2004 14:16:48 -0000 1.20
@@ -21,9 +21,8 @@
#if !defined(AXIS_WSDDDEPLOYMENT_H__OF_AXIS_INCLUDED_)
#define AXIS_WSDDDEPLOYMENT_H__OF_AXIS_INCLUDED_
-#include <axis/server/WSDDService.h>
-#include <axis/server/WSDDHandler.h>
-#include <axis/AxisWsddException.h>
+#include "WSDDService.h"
+#include "WSDDHandler.h"
#include "WSDDTransport.h"
#include <list>
1.35 +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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- WSDDDocument.cpp 25 May 2004 08:49:15 -0000 1.34
+++ WSDDDocument.cpp 6 Jul 2004 14:16:48 -0000 1.35
@@ -21,7 +21,7 @@
#include "WSDDDocument.h"
#include "WSDDKeywords.h"
#include "../engine/XMLParserFactory.h"
-#include <axis/server/AxisTrace.h>
+#include "../common/AxisTrace.h"
#define NAMESPACESEPARATOR 0x03 /* Heart */
#define FILEBUFFSIZE 1024
1.19 +3 -3 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WSDDDocument.h 25 May 2004 03:47:34 -0000 1.18
+++ WSDDDocument.h 6 Jul 2004 14:16:48 -0000 1.19
@@ -22,10 +22,10 @@
#define __WSDDDOCUMENT_H_OF_AXIS_INCLUDED__
#include "WSDDDocument.h"
-#include <axis/SOAPTransport.h>
-#include <axis/server/AnyElement.h>
+#include "../transport/SOAPTransport.h"
+#include "../xml/AnyElement.h"
#include "WSDDDeployment.h"
-#include <axis/server/WSDDService.h>
+#include "WSDDService.h"
#include "../xml/QName.h"
#include <string>
1.16 +1 -1 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- WSDDHandler.cpp 26 Apr 2004 04:04:39 -0000 1.15
+++ WSDDHandler.cpp 6 Jul 2004 14:16:48 -0000 1.16
@@ -19,7 +19,7 @@
-#include <axis/server/WSDDHandler.h>
+#include "WSDDHandler.h"
WSDDHandler::WSDDHandler()
1.22 +2 -2 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WSDDService.cpp 26 Apr 2004 04:04:39 -0000 1.21
+++ WSDDService.cpp 6 Jul 2004 14:16:48 -0000 1.22
@@ -20,8 +20,8 @@
-#include <axis/server/WSDDService.h>
-#include <axis/server/AxisTrace.h>
+#include "WSDDService.h"
+#include "../common/AxisTrace.h"
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WSDDTransport.h 26 Apr 2004 04:04:39 -0000 1.10
+++ WSDDTransport.h 6 Jul 2004 14:16:48 -0000 1.11
@@ -18,7 +18,7 @@
#if !defined(AXIS_WSDDTRANSPORT_H__OF_AXIS_INCLUDED_)
#define AXIS_WSDDTRANSPORT_H__OF_AXIS_INCLUDED_
-#include <axis/server/WSDDHandler.h>
+#include "WSDDHandler.h"
#include <map>
/*
* @class WSDDTransport
1.4 +14 -11 ws-axis/c/src/wsdd/AxisWsddException.h
1.11 +48 -83 ws-axis/c/src/wsdd/WSDDHandler.h
1.9 +44 -90 ws-axis/c/src/wsdd/WSDDService.h
1.8 +3 -5 ws-axis/c/src/xml/AxisParseException.cpp
Index: AxisParseException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/AxisParseException.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AxisParseException.cpp 6 Jul 2004 08:34:42 -0000 1.7
+++ AxisParseException.cpp 6 Jul 2004 14:16:48 -0000 1.8
@@ -19,9 +19,7 @@
*
*/
-#include <axis/AxisParseException.h>
-#include <exception>
-using namespace std;
+#include "AxisParseException.h"
/**
* Default when no parameter passed. When thrown with no parameter
@@ -86,12 +84,12 @@
if(pcMessage)
delete pcMessage;
}
-const string AxisParseException::getMessage (const exception* objException)
+const string& AxisParseException::getMessage (const exception* objException)
{
return objException->what();
}
-const string AxisParseException::getMessage (const int iExceptionCode)
+const string& AxisParseException::getMessage (const int iExceptionCode)
{
switch(iExceptionCode)
{
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Event.h 24 Jun 2004 10:39:31 -0000 1.6
+++ Event.h 6 Jul 2004 14:16:48 -0000 1.7
@@ -23,7 +23,7 @@
#if !defined(AXIS_Event_H__OF_AXIS_INCLUDED_)
#define AXIS_Event_H__OF_AXIS_INCLUDED_
-#include <axis/server/AnyElement.h>
+#include "AnyElement.h"
#include <string>
using namespace std;
1.1 ws-axis/c/src/xml/AnyElement.h
Index: AnyElement.h
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @file AnyElement.h
* This file contains the declaration of AnyElement structure which is
* returned by any parser's (implementation of XMLParser interface) next(..)
* funtion.
*
* @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
*/
#if !defined(__ANYELEMENT_H__OF_AXIS_INCLUDED_)
#define __ANYELEMENT_H__OF_AXIS_INCLUDED_
/**
* @def MAX_NO_OF_ATTRIBUTES
* Defines the maximum number of attributes that AnyElement can contain.
* @note If any starting tag of a SOAP message contains more than 100
* attributes a runtime error can occur.
*/
#define MAX_NO_OF_ATTRIBUTES 100
/**
* @enum XML_NODE_TYPE
* Enumeration that defines the SAX events that the AnyElement may contain
*/
typedef enum { START_ELEMENT=0, CHARACTER_ELEMENT, END_ELEMENT,
START_PREFIX, END_PREFIX} XML_NODE_TYPE;
/**
* @struct AnyElement
*
* This structure can represent any xml element that a SOAP message contains.
* Any parser implementation's next(..) or anyNext() methods will return a
* constant instance of this struct that will contain a xml element. In SAX
* parser perspective this structure can contain information of StartElement,
* EndElement, Character data element or a prefix mapping event.
*
* @brief Struct that represents any XML element.
* @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
*/
typedef struct
{
/**
* Type of SAX event whose data that an AnyElement can contain.
*/
XML_NODE_TYPE m_type;
/**
* Local name in case of StartElement or EndElement event. Character data
* in case of character data event. Namespace prefix in case of prefix
* prefix mapping event.
*/
const char* m_pchNameOrValue;
/**
* Namespace of StartElemnt or EndElement tag. In case there is no
* namespace this should be NULL (not pointing to empty string "" even)
*/
const char* m_pchNamespace;
/**
* Each attribute has 3 entities: localname, namespace and value in order
* This char* array can contain upto MAX_NO_OF_ATTRIBUTES attributes. When
* a parser fills in this array the order should be localname, namespace
* and then value. If there is no prefix in an attribute the namespace
* should be NULL (note: The localname can never be null for an attribute.
* Then anyone consuming these attributes will increment the index by 3
* starting from 0 (0, 3, 6 ... etc) and if that position in the array is
* NULL it is understood as the end of attributes.
*/
const char* m_pchAttributes[MAX_NO_OF_ATTRIBUTES*3];
} AnyElement;
#endif
1.1 ws-axis/c/src/xml/AxisParseException.h
Index: AxisParseException.h
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*
* @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
*
*/
#ifndef __AXISPARSEEXCEPTION_H_OF_AXIS_INCLUDED_
#define __AXISPARSEEXCEPTION_H_OF_AXIS_INCLUDED_
#include <string>
#include <axis/server/AxisException.h>
using namespace std;
class STORAGE_CLASS_INFO AxisParseException :public AxisException
{
public:
AxisParseException();
AxisParseException(const int iExceptionCode);
AxisParseException(const int iExceptionCode, char* pcMessage);
AxisParseException(const exception* e);
AxisParseException(const exception* e, const int iExceptionCode);
virtual ~AxisParseException() throw();
const char* what() throw();
const int getExceptionCode();
private:
const string& getMessage(const exception* e);
const string& getMessage(const int iExceptionCode);
void processException(const exception* e);
void processException(const exception* e, const int iExceptionCode);
void processException (const exception* e, char* pcMessage);
void processException(const int iExceptionCode);
void processException(const int iExceptionCode, char* pcMessage);
string m_sMessage;
int m_iExceptionCode;
};
#endif
1.1 ws-axis/c/src/xml/XMLParser.h
Index: XMLParser.h
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @file XMLParser.h
*
* This file contains the API that any XML parser library for Axis should
* implement.
*
* @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
*/
#if !defined(__XMLPARSER_H_OF_AXIS_INCLUDED__)
#define __XMLPARSER_H_OF_AXIS_INCLUDED__
#include "AnyElement.h"
#include "../transport/SOAPTransport.h"
#include <axis/server/GDefine.h>
/**
* @class XMLParser
* @brief Interface that any parser wrapper should implement in order to be
* use in Axis as a XML PULL parser. This interface basically describes
* XML pull parsing behavior. Any SAX or DOM parser can be wrapped to
* expose XML pull behavior by implementing this interface. But the
* efficiency of the overall component depends on the particular
* implementaion.
* Its the responsibility of the implementation class to free any
* memory allocated inside the class. The class should not deallocate
* the given input stream.
* @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
*/
class XMLParser
{
public:
virtual ~XMLParser(){};
/**
* Sets the input stream. Here the parser should be prepared to start
* parsing a new stream and hence should be initialized to its initial
* state. Axis will call this function first for each input stream to
* be parsed.
*
* @brief Sets the input stream.
* @pre The stream passed MUST be an already opened stream (established
* connection.
* @param pInputStream Input stream from which the data to be parsed are
* read by calling its getBytes function. Function should not
* deallocate either pInputStream
* @return AXIS_SUCCESS if successfull. AXIS_FAIL otherwise.
*/
virtual int setInputStream(AxisIOStream* pInputStream)=0;
/**
* Gets the corresponding namespace string for a given prefix. The
* Parser should store the prefix/namespace pairs that it finds and
* valid at the current cursor position of the stream. This method
* provides a way to get the corresponding namespace for any valid
* prefix at the current cursor position of the pull parser.
*
* @brief Gets the corresponding namespace string for a given prefix.
* @param pcPrefix Prefix for which the namespace string is requested
* @return The namespace if a match is found. NULL otherwise.
*/
virtual const XML_Ch* getNS4Prefix(const XML_Ch* pcPrefix)=0;
/**
* @brief Used to get the parser status.
* @return Returns AXIS_SUCCESS if nothing has gone wrong. AXIS_FAIL
* otherwise.
*/
virtual int getStatus()=0;
/**
* Used to get the next XML data event. The valid events are start element,
* end element and character data. If we think of SAX events the processing
* instruction events, namespace prefix mapping events are not returned by
* this method. If the implementation of this interface is wrapping up a
* SAX parser it should follow the above rules.
*
* As the function signature suggests the returned AnyElement is const and
* the caller should not deallocate any member of it. Its the sole
* responsibility of the Parser wrapper implementation to manage any memory
* allocated by it.
*
* @brief Used to get the next XML event.
* @param bIsCharData Indicates whether Axis is expecting a character data
* event or not. If Axis is NOT expecting a character data event
* (bIsCharData is false) the parser should NOT return a character
* data event. Instead it should skip all character data events
* until it finds a non-character data event and return it. This
* behaviour is needed to ignore unexpected white space of the
* stream.
* @return Returns a filled AnyElement structure that contains all the data
* of the current XML element. See AnyElement.h for the
* structure of AnyElement.
*/
virtual const AnyElement* next(bool bIsCharData=false)=0;
/**
* Used to get the any next XML event. The valid events are start element,
* end element, character data and prefix mappings. If we think of SAX
* events only processing instruction events are not returned by this
* method. If the implementation of this interface is wrapping up a SAX
* parser it should follow the above rules.
*
* As the function signature suggests the returned AnyElement is const and
* the caller should not deallocate any member of it. Its the sole
* responsibility of the Parser wrapper implementation to manage any memory
* allocated by it.
*
* @brief Used to get the next XML event.
* @return Returns a filled AnyElement structure that contains all the data
* of the current XML element. See AnyElement.h for the structure
* of AnyElement.
*/
virtual const AnyElement* anyNext()=0;
/**
* Gets the corresponding prefix string for a given namespace. The
* Parser should store the prefix/namespace pairs that it finds and
* valid at the current cursor position of the stream. This method
* provides a way to get the corresponding prefix for any valid
* namespace at the current cursor position of the pull parser.
*
* @brief Gets the corresponding namespace string for a given prefix.
* @param pcNS Namespace for which the prefix string is requested
* @return The prefix if a match is found. NULL otherwise.
*/
virtual const XML_Ch* getPrefix4NS(const XML_Ch* pcNS)=0;
protected:
AxisIOStream* m_pInputStream;
};
#endif
1.4 +3 -3 ws-axis/c/src/xml/expat/XMLParserExpat.h
Index: XMLParserExpat.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/expat/XMLParserExpat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLParserExpat.h 24 Jun 2004 10:39:31 -0000 1.3
+++ XMLParserExpat.h 6 Jul 2004 14:16:48 -0000 1.4
@@ -29,10 +29,10 @@
#include <axis/server/Packet.h>
#include "../QName.h"
-#include <axis/server/AnyElement.h>
+#include "../AnyElement.h"
#include "../Event.h"
-#include <axis/server/XMLParser.h>
-#include <axis/AxisParseException.h>
+#include "../XMLParser.h"
+#include "../AxisParseException.h"
#include <queue>
#include <map>
1.2 +1 -1 ws-axis/c/src/xml/xerces/SoapBinInputStream.h
Index: SoapBinInputStream.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/xerces/SoapBinInputStream.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoapBinInputStream.h 18 May 2004 11:09:10 -0000 1.1
+++ SoapBinInputStream.h 6 Jul 2004 14:16:48 -0000 1.2
@@ -21,7 +21,7 @@
#include <xercesc/util/BinInputStream.hpp>
#include <axis/server/Packet.h>
-#include <axis/SOAPTransport.h>
+#include "../../transport/SOAPTransport.h"
XERCES_CPP_NAMESPACE_USE
1.5 +2 -2 ws-axis/c/src/xml/xerces/XMLParserXerces.h
Index: XMLParserXerces.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/xerces/XMLParserXerces.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLParserXerces.h 4 Jul 2004 12:49:17 -0000 1.4
+++ XMLParserXerces.h 6 Jul 2004 14:16:48 -0000 1.5
@@ -29,14 +29,14 @@
#include <axis/server/Packet.h>
#include "../QName.h"
#include "../Event.h"
-#include <axis/server/XMLParser.h>
+#include "../XMLParser.h"
#include "XercesHandler.h"
#include <xercesc/sax2/SAX2XMLReader.hpp>
#include <xercesc/parsers/SAXParser.hpp>
#include <xercesc/framework/XMLPScanToken.hpp>
#include "SoapInputSource.h"
-#include <axis/AxisParseException.h>
+#include "../AxisParseException.h"
XERCES_CPP_NAMESPACE_USE
1.7 +3 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesHandler.h 27 Jun 2004 04:53:47 -0000 1.6
+++ XercesHandler.h 6 Jul 2004 14:16:48 -0000 1.7
@@ -18,9 +18,9 @@
* @author sanjaya singharage (sanjayas@opensource.lk)
*/
-#include <xercesc/sax/HandlerBase.hpp>
-#include <xercesc/sax2/DefaultHandler.hpp>
-#include <axis/server/AnyElement.h>
+#include <xercesc/sax/HandlerBase.hpp>
+#include <xercesc/sax2/DefaultHandler.hpp>
+#include "../AnyElement.h"
#include <stdlib.h>
#include <map>
#include <string>
1.18 +4 -0 ws-axis/c/vc/AxisClientDLL.dsp
Index: AxisClientDLL.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/AxisClientDLL.dsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AxisClientDLL.dsp 24 Jun 2004 10:39:31 -0000 1.17
+++ AxisClientDLL.dsp 6 Jul 2004 14:16:48 -0000 1.18
@@ -374,6 +374,10 @@
# End Source File
# Begin Source File
+SOURCE=..\include\axis\ISoapFault.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\axis\client\Stub.h
# End Source File
# End Group
1.16 +4 -0 ws-axis/c/vc/AxisServerDLL.dsp
Index: AxisServerDLL.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/AxisServerDLL.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AxisServerDLL.dsp 24 Jun 2004 10:39:31 -0000 1.15
+++ AxisServerDLL.dsp 6 Jul 2004 14:16:48 -0000 1.16
@@ -338,6 +338,10 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
+SOURCE=..\include\axis\ISoapFault.h
+# End Source File
+# Begin Source File
+
SOURCE=..\include\axis\server\Packet.h
# End Source File
# End Group