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/24 06:17:06 UTC
cvs commit: ws-axis/c/tests/client/fault_mapping/gen_src MathOps.cpp MathOps.h
damitha 2004/06/23 21:17:06
Modified: c/include/axis AxisEngineException.h AxisParseException.h
AxisSoapException.h AxisTransportException.h
AxisWsddException.h
c/include/axis/server AxisException.h SoapDeSerializer.h
c/samples/client/doclitfault MathOps.cpp MathOps.h
c/samples/client/rpcfault MathOps.cpp MathOps.h
c/src Makefile.am
c/src/common Makefile.am
c/src/soap SoapDeSerializer.cpp
c/tests/client/exceptionTest/gen_src MathOps.cpp MathOps.h
c/tests/client/fault_mapping/gen_src MathOps.cpp MathOps.h
Log:
Revision Changes Path
1.5 +2 -2 ws-axis/c/include/axis/AxisEngineException.h
Index: AxisEngineException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/AxisEngineException.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisEngineException.h 21 Jun 2004 14:00:40 -0000 1.4
+++ AxisEngineException.h 24 Jun 2004 04:17:05 -0000 1.5
@@ -38,10 +38,10 @@
virtual ~AxisEngineException() throw();
const char* what() throw();
const int getExceptionCode();
- const string getMessage(const exception* e);
- const string getMessage(const int iExceptionCode);
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 int iExceptionCode);
1.5 +2 -2 ws-axis/c/include/axis/AxisParseException.h
Index: AxisParseException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/AxisParseException.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisParseException.h 21 Jun 2004 14:00:40 -0000 1.4
+++ AxisParseException.h 24 Jun 2004 04:17:05 -0000 1.5
@@ -38,10 +38,10 @@
virtual ~AxisParseException() throw();
const char* what() throw();
const int getExceptionCode();
- const string getMessage(const exception* e);
- const string getMessage(const int iExceptionCode);
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 int iExceptionCode);
1.5 +2 -1 ws-axis/c/include/axis/AxisSoapException.h
Index: AxisSoapException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/AxisSoapException.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisSoapException.h 21 Jun 2004 14:00:40 -0000 1.4
+++ AxisSoapException.h 24 Jun 2004 04:17:05 -0000 1.5
@@ -38,9 +38,10 @@
virtual ~AxisSoapException() throw();
const char* what() throw();
const int getExceptionCode();
+
+private:
const string getMessage(const exception* e);
const string getMessage(const int iExceptionCode);
-private:
void processException(const exception* e);
void processException(const exception* e, const int iExceptionCode);
void processException(const int iExceptionCode);
1.5 +2 -2 ws-axis/c/include/axis/AxisTransportException.h
Index: AxisTransportException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/AxisTransportException.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisTransportException.h 21 Jun 2004 14:00:40 -0000 1.4
+++ AxisTransportException.h 24 Jun 2004 04:17:05 -0000 1.5
@@ -38,10 +38,10 @@
virtual ~AxisTransportException() throw();
const char* what() throw();
const int getExceptionCode();
- const string getMessage(const exception* e);
- const string getMessage(const int iExceptionCode);
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 int iExceptionCode);
1.5 +2 -2 ws-axis/c/include/axis/AxisWsddException.h
Index: AxisWsddException.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/AxisWsddException.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisWsddException.h 21 Jun 2004 14:00:40 -0000 1.4
+++ AxisWsddException.h 24 Jun 2004 04:17:05 -0000 1.5
@@ -38,10 +38,10 @@
virtual ~AxisWsddException() throw();
const char* what() throw();
const int getExceptionCode();
- const string getMessage(const exception* e);
- const string getMessage(const int iExceptionCode);
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 int iExceptionCode);
1.24 +13 -12 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AxisException.h 23 Jun 2004 04:22:23 -0000 1.23
+++ AxisException.h 24 Jun 2004 04:17:05 -0000 1.24
@@ -43,7 +43,7 @@
#define AXISC_CATCH(X) } catch (X) {
#define AXISC_ENDCATCH }
-#define THROW_AXIS_EXCEPTION(X) throw AxisException(X)
+#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)
@@ -51,7 +51,7 @@
#define THROW_AXIS_TRANSPORT_EXCEPTION(X) throw AxisTransportException(X)
#define THROW_AXIS_PARSE_EXCEPTION(X) throw AxisParseException(X)
-#define THROW_AXIS_EXCEPTION2(X, Y) throw AxisException(X, Y)
+#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)
@@ -216,7 +216,7 @@
public:
/** No parameter constructor*/
- AxisException(){};
+ //AxisException(){};
/** This can be used to throw an exception with the exception code
* which is defined in the AxisException.h file, under AXISC_EXCEPTIONS
@@ -227,7 +227,7 @@
*
* @example throw AxisException(AXISC_NODE_VALUE_MISMATCH_EXCEPTION);
*/
- AxisException(const int iExceptionCode);
+ //AxisException(const int iExceptionCode);
/** This can be used to throw an exception with exception code which is
* is defined in the AxisException.h file, under AXISC_EXCEPTIONS type.
@@ -240,7 +240,7 @@
* @example throw AxisException(AXISC_NODE_VALUE_MISMATCH_EXCEPTION,
"Some additional exception info");
*/
- AxisException(const int iExceptionCode, char* pcMessage);
+ //AxisException(const int iExceptionCode, char* pcMessage);
/** This can be used to throw an exception with another exception as a
* parameter. One situation in which this can be used is when we catch
@@ -250,7 +250,7 @@
*
* @example throw AxisException(std::bad_alloc);
*/
- AxisException(const exception* e);
+ //AxisException(const exception* e);
/** This accept two parameters, both an exception code an exception object
* derived from std::exception
@@ -258,21 +258,21 @@
* @param An exception class derived from std::exception
* @param An exception code
*/
- AxisException(const exception* e, const int iExceptionCode);
+ //AxisException(const exception* e, const int iExceptionCode);
/** This accept an exception message
*
* @param An exception message
*/
- AxisException(const char* pcMessage){m_sMessage = pcMessage;};
+ //AxisException(const char* pcMessage){m_sMessage = pcMessage;};
/** Destructor */
- virtual ~AxisException() throw();
+ virtual ~AxisException() throw(){};
/** This method is defined in std::exception. AxisException and derived
* classes will override this to print exception messages
*/
- virtual const char* what() throw();
+ virtual const char* what() throw() = 0;
/** This can be called to get the exception code which is passed
* in the constructor. This returns -1 value when the
@@ -283,8 +283,8 @@
*
* @return exception message
*/
- virtual const int getExceptionCode();
- virtual const AxisString getMessage(const exception* e);
+ virtual const int getExceptionCode() = 0;
+/* virtual const AxisString getMessage(const exception* e);
virtual const AxisString getMessage(const int iExceptionCode);
private:
@@ -294,6 +294,7 @@
void processException(const int iExceptionCode, char* pcMessage);
string m_sMessage; //Holds the exception messae
int m_iExceptionCode; //Holds the exception code
+*/
};
#endif
1.23 +1 -0 ws-axis/c/include/axis/server/SoapDeSerializer.h
Index: SoapDeSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/SoapDeSerializer.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SoapDeSerializer.h 14 Jun 2004 11:08:55 -0000 1.22
+++ SoapDeSerializer.h 24 Jun 2004 04:17:05 -0000 1.23
@@ -25,6 +25,7 @@
#include "AnyElement.h"
#include <axis/SOAPTransport.h>
#include <axis/AxisSoapException.h>
+#include <axis/AxisGenException.h>
class SoapFault;
class SoapMethod;
1.9 +1 -1 ws-axis/c/samples/client/doclitfault/MathOps.cpp
Index: MathOps.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/doclitfault/MathOps.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MathOps.cpp 15 Jun 2004 08:51:08 -0000 1.8
+++ MathOps.cpp 24 Jun 2004 04:17:06 -0000 1.9
@@ -112,7 +112,7 @@
else
{
cFaultdetail = m_pCall->getElementAsString("faultdetail", 0);
- throw AxisException(cFaultdetail);
+ throw AxisGenException(cFaultdetail);
}
}
else throw;
1.5 +1 -0 ws-axis/c/samples/client/doclitfault/MathOps.h
Index: MathOps.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/doclitfault/MathOps.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MathOps.h 14 Jun 2004 08:00:44 -0000 1.4
+++ MathOps.h 24 Jun 2004 04:17:06 -0000 1.5
@@ -24,6 +24,7 @@
#include <axis/client/Stub.h>
#include "DivByZeroFault.h"
#include "AxisDivByZeroException.h"
+#include <axis/AxisGenException.h>
class MathOps
{
1.16 +1 -1 ws-axis/c/samples/client/rpcfault/MathOps.cpp
Index: MathOps.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/rpcfault/MathOps.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MathOps.cpp 15 Jun 2004 08:49:33 -0000 1.15
+++ MathOps.cpp 24 Jun 2004 04:17:06 -0000 1.16
@@ -111,7 +111,7 @@
else
{
cFaultdetail = m_pCall->getElementAsString("faultdetail", 0);
- throw AxisException(cFaultdetail);
+ throw AxisGenException(cFaultdetail);
}
}
else throw;
1.8 +1 -0 ws-axis/c/samples/client/rpcfault/MathOps.h
Index: MathOps.h
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/rpcfault/MathOps.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MathOps.h 14 Jun 2004 08:00:45 -0000 1.7
+++ MathOps.h 24 Jun 2004 04:17:06 -0000 1.8
@@ -24,6 +24,7 @@
#include <axis/client/Stub.h>
/*include Exception header files here*/
#include "AxisDivByZeroException.h"
+#include <axis/AxisGenException.h>
#include "DivByZeroStruct.h"
class MathOps
1.14 +1 -1 ws-axis/c/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.am 21 Jun 2004 12:11:33 -0000 1.13
+++ Makefile.am 24 Jun 2004 04:17:06 -0000 1.14
@@ -1,4 +1,4 @@
-SUBDIRS = common soap wsdd xml transport engine server client
+SUBDIRS = common soap wsdd xml transport engine server
AM_CPPFLAGS = -Wall
INCLUDES = -I$(AXISCPP_HOME)/include
1.18 +1 -1 ws-axis/c/src/common/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.am 24 May 2004 05:44:20 -0000 1.17
+++ Makefile.am 24 Jun 2004 04:17:06 -0000 1.18
@@ -8,7 +8,7 @@
GDefine.cpp \
AxisUtils.cpp \
AxisTrace.cpp \
- AxisException.cpp \
+ AxisGenException.cpp \
AxisConfig.cpp \
AxisSocketUtils.cpp \
AdminUtils.cpp \
1.65 +3 -3 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.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- SoapDeSerializer.cpp 23 Jun 2004 09:56:32 -0000 1.64
+++ SoapDeSerializer.cpp 24 Jun 2004 04:17:06 -0000 1.65
@@ -343,17 +343,17 @@
/* check and skip the soap body tag */
if (AXIS_SUCCESS != getBody())
//return AXIS_FAIL;
- throw AxisException(SERVER_UNKNOWN_ERROR);
+ throw AxisGenException(SERVER_UNKNOWN_ERROR);
if (!m_pNode) m_pNode = m_pParser->next();
if (!m_pNode || (START_ELEMENT != m_pNode->m_type))
//return AXIS_FAIL;
- throw AxisException(SERVER_UNKNOWN_ERROR);
+ throw AxisGenException(SERVER_UNKNOWN_ERROR);
//if (0 != strcmp(m_pNode->m_pchNameOrValue, pName)) return AXIS_FAIL;
if (0 != strcmp(m_pNode->m_pchNameOrValue, pName))
{
AXISTRACE1("AXISC_NODE_VALUE_MISMATCH_EXCEPTION", CRITICAL);
- throw AxisException(AXISC_NODE_VALUE_MISMATCH_EXCEPTION);
+ throw AxisGenException(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 */
1.2 +1 -1 ws-axis/c/tests/client/exceptionTest/gen_src/MathOps.cpp
Index: MathOps.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/client/exceptionTest/gen_src/MathOps.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MathOps.cpp 23 Jun 2004 11:01:40 -0000 1.1
+++ MathOps.cpp 24 Jun 2004 04:17:06 -0000 1.2
@@ -70,7 +70,7 @@
cFaultstring = m_pCall->getElementAsString("faultstring", 0);
cFaultactor = m_pCall->getElementAsString("faultactor", 0);
cFaultdetail = m_pCall->getElementAsString("faultdetail", 0);
- throw AxisException(cFaultdetail);
+ throw AxisGenException(cFaultdetail);
}
else throw;
}
1.2 +1 -0 ws-axis/c/tests/client/exceptionTest/gen_src/MathOps.h
Index: MathOps.h
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/client/exceptionTest/gen_src/MathOps.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MathOps.h 23 Jun 2004 11:01:40 -0000 1.1
+++ MathOps.h 24 Jun 2004 04:17:06 -0000 1.2
@@ -8,6 +8,7 @@
#include <axis/client/Stub.h>
/*include Exception header files here*/
+#include <axis/AxisGenException.h>
class MathOps :public Stub
1.2 +1 -1 ws-axis/c/tests/client/fault_mapping/gen_src/MathOps.cpp
Index: MathOps.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/client/fault_mapping/gen_src/MathOps.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MathOps.cpp 23 Jun 2004 11:11:46 -0000 1.1
+++ MathOps.cpp 24 Jun 2004 04:17:06 -0000 1.2
@@ -141,7 +141,7 @@
else
{
cFaultdetail = m_pCall->getElementAsString("faultdetail", 0);
- throw AxisException(cFaultdetail);
+ throw AxisGenException(cFaultdetail);
}
}
else throw;
1.2 +1 -0 ws-axis/c/tests/client/fault_mapping/gen_src/MathOps.h
Index: MathOps.h
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/client/fault_mapping/gen_src/MathOps.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MathOps.h 23 Jun 2004 11:11:46 -0000 1.1
+++ MathOps.h 24 Jun 2004 04:17:06 -0000 1.2
@@ -14,6 +14,7 @@
#include "AxisOutOfBoundException.h"
#include "AxisDivByZeroException.h"
#include "AxisNormalDetailException.h"
+#include <axis/AxisGenException.h>
class MathOps :public Stub