You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2004/06/10 12:07:53 UTC
cvs commit: ws-axis/c/src/wsdd AxisWsddException.cpp
damitha 2004/06/10 03:07:53
Modified: c/include/axis/server AxisException.h
c/src/common AxisConfigException.cpp AxisException.cpp
AxisMessage.cpp
c/src/engine AppScopeHandlerPool.cpp AxisEngineException.cpp
HandlerLoader.cpp HandlerPool.cpp
c/src/engine/client ClientAxisEngine.cpp
c/src/engine/server ServerAxisEngine.cpp
c/src/soap AxisSoapException.cpp SoapBody.cpp
SoapDeSerializer.cpp
c/src/transport/axis AxisTransportException.cpp
HttpTransport.cpp HttpTransport.hpp Receiver.cpp
Sender.cpp
c/src/wsdd AxisWsddException.cpp
Log:
Revision Changes Path
1.15 +31 -29 ws-axis/c/include/axis/server/AxisException.h
Index: AxisException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisException.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AxisException.h 7 Jun 2004 11:14:41 -0000 1.14
+++ AxisException.h 10 Jun 2004 10:07:52 -0000 1.15
@@ -85,10 +85,10 @@
enum AXISC_EXCEPTIONS
{
/* VersionMismatch faults */
- SOAP_VERSIONMISMATCH,
+ SOAP_VERSION_MISMATCH,
/* MustUnderstand faults */
- SOAP_MUSTUNDERSTAND,
+ SOAP_MUST_UNDERSTAND,
/*The notation used for naming these exceptions is as follows
*CLIENT at the beginning means when this interpreted as a soap fault
@@ -108,47 +108,49 @@
*/
/* Client faults */
- CLIENT_SOAP_MESSAGEINCOMPLETE,
- CLIENT_SOAP_SOAPACTIONEMTPY,
- CLIENT_SOAP_SOAPCONTENTERROR,
- CLIENT_SOAP_NOSOAPMETHOD,
- CLIENT_WSDD_SERVICENOTFOUND,
- CLIENT_WSDD_METHODNOTALLOWED,
- CLIENT_WSDD_PARATYPEMISMATCH,
- CLIENT_ENGINE_CLIENTHANDLERFAILED,
+ CLIENT_SOAP_MESSAGE_INCOMPLETE,
+ CLIENT_SOAP_SOAP_ACTION_EMTPY,
+ CLIENT_SOAP_SOAP_CONTENT_ERROR,
+ CLIENT_SOAP_NO_SOAP_METHOD,
+ CLIENT_WSDD_SERVICE_NOT_FOUND,
+ CLIENT_WSDD_METHOD_NOT_ALLOWED,
+ CLIENT_WSDD_PARA_TYPE_MISMATCH,
+ CLIENT_ENGINE_CLIENT_HANDLER_FAILED,
/* Server faults */
SERVER_ENGINE_EXCEPTION,
- SERVER_ENGINE_COULDNOTLOADSRV,
- SERVER_ENGINE_COULDNOTLOADHDL,
- SERVER_ENGINE_HANDLERFAILED,
- SERVER_ENGINE_WEBSERVICEFAILED,
- SERVER_ENGINE_HANDLERINITFAILED,
- SERVER_ENGINE_HANDLERCREATIONFAILED,
- SERVER_ENGINE_LIBRARYLOADINGFAILED,
- SERVER_ENGINE_HANDLERNOTLOADED,
- SERVER_ENGINE_HANDLERBEINGUSED,
- SERVER_ENGINE_GETHANDLERFAILED,
- SERVER_ENGINE_WRONGHANDLERTYPE,
+ SERVER_ENGINE_COULD_NOT_LOAD_SRV,
+ SERVER_ENGINE_COULD_NOT_LOAD_HDL,
+ SERVER_ENGINE_HANDLER_FAILED,
+ SERVER_ENGINE_WEBSERVICE_FAILED,
+ SERVER_ENGINE_HANDLER_INIT_FAILED,
+ SERVER_ENGINE_HANDLER_CREATION_FAILED,
+ SERVER_ENGINE_LIBRARY_LOADING_FAILED,
+ SERVER_ENGINE_HANDLER_NOT_LOADED,
+ SERVER_ENGINE_HANDLER_BEING_USED,
+ SERVER_ENGINE_GET_HANDLER_FAILED,
+ SERVER_ENGINE_WRONG_HANDLER_TYPE,
SERVER_CONFIG_EXCEPTION,
- SERVER_CONFIG_TRANSPORTCONFFAILED,
- SERVER_CONFIG_LIBRARYPATHEMPTY,
+ SERVER_CONFIG_TRANSPORT_CONF_FAILED,
+ SERVER_CONFIG_LIBRARY_PATH_EMPTY,
SERVER_WSDD_EXCEPTION,
- SERVER_WSDD_NOHANDLERSCONFIGURED,
+ SERVER_WSDD_NO_HANDLERS_CONFIGURED,
SERVER_SOAP_EXCEPTION,
SERVER_TRANSPORT_EXCEPTION,
- SERVER_TRANSPORT_RECEPTIONEXCEPTION,
- SERVER_TRANSPORT_SENDINGEXCEPTION,
+ SERVER_TRANSPORT_RECEPTION_EXCEPTION,
+ SERVER_TRANSPORT_SENDING_EXCEPTION,
+ SERVER_TRANSPORT_PROCESS_EXCEPTION,
+ SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE,
SERVER_TRANSPORT_HTTP_EXCEPTION,
- SERVER_TESTEXCEPTION,
+ SERVER_TEST_EXCEPTION,
SERVER_UNKNOWN_ERROR,
/*Following exceptions are not releated to soap faults
*/
AXISC_SERVICE_THROWN_EXCEPTION,
AXISC_UNKNOWN_ELEMENT_EXCEPTION,
- AXISC_NODEVALUE_MISMATCH_EXCEPTION,
- AXISC_READCONF_EXCEPTION,
+ AXISC_NODE_VALUE_MISMATCH_EXCEPTION,
+ AXISC_READ_CONF_EXCEPTION,
/*
* This FAULT_LAST is not used as a fault code, but instead is used
1.4 +2 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisConfigException.cpp 20 May 2004 08:12:18 -0000 1.3
+++ AxisConfigException.cpp 10 Jun 2004 10:07:52 -0000 1.4
@@ -81,10 +81,10 @@
string sMessage;
switch(iExceptionCode)
{
- case SERVER_CONFIG_TRANSPORTCONFFAILED:
+ case SERVER_CONFIG_TRANSPORT_CONF_FAILED:
sMessage = "Transport layer is not configured properly";
break;
- case SERVER_CONFIG_LIBRARYPATHEMPTY:
+ case SERVER_CONFIG_LIBRARY_PATH_EMPTY:
sMessage = "Library path is empty(Not in server.wsdd file)";
break;
default:
1.19 +2 -2 ws-axis/c/src/common/AxisException.cpp
Index: AxisException.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisException.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AxisException.cpp 20 May 2004 08:12:18 -0000 1.18
+++ AxisException.cpp 10 Jun 2004 10:07:52 -0000 1.19
@@ -70,10 +70,10 @@
case AXISC_SERVICE_THROWN_EXCEPTION:
sMessage = "A service has thrown an exception. see detail";
break;
- case SERVER_TESTEXCEPTION:
+ case SERVER_TEST_EXCEPTION:
sMessage = "This is a testing error";
break;
- case AXISC_NODEVALUE_MISMATCH_EXCEPTION:
+ case AXISC_NODE_VALUE_MISMATCH_EXCEPTION:
sMessage = "Cannot deserialize the requested element";
break;
default:
1.2 +33 -27 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AxisMessage.cpp 24 May 2004 05:46:27 -0000 1.1
+++ AxisMessage.cpp 10 Jun 2004 10:07:52 -0000 1.2
@@ -27,89 +27,95 @@
case AXISC_SERVICE_THROWN_EXCEPTION:
m_sMessage = "A service has thrown an exception. see detail";
break;
- case SERVER_TESTEXCEPTION:
+ case SERVER_TEST_EXCEPTION:
m_sMessage = "This is a testing error";
break;
- case AXISC_NODEVALUE_MISMATCH_EXCEPTION:
+ case AXISC_NODE_VALUE_MISMATCH_EXCEPTION:
m_sMessage = "Cannot deserialize the requested element";
break;
- case SERVER_CONFIG_TRANSPORTCONFFAILED:
+ case SERVER_CONFIG_TRANSPORT_CONF_FAILED:
m_sMessage = "Transport layer is not configured properly";
break;
- case SERVER_CONFIG_LIBRARYPATHEMPTY:
+ case SERVER_CONFIG_LIBRARY_PATH_EMPTY:
m_sMessage = "Library path is empty(Not in server.wsdd file)";
break;
- case SOAP_VERSIONMISMATCH :
+ case SOAP_VERSION_MISMATCH :
m_sMessage = "Soap Version mismatch fault occured";
break;
- case SOAP_MUSTUNDERSTAND:
+ case SOAP_MUST_UNDERSTAND:
m_sMessage = "Soap Must understand fault occured";
break;
- case CLIENT_SOAP_MESSAGEINCOMPLETE:
+ case CLIENT_SOAP_MESSAGE_INCOMPLETE:
m_sMessage = "Received message is incomplete";
break;
- case CLIENT_SOAP_SOAPACTIONEMTPY:
+ case CLIENT_SOAP_SOAP_ACTION_EMTPY:
m_sMessage = "Soap action is empty";
break;
- case CLIENT_SOAP_SOAPCONTENTERROR:
+ case CLIENT_SOAP_SOAP_CONTENT_ERROR:
m_sMessage = "Received content is faulty";
break;
- case CLIENT_SOAP_NOSOAPMETHOD:
+ case CLIENT_SOAP_NO_SOAP_METHOD:
m_sMessage = "Request method is not a soap method";
break;
- case CLIENT_WSDD_SERVICENOTFOUND:
+ case CLIENT_WSDD_SERVICE_NOT_FOUND:
m_sMessage = "Requested service not found";
break;
- case CLIENT_WSDD_METHODNOTALLOWED:
+ case CLIENT_WSDD_METHOD_NOT_ALLOWED:
m_sMessage = "Requested method is not allowed";
break;
- case CLIENT_WSDD_PARATYPEMISMATCH:
+ case CLIENT_WSDD_PARA_TYPE_MISMATCH:
m_sMessage = "Parameter type mismatch";
break;
- case SERVER_WSDD_NOHANDLERSCONFIGURED:
+ case SERVER_WSDD_NO_HANDLERS_CONFIGURED:
m_sMessage = "No handlers configured in server.wsdd";
break;
- case SERVER_ENGINE_COULDNOTLOADSRV:
+ case SERVER_ENGINE_COULD_NOT_LOAD_SRV:
m_sMessage = "Could not load service";
break;
- case SERVER_ENGINE_COULDNOTLOADHDL:
+ case SERVER_ENGINE_COULD_NOT_LOAD_HDL:
m_sMessage = "Could not load handler";
break;
- case SERVER_ENGINE_HANDLERFAILED:
+ case SERVER_ENGINE_HANDLER_FAILED:
m_sMessage = "Handler failed";
break;
- case SERVER_ENGINE_WEBSERVICEFAILED:
+ case SERVER_ENGINE_WEBSERVICE_FAILED:
m_sMessage = "Web Service failed";
break;
- case SERVER_ENGINE_HANDLERINITFAILED:
+ case SERVER_ENGINE_HANDLER_INIT_FAILED:
m_sMessage = "Handler initialization failed";
break;
- case SERVER_ENGINE_HANDLERCREATIONFAILED:
+ case SERVER_ENGINE_HANDLER_CREATION_FAILED:
m_sMessage = "Handler creation failed";
break;
- case SERVER_ENGINE_LIBRARYLOADINGFAILED:
+ case SERVER_ENGINE_LIBRARY_LOADING_FAILED:
m_sMessage = "Library loading failed";
break;
- case SERVER_ENGINE_HANDLERNOTLOADED:
+ case SERVER_ENGINE_HANDLER_NOT_LOADED:
m_sMessage = "Handler is not loaded";
break;
- case SERVER_ENGINE_HANDLERBEINGUSED:
+ case SERVER_ENGINE_HANDLER_BEING_USED:
m_sMessage = "Handler is being used";
break;
- case SERVER_ENGINE_GETHANDLERFAILED:
+ case SERVER_ENGINE_GET_HANDLER_FAILED:
m_sMessage = "Get handler failed";
break;
- case SERVER_ENGINE_WRONGHANDLERTYPE:
+ case SERVER_ENGINE_WRONG_HANDLER_TYPE:
m_sMessage = "Wrong handler type";
break;
- case SERVER_TRANSPORT_RECEPTIONEXCEPTION:
+ case SERVER_TRANSPORT_RECEPTION_EXCEPTION:
m_sMessage = "Problem occured when receiving the stream";
break;
- case SERVER_TRANSPORT_SENDINGEXCEPTION:
+ case SERVER_TRANSPORT_SENDING_EXCEPTION:
m_sMessage = "Problem occured when sending the stream";
break;
case SERVER_TRANSPORT_HTTP_EXCEPTION:
m_sMessage = "HTTP transport error";
+ break;
+ case SERVER_TRANSPORT_PROCESS_EXCEPTION:
+ m_sMessage = "HTTP Error, cannot process response message";
+ break;
+ case SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE:
+ m_sMessage = "Unknow HTTP response, cannot process response message";
break;
default:
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AppScopeHandlerPool.cpp 18 May 2004 04:32:30 -0000 1.12
+++ AppScopeHandlerPool.cpp 10 Jun 2004 10:07:52 -0000 1.13
@@ -68,7 +68,7 @@
*/
{
unlock ();
- return SERVER_ENGINE_HANDLERBEINGUSED;
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_BEING_USED);
}
else
{
1.4 +11 -11 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisEngineException.cpp 20 May 2004 08:12:18 -0000 1.3
+++ AxisEngineException.cpp 10 Jun 2004 10:07:52 -0000 1.4
@@ -81,37 +81,37 @@
string sMessage;
switch(iExceptionCode)
{
- case SERVER_ENGINE_COULDNOTLOADSRV:
+ case SERVER_ENGINE_COULD_NOT_LOAD_SRV:
sMessage = "Could not load service";
break;
- case SERVER_ENGINE_COULDNOTLOADHDL:
+ case SERVER_ENGINE_COULD_NOT_LOAD_HDL:
sMessage = "Could not load handler";
break;
- case SERVER_ENGINE_HANDLERFAILED:
+ case SERVER_ENGINE_HANDLER_FAILED:
sMessage = "Handler failed";
break;
- case SERVER_ENGINE_WEBSERVICEFAILED:
+ case SERVER_ENGINE_WEBSERVICE_FAILED:
sMessage = "Web Service failed";
break;
- case SERVER_ENGINE_HANDLERINITFAILED:
+ case SERVER_ENGINE_HANDLER_INIT_FAILED:
sMessage = "Handler initialization failed";
break;
- case SERVER_ENGINE_HANDLERCREATIONFAILED:
+ case SERVER_ENGINE_HANDLER_CREATION_FAILED:
sMessage = "Handler creation failed";
break;
- case SERVER_ENGINE_LIBRARYLOADINGFAILED:
+ case SERVER_ENGINE_LIBRARY_LOADING_FAILED:
sMessage = "Library loading failed";
break;
- case SERVER_ENGINE_HANDLERNOTLOADED:
+ case SERVER_ENGINE_HANDLER_NOT_LOADED:
sMessage = "Handler is not loaded";
break;
- case SERVER_ENGINE_HANDLERBEINGUSED:
+ case SERVER_ENGINE_HANDLER_BEING_USED:
sMessage = "Handler is being used";
break;
- case SERVER_ENGINE_GETHANDLERFAILED:
+ case SERVER_ENGINE_GET_HANDLER_FAILED:
sMessage = "Get handler failed";
break;
- case SERVER_ENGINE_WRONGHANDLERTYPE:
+ case SERVER_ENGINE_WRONG_HANDLER_TYPE:
sMessage = "Wrong handler type";
break;
default:
1.27 +16 -16 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- HandlerLoader.cpp 18 May 2004 04:32:30 -0000 1.26
+++ HandlerLoader.cpp 10 Jun 2004 10:07:52 -0000 1.27
@@ -75,7 +75,7 @@
else
{
unlock ();
- return SERVER_ENGINE_HANDLERNOTLOADED;
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_NOT_LOADED);
}
}
@@ -86,8 +86,8 @@
pHandlerInfo->m_Handler = lt_dlopen (pHandlerInfo->m_sLib.c_str ());
if (!pHandlerInfo->m_Handler)
{
- AXISTRACE1("DLOPEN FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LIBRARYLOADINGFAILED);
+ AXISTRACE1("SERVER_ENGINE_LIBRARY_LOADING_FAILED", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LIBRARY_LOADING_FAILED);
}
#elif defined(WIN32)
pHandlerInfo->m_Handler = LoadLibrary (pHandlerInfo->m_sLib.c_str ());
@@ -98,7 +98,7 @@
if (!pHandlerInfo->m_Handler)
{
AXISTRACE1("DLOPEN FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LIBRARYLOADINGFAILED);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LIBRARY_LOADING_FAILED);
//printf ("DLOPEN FAILED: %s\n", dlerror ());
//exit (1);
}
@@ -132,8 +132,8 @@
{
delete pHandlerInfo;
unlock ();
- AXISTRACE1("SERVER_CONFIG_LIBRARYPATHEMPTY", CRITICAL);
- THROW_AXIS_CONFIG_EXCEPTION(SERVER_CONFIG_LIBRARYPATHEMPTY);
+ AXISTRACE1("SERVER_CONFIG_LIBRARY_PATH_EMPTY", CRITICAL);
+ THROW_AXIS_CONFIG_EXCEPTION(SERVER_CONFIG_LIBRARY_PATH_EMPTY);
//return SERVER_CONFIG_LIBRARYPATHEMPTY;
}
// pHandlerInfo->m_nLoadOptions = RTLD_LAZY;
@@ -168,7 +168,7 @@
delete pHandlerInfo;
unlock ();
AXISTRACE1 ("Library loading failed", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LIBRARYLOADINGFAILED);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LIBRARY_LOADING_FAILED);
//return SERVER_ENGINE_LIBRARYLOADINGFAILED;
}
else // success
@@ -180,7 +180,7 @@
{
unlock ();
AXISTRACE1 ("Library loading failed", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LIBRARYLOADINGFAILED);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LIBRARY_LOADING_FAILED);
//return SERVER_ENGINE_LIBRARYLOADINGFAILED;
}
}
@@ -205,15 +205,15 @@
pBH->_functions->fini (pBH->_object);
pHandlerInfo->m_Delete (pBH);
unlock ();
- AXISTRACE1("SERVER_ENGINE_HANDLERINITFAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLERINITFAILED);
+ AXISTRACE1("SERVER_ENGINE_HANDLER_INIT_FAILED", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_INIT_FAILED);
//return SERVER_ENGINE_HANDLERINITFAILED;
}
}
else if (0 == pBH->_object)
{
- AXISTRACE1("SERVER_ENGINE_HANDLERCREATIONFAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLERCREATIONFAILED);
+ AXISTRACE1("SERVER_ENGINE_HANDLER_CREATION_FAILED", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_CREATION_FAILED);
//return SERVER_ENGINE_HANDLERCREATIONFAILED;
}
else
@@ -231,8 +231,8 @@
((HandlerBase*) pBH->_object)->fini ();
pHandlerInfo->m_Delete (pBH);
unlock ();
- AXISTRACE1("SERVER_ENGINE_HANDLERINITFAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLERINITFAILED);
+ AXISTRACE1("SERVER_ENGINE_HANDLER_INIT_FAILED", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_INIT_FAILED);
//return SERVER_ENGINE_HANDLERINITFAILED;
}
}
@@ -240,8 +240,8 @@
else
{
unlock ();
- AXISTRACE1("SERVER_ENGINE_HANDLERCREATIONFAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLERCREATIONFAILED);
+ AXISTRACE1("SERVER_ENGINE_HANDLER_CREATION_FAILED", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_CREATION_FAILED);
//return SERVER_ENGINE_HANDLERCREATIONFAILED;
}
}
1.28 +3 -3 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- HandlerPool.cpp 18 May 2004 04:32:30 -0000 1.27
+++ HandlerPool.cpp 10 Jun 2004 10:07:52 -0000 1.28
@@ -65,7 +65,7 @@
{
return Status;
}
- else if (Status == SERVER_ENGINE_HANDLERBEINGUSED)
+ else if (Status == SERVER_ENGINE_HANDLER_BEING_USED)
{ //block this thread not this object
Ax_Sleep (0);
}
@@ -73,7 +73,7 @@
{
return Status;
}
- } while (Status == SERVER_ENGINE_HANDLERBEINGUSED);
+ } while (Status == SERVER_ENGINE_HANDLER_BEING_USED);
break;
case AH_SESSION:
return g_pSessionScopeHandlerPool->getInstance (sSessionId,
@@ -256,7 +256,7 @@
}
else
{
- Status = SERVER_ENGINE_WRONGHANDLERTYPE;
+ Status = SERVER_ENGINE_WRONG_HANDLER_TYPE;
break;
}
}
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ClientAxisEngine.cpp 25 May 2004 10:54:43 -0000 1.10
+++ ClientAxisEngine.cpp 10 Jun 2004 10:07:53 -0000 1.11
@@ -67,7 +67,7 @@
Status = initializeHandlers (sSessionId, pSoap->getProtocol());
if (AXIS_SUCCESS != Status)
{
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLERINITFAILED);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_INIT_FAILED);
break; //do .. while(0)
}
//Get Service specific Handlers from the pool if configured any
1.19 +40 -40 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ServerAxisEngine.cpp 26 May 2004 07:40:40 -0000 1.18
+++ ServerAxisEngine.cpp 10 Jun 2004 10:07:53 -0000 1.19
@@ -49,7 +49,7 @@
if (!pStream)
{
AXISTRACE1 ("transport is not set properly", CRITICAL);
- THROW_AXIS_CONFIG_EXCEPTION(SERVER_CONFIG_TRANSPORTCONFFAILED);
+ THROW_AXIS_CONFIG_EXCEPTION(SERVER_CONFIG_TRANSPORT_CONF_FAILED);
}
string sSessionId = pStream->getSessionId();
@@ -68,8 +68,8 @@
nSoapVersion =
(nSoapVersion == VERSION_LAST) ? SOAP_VER_1_2 : nSoapVersion;
m_pSZ->setSoapVersion ((SOAP_VERSION) nSoapVersion);
- AXISTRACE1 ("CLIENT_SOAP_SOAPCONTENTERROR", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAPCONTENTERROR);
+ AXISTRACE1 ("CLIENT_SOAP_SOAP_CONTENT_ERROR", CRITICAL);
+ THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_CONTENT_ERROR);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPCONTENTERROR));
break; // do .. while(0)
}
@@ -77,8 +77,8 @@
const char* cService = pStream->getTransportProperty(SERVICE_URI);
if (!cService)
{
- AXISTRACE1 ("CLIENT_SOAP_SOAPCONTENTERROR", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAPCONTENTERROR);
+ AXISTRACE1 ("CLIENT_SOAP_SOAP_CONTENT_ERROR", CRITICAL);
+ THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_CONTENT_ERROR);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPCONTENTERROR));
break; // do .. while(0)
}
@@ -90,8 +90,8 @@
nSoapVersion =
(nSoapVersion == VERSION_LAST) ? SOAP_VER_1_2 : nSoapVersion;
m_pSZ->setSoapVersion ((SOAP_VERSION) nSoapVersion);
- AXISTRACE1("CLIENT_SOAP_SOAPACTIONEMTPY", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAPACTIONEMTPY);
+ AXISTRACE1("CLIENT_SOAP_SOAP_ACTION_EMTPY", CRITICAL);
+ THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_ACTION_EMTPY);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPACTIONEMTPY));
break; // do .. while(0)
}
@@ -109,8 +109,8 @@
nSoapVersion =
(nSoapVersion == VERSION_LAST) ? SOAP_VER_1_2 : nSoapVersion;
m_pSZ->setSoapVersion ((SOAP_VERSION) nSoapVersion);
- AXISTRACE1("CLIENT_WSDD_SERVICENOTFOUND", CRITICAL);
- THROW_AXIS_WSDD_EXCEPTION(CLIENT_WSDD_SERVICENOTFOUND);
+ AXISTRACE1("CLIENT_WSDD_SERVICE_NOT_FOUND", CRITICAL);
+ THROW_AXIS_WSDD_EXCEPTION(CLIENT_WSDD_SERVICE_NOT_FOUND);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_WSDD_SERVICENOTFOUND));
break; // do .. while(0)
}
@@ -146,8 +146,8 @@
nSoapVersion = m_pDZ->getVersion ();
if (m_pDZ->getStatus () != AXIS_SUCCESS)
{
- AXISTRACE1("CLIENT_SOAP_MESSAGEINCOMPLETE", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_MESSAGEINCOMPLETE);
+ AXISTRACE1("CLIENT_SOAP_MESSAGE_INCOMPLETE", CRITICAL);
+ THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_MESSAGE_INCOMPLETE);
//m_pSZ->setSoapFault (SoapFault::getSoapFault(CLIENT_SOAP_MESSAGEINCOMPLETE));
break; // do .. while(0)
}
@@ -155,8 +155,8 @@
if (nSoapVersion == VERSION_LAST) /* version not supported */
{
m_pSZ->setSoapVersion (SOAP_VER_1_2);
- AXISTRACE1("SOAP_VERSIONMISMATCH", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(SOAP_VERSIONMISMATCH);
+ AXISTRACE1("SOAP_VERSION_MISMATCH", CRITICAL);
+ THROW_AXIS_SOAP_EXCEPTION(SOAP_VERSION_MISMATCH);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SOAP_VERSIONMISMATCH));
break; // do .. while(0)
}
@@ -164,8 +164,8 @@
/* Set Soap version in the Serializer and the envelope */
if (AXIS_SUCCESS != m_pSZ->setSoapVersion ((SOAP_VERSION) nSoapVersion))
{
- AXISTRACE1 ("CLIENT_SOAP_SOAPCONTENTERROR", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAPCONTENTERROR);
+ AXISTRACE1 ("CLIENT_SOAP_SOAP_CONTENT_ERROR", CRITICAL);
+ THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_CONTENT_ERROR);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPCONTENTERROR));
break; // do .. while(0)
}
@@ -176,8 +176,8 @@
AxisString sOperation = pStream->getTransportProperty(OPERATION_NAME);
if (sOperation.empty ())
{
- AXISTRACE1("CLIENT_SOAP_NOSOAPMETHOD", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_NOSOAPMETHOD);
+ AXISTRACE1("CLIENT_SOAP_NO_SOAP_METHOD", CRITICAL);
+ THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_NO_SOAP_METHOD);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_NOSOAPMETHOD));
break; // do .. while(0)
}
@@ -196,8 +196,8 @@
sSessionId, m_pService))
{
/* error : couldnot load web service */
- AXISTRACE1("SERVER_ENGINE_COULDNOTLOADSRV", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULDNOTLOADSRV);
+ AXISTRACE1("SERVER_ENGINE_COULD_NOT_LOAD_SRV", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULD_NOT_LOAD_SRV);
//m_pSZ->
// setSoapFault(SoapFault::getSoapFault(SERVER_ENGINE_COULDNOTLOADSRV));
break; // do .. while(0)
@@ -221,8 +221,8 @@
if (m_pSZ->getStyle () != nBindingStyle)
{
- AXISTRACE1 ("CLIENT_SOAP_SOAPCONTENTERROR", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAPCONTENTERROR);
+ AXISTRACE1 ("CLIENT_SOAP_SOAP_CONTENT_ERROR", CRITICAL);
+ THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_CONTENT_ERROR);
//m_pSZ->
// setSoapFault(SoapFault::getSoapFault(CLIENT_SOAP_SOAPCONTENTERROR));
break; // do .. while(0)
@@ -230,8 +230,8 @@
}
else
{
- AXISTRACE1("CLIENT_WSDD_METHODNOTALLOWED", CRITICAL);
- THROW_AXIS_WSDD_EXCEPTION(CLIENT_WSDD_METHODNOTALLOWED);
+ AXISTRACE1("CLIENT_WSDD_METHOD_NOT_ALLOWED", CRITICAL);
+ THROW_AXIS_WSDD_EXCEPTION(CLIENT_WSDD_METHOD_NOT_ALLOWED);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_WSDD_METHODNOTALLOWED));
// Method is not an exposed allowed method
break; // do .. while(0)
@@ -241,8 +241,8 @@
if (AXIS_SUCCESS != (Status = initializeHandlers (sSessionId,
pStream->getProtocol())))
{
- AXISTRACE1("SERVER_ENGINE_COULDNOTLOADHDL", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULDNOTLOADHDL);
+ AXISTRACE1("SERVER_ENGINE_COULD_NOT_LOAD_HDL", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULD_NOT_LOAD_HDL);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SERVER_ENGINE_COULDNOTLOADHDL));
break; // do .. while(0)
}
@@ -250,8 +250,8 @@
if (AXIS_SUCCESS != (Status = g_pHandlerPool->getRequestFlowHandlerChain
(&m_pSReqFChain, sSessionId, m_pService)))
{
- AXISTRACE1("SERVER_ENGINE_COULDNOTLOADHDL", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULDNOTLOADHDL);
+ AXISTRACE1("SERVER_ENGINE_COULD_NOT_LOAD_HDL", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULD_NOT_LOAD_HDL);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SERVER_ENGINE_COULDNOTLOADHDL));
break; // do .. while(0)
}
@@ -260,8 +260,8 @@
g_pHandlerPool->getResponseFlowHandlerChain (&m_pSResFChain,
sSessionId, m_pService)))
{
- AXISTRACE1("SERVER_ENGINE_COULDNOTLOADHDL", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULDNOTLOADHDL);
+ AXISTRACE1("SERVER_ENGINE_COULD_NOT_LOAD_HDL", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULD_NOT_LOAD_HDL);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SERVER_ENGINE_COULDNOTLOADHDL));
break; // do .. while(0)
}
@@ -275,8 +275,8 @@
*/
if (AXIS_SUCCESS != m_pDZ->getHeader ())
{
- AXISTRACE1 ("CLIENT_SOAP_SOAPCONTENTERROR", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAPCONTENTERROR);
+ AXISTRACE1 ("CLIENT_SOAP_SOAP_CONTENT_ERROR", CRITICAL);
+ THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_CONTENT_ERROR);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPCONTENTERROR));
break; // do .. while(0)
}
@@ -289,7 +289,7 @@
if (AXIS_SUCCESS != m_pDZ->flushInputStream ())
{
- AXISTRACE1 ("CLIENT_SOAP_SOAPCONTENTERROR", CRITICAL);
+ AXISTRACE1 ("CLIENT_SOAP_SOAP_CONTENT_ERROR", CRITICAL);
}
/*
* Get any header blocks unprocessed (left) in the Deserializer and add them
@@ -368,8 +368,8 @@
{
if (AXIS_SUCCESS != (Status = m_pTReqFChain->invoke (pMsg)))
{
- AXISTRACE1("SERVER_ENGINE_HANDLERFAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLERFAILED);
+ AXISTRACE1("SERVER_ENGINE_HANDLER_FAILED", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_FAILED);
//m_pSZ->setSoapFault (SoapFault::getSoapFault(SERVER_ENGINE_HANDLERFAILED));
break; // do .. while (0)
}
@@ -381,8 +381,8 @@
{
if (AXIS_SUCCESS != (Status = m_pGReqFChain->invoke (pMsg)))
{
- AXISTRACE1("SERVER_ENGINE_HANDLERFAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLERFAILED);
+ AXISTRACE1("SERVER_ENGINE_HANDLER_FAILED", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_FAILED);
//m_pSZ->setSoapFault (SoapFault::getSoapFault(SERVER_ENGINE_HANDLERFAILED));
break; // do .. while (0)
}
@@ -393,8 +393,8 @@
{
if (AXIS_SUCCESS != (Status = m_pSReqFChain->invoke (pMsg)))
{
- AXISTRACE1("SERVER_ENGINE_HANDLERFAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLERFAILED);
+ AXISTRACE1("SERVER_ENGINE_HANDLER_FAILED", CRITICAL);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_FAILED);
//m_pSZ->setSoapFault (SoapFault::getSoapFault(SERVER_ENGINE_HANDLERFAILED));
break; // do .. while (0)
}
@@ -408,7 +408,7 @@
if (m_pDZ->isAnyMustUnderstandHeadersLeft ())
{
AXISTRACE1("SOAP_MUSTUNDERSTAND", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(SOAP_MUSTUNDERSTAND);
+ THROW_AXIS_SOAP_EXCEPTION(SOAP_MUST_UNDERSTAND);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SOAP_MUSTUNDERSTAND));
break; // do .. while (0)
}
@@ -434,7 +434,7 @@
if (AXIS_SUCCESS != Status)
{
AXISTRACE1("SERVER_ENGINE_WEBSERVICEFAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_WEBSERVICEFAILED);
+ THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_WEBSERVICE_FAILED);
//m_pSZ->
// setSoapFault(SoapFault::getSoapFault(SERVER_ENGINE_WEBSERVICEFAILED));
break;
1.5 +6 -6 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisSoapException.cpp 20 May 2004 08:12:18 -0000 1.4
+++ AxisSoapException.cpp 10 Jun 2004 10:07:53 -0000 1.5
@@ -82,22 +82,22 @@
switch(iExceptionCode)
{
- case SOAP_VERSIONMISMATCH :
+ case SOAP_VERSION_MISMATCH :
sMessage = "Soap Version mismatch fault occured";
break;
- case SOAP_MUSTUNDERSTAND:
+ case SOAP_MUST_UNDERSTAND:
sMessage = "Soap Must understand fault occured";
break;
- case CLIENT_SOAP_MESSAGEINCOMPLETE:
+ case CLIENT_SOAP_MESSAGE_INCOMPLETE:
sMessage = "Received message is incomplete";
break;
- case CLIENT_SOAP_SOAPACTIONEMTPY:
+ case CLIENT_SOAP_SOAP_ACTION_EMTPY:
sMessage = "Soap action is empty";
break;
- case CLIENT_SOAP_SOAPCONTENTERROR:
+ case CLIENT_SOAP_SOAP_CONTENT_ERROR:
sMessage = "Received content is faulty";
break;
- case CLIENT_SOAP_NOSOAPMETHOD:
+ case CLIENT_SOAP_NO_SOAP_METHOD:
sMessage = "Request method is not a soap method";
break;
default:
1.23 +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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SoapBody.cpp 2 Jun 2004 17:55:44 -0000 1.22
+++ SoapBody.cpp 10 Jun 2004 10:07:53 -0000 1.23
@@ -107,7 +107,7 @@
}
else
{
- m_pSoapFault = SoapFault::getSoapFault(SERVER_ENGINE_WEBSERVICEFAILED);
+ m_pSoapFault = SoapFault::getSoapFault(SERVER_ENGINE_WEBSERVICE_FAILED);
if(m_pSoapFault!=NULL)
{
iStatus= m_pSoapFault->serialize(pSZ, eSoapVersion);
1.57 +4 -2 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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- SoapDeSerializer.cpp 10 Jun 2004 06:10:45 -0000 1.56
+++ SoapDeSerializer.cpp 10 Jun 2004 10:07:53 -0000 1.57
@@ -299,7 +299,8 @@
//if (0 != strcmp(m_pNode->m_pchNameOrValue, pName)) return AXIS_FAIL;
if (0 != strcmp(m_pNode->m_pchNameOrValue, pName))
{
- THROW_AXIS_EXCEPTION(AXISC_NODEVALUE_MISMATCH_EXCEPTION);
+ AXISTRACE1("AXISC_NODE_VALUE_MISMATCH_EXCEPTION", CRITICAL);
+ THROW_AXIS_EXCEPTION(AXISC_NODE_VALUE_MISMATCH_EXCEPTION);
}
/* we can check the namespace uri too here. Should we ?*/
m_pNode = NULL; /*This is to indicate that node is identified and used */
@@ -317,7 +318,8 @@
{
m_nStatus = AXIS_SUCCESS;
m_pNode = NULL;
- THROW_AXIS_EXCEPTION(AXISC_NODEVALUE_MISMATCH_EXCEPTION);
+ AXISTRACE1("AXISC_NODE_VALUE_MISMATCH_EXCEPTION", CRITICAL);
+ THROW_AXIS_EXCEPTION(AXISC_NODE_VALUE_MISMATCH_EXCEPTION);
}
/* we can check the namespace uri too here. Should we ?*/
m_nStatus = AXIS_SUCCESS;
1.2 +8 -2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AxisTransportException.cpp 18 May 2004 10:28:39 -0000 1.1
+++ AxisTransportException.cpp 10 Jun 2004 10:07:53 -0000 1.2
@@ -80,14 +80,20 @@
string sMessage;
switch(iExceptionCode)
{
- case SERVER_TRANSPORT_RECEPTIONEXCEPTION:
+ case SERVER_TRANSPORT_RECEPTION_EXCEPTION:
sMessage = "Problem occured when receiving the stream";
break;
- case SERVER_TRANSPORT_SENDINGEXCEPTION:
+ case SERVER_TRANSPORT_SENDING_EXCEPTION:
sMessage = "Problem occured when sending the stream";
break;
case SERVER_TRANSPORT_HTTP_EXCEPTION:
sMessage = "HTTP transport error";
+ break;
+ case SERVER_TRANSPORT_PROCESS_EXCEPTION:
+ m_sMessage = "HTTP Error, cannot process response message";
+ break;
+ case SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE:
+ m_sMessage = "Unknow HTTP response, cannot process response message";
break;
default:
sMessage = "Unknown Transport Exception";
1.32 +10 -16 ws-axis/c/src/transport/axis/HttpTransport.cpp
Index: HttpTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/HttpTransport.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- HttpTransport.cpp 8 Jun 2004 12:02:02 -0000 1.31
+++ HttpTransport.cpp 10 Jun 2004 10:07:53 -0000 1.32
@@ -42,7 +42,6 @@
#include "HttpTransport.hpp"
#include <iostream>
#include <stdio.h>
-#include <axis/server/AxisException.h>
#include <axis/server/GDefine.h>
using namespace std;
@@ -117,8 +116,7 @@
{
/* open a channel for transport */
m_HttpBindDone = false;
- try
- {
+ AXISC_TRY
m_bStatus = true;
std::string host = m_Url.GetHostName();
unsigned int port = m_Url.GetPort();
@@ -134,12 +132,11 @@
#ifdef _DEBUG
cout << "Transport:init() successfull" << endl;
#endif
- }
- catch (ChannelException & chEx)
- {
- std::cerr << chEx.GetErr () << std::endl;
- throw;
- }
+ AXISC_CATCH(AxisTransportException & chEx)
+ AXISC_THROW_SAME
+ AXISC_CATCH(AxisException & chEx)
+ AXISC_THROW_SAME
+ AXISC_ENDCATCH
return true;
}
@@ -595,16 +592,14 @@
{
/* error recovery mechanism should go here */
Error (m_sHeader.c_str ());
- throw ChannelException ("HTTP Error, cannot process response \
- message...");
+ THROW_AXIS_TRANSPORT_EXCEPTION(SERVER_TRANSPORT_PROCESS_EXCEPTION);
}
else if (nHttpSatus == 4)
/* Status code is 4xx; some error has occurred */
{
/* error recovery mechanism should go here */
Error (m_sHeader.c_str ());
- throw ChannelException ("HTTP Error, cannot process response \
- message...");
+ THROW_AXIS_TRANSPORT_EXCEPTION(SERVER_TRANSPORT_PROCESS_EXCEPTION);
}
else if (nHttpSatus == 5)
/* Status code is 5xx; some error has occurred */
@@ -614,13 +609,12 @@
if (!m_bStatus)
{
Error (m_sHeader.c_str ());
- throw AxisException (SERVER_TRANSPORT_HTTP_EXCEPTION);
+ THROW_AXIS_TRANSPORT_EXCEPTION(SERVER_TRANSPORT_HTTP_EXCEPTION);
}
}
}
else
- throw ChannelException ("Unknow HTTP response, cannot process \
- response message...");
+ THROW_AXIS_TRANSPORT_EXCEPTION(SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE);
}
1.6 +3 -0 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HttpTransport.hpp 8 Jun 2004 12:02:02 -0000 1.5
+++ HttpTransport.hpp 10 Jun 2004 10:07:53 -0000 1.6
@@ -43,6 +43,9 @@
#ifdef _SSL_ENABLED_
#include "SecureChannel.hpp"
#endif
+#include <axis/server/AxisTrace.h>
+extern AxisTrace* g_pAT;
+#include "AxisTransportException.h"
/*
* Implements HTTP transport as SOAP-Envelop carrier, for sending/receiving
1.18 +1 -1 ws-axis/c/src/transport/axis/Receiver.cpp
Index: Receiver.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Receiver.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Receiver.cpp 18 May 2004 04:32:31 -0000 1.17
+++ Receiver.cpp 10 Jun 2004 10:07:53 -0000 1.18
@@ -71,7 +71,7 @@
catch(...)
{
printf("catch(...)\n");
- throw AxisException(SERVER_TRANSPORT_RECEPTIONEXCEPTION);
+ throw AxisException(SERVER_TRANSPORT_RECEPTION_EXCEPTION);
}
}
/* printf("m_MsgSize:%d\n", m_MsgSize); */
1.12 +1 -1 ws-axis/c/src/transport/axis/Sender.cpp
Index: Sender.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis/Sender.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Sender.cpp 18 May 2004 04:32:31 -0000 1.11
+++ Sender.cpp 10 Jun 2004 10:07:53 -0000 1.12
@@ -49,7 +49,7 @@
}
catch(...)
{
- throw AxisException(SERVER_TRANSPORT_SENDINGEXCEPTION);
+ THROW(SERVER_TRANSPORT_SENDING_EXCEPTION);
}
return true;
1.4 +4 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisWsddException.cpp 20 May 2004 08:12:18 -0000 1.3
+++ AxisWsddException.cpp 10 Jun 2004 10:07:53 -0000 1.4
@@ -81,16 +81,16 @@
string sMessage;
switch(iExceptionCode)
{
- case CLIENT_WSDD_SERVICENOTFOUND:
+ case CLIENT_WSDD_SERVICE_NOT_FOUND:
sMessage = "Requested service not found";
break;
- case CLIENT_WSDD_METHODNOTALLOWED:
+ case CLIENT_WSDD_METHOD_NOT_ALLOWED:
sMessage = "Requested method is not allowed";
break;
- case CLIENT_WSDD_PARATYPEMISMATCH:
+ case CLIENT_WSDD_PARA_TYPE_MISMATCH:
sMessage = "Parameter type mismatch";
break;
- case SERVER_WSDD_NOHANDLERSCONFIGURED:
+ case SERVER_WSDD_NO_HANDLERS_CONFIGURED:
sMessage = "No handlers configured in server.wsdd";
break;
default: