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/07/15 13:27:00 UTC
cvs commit: ws-axis/c/src/wsdd WSDDDeployment.cpp
damitha 2004/07/15 04:27:00
Modified: c configure.ac
c/include/axis/server AxisException.h
c/samples/server Makefile.am
c/src/engine AppScopeHandlerPool.cpp HandlerLoader.cpp
SOAPTransportFactory.cpp XMLParserFactory.cpp
c/src/engine/client ClientAxisEngine.cpp
c/src/engine/server ServerAxisEngine.cpp
c/src/soap SoapDeSerializer.cpp
c/src/transport Makefile.am
c/src/transport/axis HttpTransport.cpp
c/src/wsdd WSDDDeployment.cpp
Log:
Revision Changes Path
1.27 +2 -2 ws-axis/c/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/ws-axis/c/configure.ac,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure.ac 28 Jun 2004 04:21:37 -0000 1.26
+++ configure.ac 15 Jul 2004 11:26:59 -0000 1.27
@@ -1,8 +1,8 @@
AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
AM_INIT_AUTOMAKE(0.3)
AM_CONFIG_HEADER(config.h)
-CFLAGS="-Wall -Wshadow -DENABLE_AXIS_EXCEPTION -DENABLE_AXISTRACE"
-CPPFLAGS="-Wall -Wshadow -DENABLE_AXIS_EXCEPTION -DENABLE_AXISTRACE"
+CFLAGS="-Wall -Wshadow -DENABLE_AXISTRACE"
+CPPFLAGS="-Wall -Wshadow -DENABLE_AXISTRACE"
LDFLAGS="-s -lstdc++"
AC_PROG_CC
AC_PROG_CXX
1.28 +0 -84 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- AxisException.h 6 Jul 2004 08:34:41 -0000 1.27
+++ AxisException.h 15 Jul 2004 11:26:59 -0000 1.28
@@ -34,91 +34,7 @@
#include <new>
#include <typeinfo>
#include <stdexcept>
-//#include <ios>
using namespace std;
-
-
-#ifdef ENABLE_AXIS_EXCEPTION
-#define AXISC_TRY try {
-#define AXISC_CATCH(X) } catch (X) {
-#define AXISC_ENDCATCH }
-
-#define THROW_AXIS_EXCEPTION(X) throw AxisGenException(X)
-#define THROW_AXIS_CONFIG_EXCEPTION(X) throw AxisConfigException(X)
-#define THROW_AXIS_SOAP_EXCEPTION(X) throw AxisSoapException(X)
-#define THROW_AXIS_WSDD_EXCEPTION(X) throw AxisWsddException(X)
-#define THROW_AXIS_ENGINE_EXCEPTION(X) throw AxisEngineException(X)
-#define THROW_AXIS_TRANSPORT_EXCEPTION(X) throw AxisTransportException(X)
-#define THROW_AXIS_PARSE_EXCEPTION(X) throw AxisParseException(X)
-
-#define THROW_AXIS_EXCEPTION_NULL(X) throw AxisGenException(X)
-#define THROW_AXIS_CONFIG_EXCEPTION_NULL(X) throw AxisConfigException(X)
-#define THROW_AXIS_SOAP_EXCEPTION_NULL(X) throw AxisSoapException(X)
-#define THROW_AXIS_WSDD_EXCEPTION_NULL(X) throw AxisWsddException(X)
-#define THROW_AXIS_ENGINE_EXCEPTION_NULL(X) throw AxisEngineException(X)
-#define THROW_AXIS_TRANSPORT_EXCEPTION_NULL(X) throw AxisTransportException(X)
-#define THROW_AXIS_PARSE_EXCEPTION_NULL(X) throw AxisParseException(X)
-
-#define THROW_AXIS_EXCEPTION2(X, Y) throw AxisGenException(X, Y)
-#define THROW_AXIS_CONFIG_EXCEPTION2(X, Y) throw AxisConfigException(X, Y)
-#define THROW_AXIS_SOAP_EXCEPTION2(X, Y) throw AxisSoapException(X, Y)
-#define THROW_AXIS_WSDD_EXCEPTION2(X, Y) throw AxisWsddException(X, Y)
-#define THROW_AXIS_ENGINE_EXCEPTION2(X, Y) throw AxisEngineException(X, Y)
-#define THROW_AXIS_TRANSPORT_EXCEPTION2(X, Y) throw AxisTransportException(X, Y)
-#define THROW_AXIS_PARSE_EXCEPTION2(X, Y) throw AxisParseException(X, Y)
-
-#define THROW_AXIS_BAD_ALLOC() throw std::bad_alloc
-#define THROW_AXIS_BAD_CAST() throw std::bad_cast
-#define THROW_AXIS_BAD_TYPEID() throw std::bad_typeid
-#define THROW_AXIS_BAD_EXCEPTION() throw std::bad_exception
-#define THROW_AXIS_OUT_OF_RANGE(X) throw std::out_of_range
-#define THROW_AXIS_INVALID_ARGUMENT(X) throw std::invalid_argument
-#define THROW_AXIS_OVERFLOW_ERROR(X) throw std::overflow_error
-//#define THROW_AXIS_IOS_BASE_FAILURE(X) throw std::ios_base::failure
-
-#define AXISC_THROW_SAME throw
-
-#else
-
-#define AXISC_TRY
-#define AXISC_CATCH(X)
-#define AXISC_ENDCATCH
-
-#define THROW_AXIS_EXCEPTION(X) return X
-#define THROW_AXIS_CONFIG_EXCEPTION(X) return X
-#define THROW_AXIS_SOAP_EXCEPTION(X) return X
-#define THROW_AXIS_WSDD_EXCEPTION(X) return X
-#define THROW_AXIS_ENGINE_EXCEPTION(X) return X
-#define THROW_AXIS_TRANSPORT_EXCEPTION(X) return X
-#define THROW_AXIS_PARSE_EXCEPTION(X) return X
-
-#define THROW_AXIS_EXCEPTION_NULL(X) return NULL
-#define THROW_AXIS_CONFIG_EXCEPTION_NULL(X) return NULL
-#define THROW_AXIS_SOAP_EXCEPTION_NULL(X) return NULL
-#define THROW_AXIS_WSDD_EXCEPTION_NULL(X) return NULL
-#define THROW_AXIS_ENGINE_EXCEPTION_NULL(X) return NULL
-#define THROW_AXIS_TRANSPORT_EXCEPTION_NULL(X) return NULL
-#define THROW_AXIS_PARSE_EXCEPTION_NULL(X) return NULL
-
-#define THROW_AXIS_EXCEPTION2(X, Y) return X
-#define THROW_AXIS_CONFIG_EXCEPTION2(X, Y) return X
-#define THROW_AXIS_SOAP_EXCEPTION2(X, Y) return X
-#define THROW_AXIS_WSDD_EXCEPTION2(X, Y) return X
-#define THROW_AXIS_ENGINE_EXCEPTION2(X, Y) return X
-#define THROW_AXIS_TRANSPORT_EXCEPTION2(X, Y) return X
-#define THROW_AXIS_PARSE_EXCEPTION2(X, Y) return X
-
-#define THROW_AXIS_BAD_ALLOC()
-#define THROW_AXIS_BAD_CAST()
-#define THROW_AXIS_BAD_TYPEID()
-#define THROW_AXIS_BAD_EXCEPTION()
-#define THROW_AXIS_OUT_OF_RANGE(X)
-#define THROW_AXIS_INVALID_ARGUMENT(X)
-#define THROW_AXIS_OVERFLOW_ERROR(X)
-#define THROW_AXIS_IOS_BASE_FAILURE(X)
-
-#define AXISC_THROW_SAME
-#endif
/*
* The following enumeration is used to serve the Axis C++ codes for
1.6 +1 -1 ws-axis/c/samples/server/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am 15 Jun 2004 08:44:56 -0000 1.5
+++ Makefile.am 15 Jul 2004 11:27:00 -0000 1.6
@@ -1 +1 @@
-SUBDIRS = interoptests simple rpcfault doclitfault echoStringHeaderHandler
+SUBDIRS = interoptests simple rpcfault doclitfault
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AppScopeHandlerPool.cpp 6 Jul 2004 14:16:45 -0000 1.14
+++ AppScopeHandlerPool.cpp 15 Jul 2004 11:27:00 -0000 1.15
@@ -68,7 +68,7 @@
*/
{
unlock ();
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_BEING_USED);
+ throw AxisEngineException(SERVER_ENGINE_HANDLER_BEING_USED);
}
else
{
1.29 +10 -10 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- HandlerLoader.cpp 6 Jul 2004 14:16:45 -0000 1.28
+++ HandlerLoader.cpp 15 Jul 2004 11:27:00 -0000 1.29
@@ -75,7 +75,7 @@
else
{
unlock ();
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_NOT_LOADED);
+ throw AxisEngineException(SERVER_ENGINE_HANDLER_NOT_LOADED);
}
}
@@ -87,7 +87,7 @@
if (!pHandlerInfo->m_Handler)
{
AXISTRACE1("SERVER_ENGINE_LIBRARY_LOADING_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LIBRARY_LOADING_FAILED);
+ throw AxisEngineException(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_LIBRARY_LOADING_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_LIBRARY_LOADING_FAILED);
//printf ("DLOPEN FAILED: %s\n", dlerror ());
//exit (1);
}
@@ -133,7 +133,7 @@
delete pHandlerInfo;
unlock ();
AXISTRACE1("SERVER_CONFIG_LIBRARY_PATH_EMPTY", CRITICAL);
- THROW_AXIS_CONFIG_EXCEPTION(SERVER_CONFIG_LIBRARY_PATH_EMPTY);
+ throw AxisConfigException(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_LIBRARY_LOADING_FAILED);
+ throw AxisEngineException(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_LIBRARY_LOADING_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_LIBRARY_LOADING_FAILED);
//return SERVER_ENGINE_LIBRARYLOADINGFAILED;
}
}
@@ -206,14 +206,14 @@
pHandlerInfo->m_Delete (pBH);
unlock ();
AXISTRACE1("SERVER_ENGINE_HANDLER_INIT_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_INIT_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_HANDLER_INIT_FAILED);
//return SERVER_ENGINE_HANDLERINITFAILED;
}
}
else if (0 == pBH->_object)
{
AXISTRACE1("SERVER_ENGINE_HANDLER_CREATION_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_CREATION_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_HANDLER_CREATION_FAILED);
//return SERVER_ENGINE_HANDLERCREATIONFAILED;
}
else
@@ -232,7 +232,7 @@
pHandlerInfo->m_Delete (pBH);
unlock ();
AXISTRACE1("SERVER_ENGINE_HANDLER_INIT_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_INIT_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_HANDLER_INIT_FAILED);
//return SERVER_ENGINE_HANDLERINITFAILED;
}
}
@@ -241,7 +241,7 @@
{
unlock ();
AXISTRACE1("SERVER_ENGINE_HANDLER_CREATION_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_CREATION_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_HANDLER_CREATION_FAILED);
//return SERVER_ENGINE_HANDLERCREATIONFAILED;
}
}
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SOAPTransportFactory.cpp 6 Jul 2004 14:16:45 -0000 1.9
+++ SOAPTransportFactory.cpp 15 Jul 2004 11:27:00 -0000 1.10
@@ -66,7 +66,7 @@
{
unloadLib();
AXISTRACE1("SERVER_ENGINE_LOADING_TRANSPORT_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION2(SERVER_ENGINE_LOADING_TRANSPORT_FAILED, strdup(m_pcLibraryPath));
+ throw AxisEngineException(SERVER_ENGINE_LOADING_TRANSPORT_FAILED, strdup(m_pcLibraryPath));
//throw AxisEngineException(SERVER_ENGINE_LIBRARY_LOADING_FAILED, strdup(m_pcLibraryPath));
}
else
@@ -77,7 +77,7 @@
else
{
AXISTRACE1("SERVER_ENGINE_LOADING_TRANSPORT_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION2(SERVER_ENGINE_LOADING_TRANSPORT_FAILED, strdup(m_pcLibraryPath));
+ throw AxisEngineException(SERVER_ENGINE_LOADING_TRANSPORT_FAILED, strdup(m_pcLibraryPath));
//throw AxisEngineException(SERVER_ENGINE_LIBRARY_LOADING_FAILED, strdup(m_pcLibraryPath));
}
return AXIS_FAIL;
@@ -110,7 +110,7 @@
if (!m_LibHandler)
{
AXISTRACE1("SERVER_ENGINE_LOADING_TRANSPORT_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LOADING_TRANSPORT_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_LOADING_TRANSPORT_FAILED);
//printf("DLOPEN FAILED in loading transport library: %s\n", lt_dlerror ());
}
#elif defined(WIN32)
@@ -120,7 +120,7 @@
if (!m_LibHandler)
{
AXISTRACE1("SERVER_ENGINE_LOADING_TRANSPORT_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LOADING_TRANSPORT_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_LOADING_TRANSPORT_FAILED);
//printf("DLOPEN FAILED in loading transport library: %s\n", dlerror());
}
#endif
1.14 +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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XMLParserFactory.cpp 6 Jul 2004 14:16:45 -0000 1.13
+++ XMLParserFactory.cpp 15 Jul 2004 11:27:00 -0000 1.14
@@ -67,7 +67,7 @@
{
unloadLib();
AXISTRACE1("SERVER_ENGINE_LOADING_PARSER_FAILED" , CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION2(SERVER_ENGINE_LOADING_PARSER_FAILED, strdup(m_pcLibraryPath));
+ throw AxisEngineException(SERVER_ENGINE_LOADING_PARSER_FAILED, strdup(m_pcLibraryPath));
//throw AxisEngineException(SERVER_ENGINE_LIBRARY_LOADING_FAILED, strdup(m_pcLibraryPath));
}
else
@@ -78,7 +78,7 @@
else
{
AXISTRACE1("SERVER_ENGINE_LOADING_PARSER_FAILED" , CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION2(SERVER_ENGINE_LOADING_PARSER_FAILED, strdup(m_pcLibraryPath));
+ throw AxisEngineException(SERVER_ENGINE_LOADING_PARSER_FAILED, strdup(m_pcLibraryPath));
//throw AxisEngineException(SERVER_ENGINE_LIBRARY_LOADING_FAILED, strdup(m_pcLibraryPath));
}
return AXIS_FAIL;
@@ -111,7 +111,7 @@
if (!m_LibHandler)
{
AXISTRACE1("SERVER_ENGINE_LOADING_PARSER_FAILED" , CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LOADING_PARSER_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_LOADING_PARSER_FAILED);
//printf("DLOPEN FAILED in loading parser library: %s\n", lt_dlerror ());
}
#elif defined(WIN32)
@@ -121,7 +121,7 @@
if (!m_LibHandler)
{
AXISTRACE1("SERVER_ENGINE_LOADING_PARSER_FAILED" , CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_LOADING_PARSER_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_LOADING_PARSER_FAILED);
//printf("DLOPEN FAILED in loading parser library: %s\n", dlerror());
}
#endif
1.14 +8 -5 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ClientAxisEngine.cpp 6 Jul 2004 14:16:46 -0000 1.13
+++ ClientAxisEngine.cpp 15 Jul 2004 11:27:00 -0000 1.14
@@ -46,7 +46,8 @@
int Status = AXIS_FAIL;
const WSDDService* pService = NULL;
- AXISC_TRY
+ try
+ {
if (!pSoap)
{
AXISTRACE1 ("Transport is null", CRITICAL);
@@ -67,7 +68,7 @@
Status = initializeHandlers (sSessionId, pSoap->getProtocol());
if (AXIS_SUCCESS != Status)
{
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_INIT_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_HANDLER_INIT_FAILED);
break; //do .. while(0)
}
//Get Service specific Handlers from the pool if configured any
@@ -103,9 +104,11 @@
* // Pool back the Global and Transport handlers
* UnInitializeHandlers(sSessionId, soap->trtype);
*/
- AXISC_CATCH(AxisException& e)
- AXISC_THROW_SAME;
- AXISC_ENDCATCH
+ }
+ catch(AxisException& e)
+ {
+ throw;
+ }
return Status;
}
1.21 +33 -32 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ServerAxisEngine.cpp 6 Jul 2004 14:16:46 -0000 1.20
+++ ServerAxisEngine.cpp 15 Jul 2004 11:27:00 -0000 1.21
@@ -45,11 +45,12 @@
int Status = 0;
//const WSDDService* pService = NULL;
int nSoapVersion;
- AXISC_TRY
+ try
+ {
if (!pStream)
{
AXISTRACE1 ("transport is not set properly", CRITICAL);
- THROW_AXIS_CONFIG_EXCEPTION(SERVER_CONFIG_TRANSPORT_CONF_FAILED);
+ throw AxisConfigException(SERVER_CONFIG_TRANSPORT_CONF_FAILED);
}
string sSessionId = pStream->getSessionId();
@@ -69,7 +70,7 @@
(nSoapVersion == VERSION_LAST) ? SOAP_VER_1_2 : nSoapVersion;
m_pSZ->setSoapVersion ((SOAP_VERSION) nSoapVersion);
AXISTRACE1 ("CLIENT_SOAP_SOAP_CONTENT_ERROR", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_CONTENT_ERROR);
+ throw AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPCONTENTERROR));
break; // do .. while(0)
}
@@ -78,7 +79,7 @@
if (!cService)
{
AXISTRACE1 ("CLIENT_SOAP_SOAP_CONTENT_ERROR", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_CONTENT_ERROR);
+ throw AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPCONTENTERROR));
break; // do .. while(0)
}
@@ -91,7 +92,7 @@
(nSoapVersion == VERSION_LAST) ? SOAP_VER_1_2 : nSoapVersion;
m_pSZ->setSoapVersion ((SOAP_VERSION) nSoapVersion);
AXISTRACE1("CLIENT_SOAP_SOAP_ACTION_EMTPY", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_ACTION_EMTPY);
+ throw AxisSoapException(CLIENT_SOAP_SOAP_ACTION_EMTPY);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPACTIONEMTPY));
break; // do .. while(0)
}
@@ -110,7 +111,7 @@
(nSoapVersion == VERSION_LAST) ? SOAP_VER_1_2 : nSoapVersion;
m_pSZ->setSoapVersion ((SOAP_VERSION) nSoapVersion);
AXISTRACE1("CLIENT_WSDD_SERVICE_NOT_FOUND", CRITICAL);
- THROW_AXIS_WSDD_EXCEPTION(CLIENT_WSDD_SERVICE_NOT_FOUND);
+ throw AxisWsddException(CLIENT_WSDD_SERVICE_NOT_FOUND);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_WSDD_SERVICENOTFOUND));
break; // do .. while(0)
}
@@ -147,7 +148,7 @@
if (m_pDZ->getStatus () != AXIS_SUCCESS)
{
AXISTRACE1("CLIENT_SOAP_MESSAGE_INCOMPLETE", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_MESSAGE_INCOMPLETE);
+ throw AxisSoapException(CLIENT_SOAP_MESSAGE_INCOMPLETE);
//m_pSZ->setSoapFault (SoapFault::getSoapFault(CLIENT_SOAP_MESSAGEINCOMPLETE));
break; // do .. while(0)
}
@@ -156,7 +157,7 @@
{
m_pSZ->setSoapVersion (SOAP_VER_1_2);
AXISTRACE1("SOAP_VERSION_MISMATCH", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(SOAP_VERSION_MISMATCH);
+ throw AxisSoapException(SOAP_VERSION_MISMATCH);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SOAP_VERSIONMISMATCH));
break; // do .. while(0)
}
@@ -165,7 +166,7 @@
if (AXIS_SUCCESS != m_pSZ->setSoapVersion ((SOAP_VERSION) nSoapVersion))
{
AXISTRACE1 ("CLIENT_SOAP_SOAP_CONTENT_ERROR", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_CONTENT_ERROR);
+ throw AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPCONTENTERROR));
break; // do .. while(0)
}
@@ -177,7 +178,7 @@
if (sOperation.empty ())
{
AXISTRACE1("CLIENT_SOAP_NO_SOAP_METHOD", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_NO_SOAP_METHOD);
+ throw AxisSoapException(CLIENT_SOAP_NO_SOAP_METHOD);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_NOSOAPMETHOD));
break; // do .. while(0)
}
@@ -197,7 +198,7 @@
{
/* error : couldnot load web service */
AXISTRACE1("SERVER_ENGINE_COULD_NOT_LOAD_SRV", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULD_NOT_LOAD_SRV);
+ throw AxisEngineException(SERVER_ENGINE_COULD_NOT_LOAD_SRV);
//m_pSZ->
// setSoapFault(SoapFault::getSoapFault(SERVER_ENGINE_COULDNOTLOADSRV));
break; // do .. while(0)
@@ -222,7 +223,7 @@
if (m_pSZ->getStyle () != nBindingStyle)
{
AXISTRACE1 ("CLIENT_SOAP_SOAP_CONTENT_ERROR", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_CONTENT_ERROR);
+ throw AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR);
//m_pSZ->
// setSoapFault(SoapFault::getSoapFault(CLIENT_SOAP_SOAPCONTENTERROR));
break; // do .. while(0)
@@ -231,7 +232,7 @@
else
{
AXISTRACE1("CLIENT_WSDD_METHOD_NOT_ALLOWED", CRITICAL);
- THROW_AXIS_WSDD_EXCEPTION(CLIENT_WSDD_METHOD_NOT_ALLOWED);
+ throw AxisWsddException(CLIENT_WSDD_METHOD_NOT_ALLOWED);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_WSDD_METHODNOTALLOWED));
// Method is not an exposed allowed method
break; // do .. while(0)
@@ -242,7 +243,7 @@
pStream->getProtocol())))
{
AXISTRACE1("SERVER_ENGINE_COULD_NOT_LOAD_HDL", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULD_NOT_LOAD_HDL);
+ throw AxisEngineException(SERVER_ENGINE_COULD_NOT_LOAD_HDL);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SERVER_ENGINE_COULDNOTLOADHDL));
break; // do .. while(0)
}
@@ -251,7 +252,7 @@
(&m_pSReqFChain, sSessionId, m_pService)))
{
AXISTRACE1("SERVER_ENGINE_COULD_NOT_LOAD_HDL", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULD_NOT_LOAD_HDL);
+ throw AxisEngineException(SERVER_ENGINE_COULD_NOT_LOAD_HDL);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SERVER_ENGINE_COULDNOTLOADHDL));
break; // do .. while(0)
}
@@ -261,7 +262,7 @@
sSessionId, m_pService)))
{
AXISTRACE1("SERVER_ENGINE_COULD_NOT_LOAD_HDL", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_COULD_NOT_LOAD_HDL);
+ throw AxisEngineException(SERVER_ENGINE_COULD_NOT_LOAD_HDL);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SERVER_ENGINE_COULDNOTLOADHDL));
break; // do .. while(0)
}
@@ -276,7 +277,7 @@
if (AXIS_SUCCESS != m_pDZ->getHeader ())
{
AXISTRACE1 ("CLIENT_SOAP_SOAP_CONTENT_ERROR", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(CLIENT_SOAP_SOAP_CONTENT_ERROR);
+ throw AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPCONTENTERROR));
break; // do .. while(0)
}
@@ -319,12 +320,13 @@
* the ServerAxisEngine from the webserver and report the error. You can
* also write this in a logfile specific to axis.
*/
- AXISC_CATCH(AxisException& e)
+ }
+ catch(AxisException& e)
+ {
/*
* An exception which is not handled will be handled here.
*/
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPCONTENTERROR));
-#ifdef ENABLE_AXIS_EXCEPTION
int iExceptionCode = e.getExceptionCode();
char* pcTempStr = (char*) e.what();
AXISTRACE2("Exception:", pcTempStr, CRITICAL);
@@ -341,17 +343,16 @@
* exception code returned.
*/
return e.getExceptionCode();
-#endif
- AXISC_CATCH(exception& e)
-#ifdef ENABLE_AXIS_EXCEPTION
+ }
+ catch(exception& e)
+ {
/* Handle standerd exceptions here
*/
-#endif
- AXISC_CATCH(...)
-#ifdef ENABLE_AXIS_EXCEPTION
+ }
+ catch(...)
+ {
return SERVER_UNKNOWN_ERROR;
-#endif
- AXISC_ENDCATCH
+ }
return AXIS_SUCCESS;
}
@@ -369,7 +370,7 @@
if (AXIS_SUCCESS != (Status = m_pTReqFChain->invoke (pMsg)))
{
AXISTRACE1("SERVER_ENGINE_HANDLER_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_HANDLER_FAILED);
//m_pSZ->setSoapFault (SoapFault::getSoapFault(SERVER_ENGINE_HANDLERFAILED));
break; // do .. while (0)
}
@@ -382,7 +383,7 @@
if (AXIS_SUCCESS != (Status = m_pGReqFChain->invoke (pMsg)))
{
AXISTRACE1("SERVER_ENGINE_HANDLER_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_HANDLER_FAILED);
//m_pSZ->setSoapFault (SoapFault::getSoapFault(SERVER_ENGINE_HANDLERFAILED));
break; // do .. while (0)
}
@@ -394,7 +395,7 @@
if (AXIS_SUCCESS != (Status = m_pSReqFChain->invoke (pMsg)))
{
AXISTRACE1("SERVER_ENGINE_HANDLER_FAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_HANDLER_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_HANDLER_FAILED);
//m_pSZ->setSoapFault (SoapFault::getSoapFault(SERVER_ENGINE_HANDLERFAILED));
break; // do .. while (0)
}
@@ -408,7 +409,7 @@
if (m_pDZ->isAnyMustUnderstandHeadersLeft ())
{
AXISTRACE1("SOAP_MUSTUNDERSTAND", CRITICAL);
- THROW_AXIS_SOAP_EXCEPTION(SOAP_MUST_UNDERSTAND);
+ throw AxisSoapException(SOAP_MUST_UNDERSTAND);
//m_pSZ->setSoapFault (SoapFault::getSoapFault (SOAP_MUSTUNDERSTAND));
break; // do .. while (0)
}
@@ -434,7 +435,7 @@
if (AXIS_SUCCESS != Status)
{
AXISTRACE1("SERVER_ENGINE_WEBSERVICEFAILED", CRITICAL);
- THROW_AXIS_ENGINE_EXCEPTION(SERVER_ENGINE_WEBSERVICE_FAILED);
+ throw AxisEngineException(SERVER_ENGINE_WEBSERVICE_FAILED);
//m_pSZ->
// setSoapFault(SoapFault::getSoapFault(SERVER_ENGINE_WEBSERVICEFAILED));
break;
1.74 +2 -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.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- SoapDeSerializer.cpp 6 Jul 2004 14:16:46 -0000 1.73
+++ SoapDeSerializer.cpp 15 Jul 2004 11:27:00 -0000 1.74
@@ -340,7 +340,7 @@
m_nStatus = AXIS_SUCCESS;
m_pNode = NULL;
AXISTRACE1("AXISC_NODE_VALUE_MISMATCH_EXCEPTION", CRITICAL);
- THROW_AXIS_EXCEPTION(AXISC_NODE_VALUE_MISMATCH_EXCEPTION);
+ throw AxisGenException(AXISC_NODE_VALUE_MISMATCH_EXCEPTION);
}
/* we can check the namespace uri too here. Should we ?*/
m_nStatus = AXIS_SUCCESS;
@@ -371,7 +371,7 @@
}
else
{
- THROW_AXIS_EXCEPTION(AXISC_NODE_VALUE_MISMATCH_EXCEPTION);
+ throw AxisGenException(AXISC_NODE_VALUE_MISMATCH_EXCEPTION);
}
}
1.3 +1 -1 ws-axis/c/src/transport/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 15 Jul 2004 03:08:34 -0000 1.2
+++ Makefile.am 15 Jul 2004 11:27:00 -0000 1.3
@@ -1 +1 @@
-SUBDIRS = axis libwww
+SUBDIRS = axis
1.40 +7 -7 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- HttpTransport.cpp 6 Jul 2004 13:09:40 -0000 1.39
+++ HttpTransport.cpp 15 Jul 2004 11:27:00 -0000 1.40
@@ -623,7 +623,7 @@
if (pos == std::string::npos)
{
m_PayLoad = "";
- THROW_AXIS_TRANSPORT_EXCEPTION(SERVER_TRANSPORT_UNEXPECTED_STRING);/* unexpected string */
+ throw AxisTransportException(SERVER_TRANSPORT_UNEXPECTED_STRING);/* unexpected string */
}
m_IsHttpHeader = 1; /* We have the stream until payload */
@@ -649,7 +649,7 @@
nHttpStatus = nHttpStatusCode / 100;
}
else
- THROW_AXIS_TRANSPORT_EXCEPTION(SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE);
+ throw AxisTransportException(SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE);
//damitha_check
@@ -670,7 +670,7 @@
sprintf(pcIntToBuff, "%d", nHttpStatusCode);
strcpy(pcMessage, "Http error code is : ");
strcat(pcMessage, pcIntToBuff);
- THROW_AXIS_TRANSPORT_EXCEPTION2(SERVER_TRANSPORT_PROCESS_EXCEPTION, strdup(pcMessage));
+ throw AxisTransportException(SERVER_TRANSPORT_PROCESS_EXCEPTION, strdup(pcMessage));
}
else if (nHttpStatus == 4)
/* Status code is 4xx; some error has occurred */
@@ -682,7 +682,7 @@
sprintf(pcIntToBuff, "%d", nHttpStatusCode);
strcpy(pcMessage, "Http error code is : ");
strcat(pcMessage, pcIntToBuff);
- THROW_AXIS_TRANSPORT_EXCEPTION2(SERVER_TRANSPORT_PROCESS_EXCEPTION, strdup(pcMessage));
+ throw AxisTransportException(SERVER_TRANSPORT_PROCESS_EXCEPTION, strdup(pcMessage));
}
else if (nHttpStatus == 5)
/* Status code is 5xx; some error has occurred */
@@ -692,12 +692,12 @@
if (!m_bStatus)
{
//Error (m_sHeader.c_str ());
- THROW_AXIS_TRANSPORT_EXCEPTION(SERVER_TRANSPORT_HTTP_EXCEPTION);
+ throw AxisTransportException(SERVER_TRANSPORT_HTTP_EXCEPTION);
}
}
}
else
- THROW_AXIS_TRANSPORT_EXCEPTION(SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE);
+ throw AxisTransportException(SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE);
}
catch(AxisTransportException& e)
{
@@ -761,7 +761,7 @@
AXISTRACE1("SERVER_TRANSPORT_PROCESS_EXCEPTION:content type is not xml", INFO);
char* pcMessage = new char[256 * sizeof(char)];
strcpy(pcMessage, "Content type is not xml");
- THROW_AXIS_TRANSPORT_EXCEPTION2(SERVER_TRANSPORT_PROCESS_EXCEPTION, pcMessage);
+ throw AxisTransportException(SERVER_TRANSPORT_PROCESS_EXCEPTION, pcMessage);
}
}
1.38 +8 -5 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- WSDDDeployment.cpp 6 Jul 2004 14:16:48 -0000 1.37
+++ WSDDDeployment.cpp 15 Jul 2004 11:27:00 -0000 1.38
@@ -192,7 +192,8 @@
{
WSDDServiceMap::iterator iter;
if (!m_DeployedServices) return NULL;
- AXISC_TRY
+ try
+ {
iter = m_DeployedServices->find(sServiceName);
if (iter != m_DeployedServices->end())
{
@@ -201,11 +202,13 @@
else
{
return NULL;
- //THROW_AXIS_WSDD_EXCEPTION_NULL(CLIENT_WSDD_SERVICE_NOT_FOUND);
+ //throw AxisWsddException_NULL(CLIENT_WSDD_SERVICE_NOT_FOUND);
+ }
+ }
+ catch(exception& e)
+ {
+ throw AxisWsddException(SERVER_WSDD_EXCEPTION);
}
- AXISC_CATCH(exception& e)
- THROW_AXIS_WSDD_EXCEPTION(SERVER_WSDD_EXCEPTION);
- AXISC_ENDCATCH
}
const WSDDServiceMap* WSDDDeployment::getWSDDServiceMap() const