You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2004/08/11 14:53:05 UTC
cvs commit: ws-axis/c/src/wsdl build.xml
damitha 2004/08/11 05:53:05
Modified: c/include/axis/server AxisException.h
c/src/soap SoapFault.cpp
c/src/wsdl build.xml
Log:
in build.xml changed
<property name="src" value="src"/>
to
<property name="src" value="src/wsdl"/>
In SoapFault.cpp and AxisException.h comments were added so that the
fault codes are enumerated
Revision Changes Path
1.32 +58 -58 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- AxisException.h 6 Aug 2004 14:44:20 -0000 1.31
+++ AxisException.h 11 Aug 2004 12:53:05 -0000 1.32
@@ -46,10 +46,10 @@
enum AXISC_EXCEPTIONS
{
/* VersionMismatch faults */
- SOAP_VERSION_MISMATCH,
+/*0*/ SOAP_VERSION_MISMATCH,
/* MustUnderstand faults */
- SOAP_MUST_UNDERSTAND,
+/*1*/ 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
@@ -69,73 +69,73 @@
*/
/* Client faults */
- CLIENT_SOAP_MESSAGE_INCOMPLETE,
- CLIENT_SOAP_SOAP_ACTION_EMTPY,
- CLIENT_SOAP_SOAP_CONTENT_ERROR,
- CLIENT_SOAP_NO_SOAP_METHOD,
- CLIENT_SOAP_CONTENT_NOT_SOAP,
- CLIENT_WSDD_SERVICE_NOT_FOUND,
- CLIENT_WSDD_METHOD_NOT_ALLOWED,
- CLIENT_WSDD_PARA_TYPE_MISMATCH,
- CLIENT_ENGINE_CLIENT_HANDLER_FAILED,
+/*2*/ CLIENT_SOAP_MESSAGE_INCOMPLETE,
+/*3*/ CLIENT_SOAP_SOAP_ACTION_EMTPY,
+/*4*/ CLIENT_SOAP_SOAP_CONTENT_ERROR,
+/*5*/ CLIENT_SOAP_NO_SOAP_METHOD,
+/*6*/ CLIENT_SOAP_CONTENT_NOT_SOAP,
+/*7*/ CLIENT_WSDD_SERVICE_NOT_FOUND,
+/*8*/ CLIENT_WSDD_METHOD_NOT_ALLOWED,
+/*9*/ CLIENT_WSDD_PARA_TYPE_MISMATCH,
+/*10*/ CLIENT_ENGINE_CLIENT_HANDLER_FAILED,
/* Server faults */
- SERVER_ENGINE_EXCEPTION,
- SERVER_ENGINE_COULD_NOT_LOAD_SRV,
- SERVER_ENGINE_COULD_NOT_LOAD_HDL,
- SERVER_ENGINE_LOADING_TRANSPORT_FAILED,
- SERVER_ENGINE_LOADING_PARSER_FAILED,
- 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_TRANSPORT_CONF_FAILED,
- SERVER_CONFIG_LIBRARY_PATH_EMPTY,
- SERVER_WSDD_FILE_NOT_FOUND,
- SERVER_WSDD_EXCEPTION,
- SERVER_WSDD_NO_HANDLERS_CONFIGURED,
- SERVER_SOAP_EXCEPTION,
- SERVER_TRANSPORT_EXCEPTION,
- SERVER_TRANSPORT_RECEPTION_EXCEPTION,
- SERVER_TRANSPORT_SENDING_EXCEPTION,
- SERVER_TRANSPORT_PROCESS_EXCEPTION,
- SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE,
- SERVER_TRANSPORT_HTTP_EXCEPTION,
- SERVER_TRANSPORT_UNEXPECTED_STRING,
- SERVER_TRANSPORT_CHANNEL_INIT_ERROR,
- SERVER_TRANSPORT_SOCKET_CREATE_ERROR,
- SERVER_TRANSPORT_SOCKET_CONNECT_ERROR,
- SERVER_TRANSPORT_INVALID_SOCKET,
- SERVER_TRANSPORT_OUTPUT_STREAMING_ERROR,
- SERVER_TRANSPORT_INPUT_STREAMING_ERROR,
- SERVER_TRANSPORT_TIMEOUT_EXCEPTION,
- SERVER_TRANSPORT_TIMEOUT_EXPIRED,
- SERVER_TRANSPORT_BUFFER_EMPTY,
- SERVER_PARSE_BUFFER_EMPTY,
- SERVER_PARSE_PARSER_FAILED,
- SERVER_PARSE_TRANSPORT_FAILED,
+/*11*/ SERVER_ENGINE_EXCEPTION,
+/*12*/ SERVER_ENGINE_COULD_NOT_LOAD_SRV,
+/*13*/ SERVER_ENGINE_COULD_NOT_LOAD_HDL,
+/*14*/ SERVER_ENGINE_LOADING_TRANSPORT_FAILED,
+/*15*/ SERVER_ENGINE_LOADING_PARSER_FAILED,
+/*16*/ SERVER_ENGINE_HANDLER_FAILED,
+/*17*/ SERVER_ENGINE_WEBSERVICE_FAILED,
+/*18*/ SERVER_ENGINE_HANDLER_INIT_FAILED,
+/*19*/ SERVER_ENGINE_HANDLER_CREATION_FAILED,
+/*20*/ SERVER_ENGINE_LIBRARY_LOADING_FAILED,
+/*21*/ SERVER_ENGINE_HANDLER_NOT_LOADED,
+/*22*/ SERVER_ENGINE_HANDLER_BEING_USED,
+/*23*/ SERVER_ENGINE_GET_HANDLER_FAILED,
+/*24*/ SERVER_ENGINE_WRONG_HANDLER_TYPE,
+/*25*/ SERVER_CONFIG_EXCEPTION,
+/*26*/ SERVER_CONFIG_TRANSPORT_CONF_FAILED,
+/*27*/ SERVER_CONFIG_LIBRARY_PATH_EMPTY,
+/*28*/ SERVER_WSDD_FILE_NOT_FOUND,
+/*29*/ SERVER_WSDD_EXCEPTION,
+/*30*/ SERVER_WSDD_NO_HANDLERS_CONFIGURED,
+/*31*/ SERVER_SOAP_EXCEPTION,
+/*32*/ SERVER_TRANSPORT_EXCEPTION,
+/*33*/ SERVER_TRANSPORT_RECEPTION_EXCEPTION,
+/*34*/ SERVER_TRANSPORT_SENDING_EXCEPTION,
+/*35*/ SERVER_TRANSPORT_PROCESS_EXCEPTION,
+/*36*/ SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE,
+/*37*/ SERVER_TRANSPORT_HTTP_EXCEPTION,
+/*38*/ SERVER_TRANSPORT_UNEXPECTED_STRING,
+/*39*/ SERVER_TRANSPORT_CHANNEL_INIT_ERROR,
+/*40*/ SERVER_TRANSPORT_SOCKET_CREATE_ERROR,
+/*41*/ SERVER_TRANSPORT_SOCKET_CONNECT_ERROR,
+/*42*/ SERVER_TRANSPORT_INVALID_SOCKET,
+/*43*/ SERVER_TRANSPORT_OUTPUT_STREAMING_ERROR,
+/*44*/ SERVER_TRANSPORT_INPUT_STREAMING_ERROR,
+/*45*/ SERVER_TRANSPORT_TIMEOUT_EXCEPTION,
+/*46*/ SERVER_TRANSPORT_TIMEOUT_EXPIRED,
+/*47*/ SERVER_TRANSPORT_BUFFER_EMPTY,
+/*48*/ SERVER_PARSE_BUFFER_EMPTY,
+/*49*/ SERVER_PARSE_PARSER_FAILED,
+/*50*/ SERVER_PARSE_TRANSPORT_FAILED,
- SERVER_TEST_EXCEPTION,
- SERVER_UNKNOWN_ERROR,
+/*51*/ SERVER_TEST_EXCEPTION,
+/*52*/ SERVER_UNKNOWN_ERROR,
/*Following exceptions are not releated to soap faults
*/
- AXISC_SERVICE_THROWN_EXCEPTION,
- AXISC_UNKNOWN_ELEMENT_EXCEPTION,
- AXISC_NODE_VALUE_MISMATCH_EXCEPTION,
- AXISC_READ_CONF_EXCEPTION,
+/*53*/ AXISC_SERVICE_THROWN_EXCEPTION,
+/*54*/ AXISC_UNKNOWN_ELEMENT_EXCEPTION,
+/*55*/ AXISC_NODE_VALUE_MISMATCH_EXCEPTION,
+/*56*/ AXISC_READ_CONF_EXCEPTION,
/*
* This FAULT_LAST is not used as a fault code, but instead is used
* internaly in the code. Developers should not use this as a fault
* code.
*/
- FAULT_LAST
+/*57*/ FAULT_LAST
};
/**
1.37 +53 -52 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- SoapFault.cpp 6 Aug 2004 14:44:36 -0000 1.36
+++ SoapFault.cpp 11 Aug 2004 12:53:05 -0000 1.37
@@ -164,62 +164,63 @@
static SoapFaultStruct s_arrLocalFaultStruct[FAULT_LAST] =
{
/*VersionMismatch faults */
- {"VersionMismatch", "Soap Version Mismatch error", "", ""},
+ /*0*/ {"VersionMismatch", "Soap Version Mismatch error", "", ""},
/*MustUnderstand faults */
- {"MustUnderstand", "Soap Must Understand error", "", ""},
+ /*1*/ {"MustUnderstand", "Soap Must Understand error", "", ""},
/*Client faults */
- {"Client", "Soap message is incorrect or incomplete", "", ""},
- {"Client", "Soap Action header empty", "", ""},
- {"Client", "Soap content is not valid", "", ""},
- {"Client", "No method to invoke", "", ""},
- {"Client", "Content is not Soap", "", ""},
- {"Client", "Requested service is not registerd at the server", "", ""},
- {"Client", "Soap method is not allowed to invoke", "", ""},
- {"Client", "Parameter type mismatch", "", ""},
- {"Client", "A client handler failed", "", ""},
+ /*2*/ {"Client", "Soap message is incorrect or incomplete", "", ""},
+ /*3*/ {"Client", "Soap Action header empty", "", ""},
+ /*4*/ {"Client", "Soap content is not valid", "", ""},
+ /*5*/ {"Client", "No method to invoke", "", ""},
+ /*6*/ {"Client", "Content is not Soap", "", ""},
+ /*7*/ {"Client", "Requested service is not registerd at the server", "", ""},
+ /*8*/ {"Client", "Soap method is not allowed to invoke", "", ""},
+ /*9*/ {"Client", "Parameter type mismatch", "", ""},
+ /*10*/ {"Client", "WSDD file loading failed", "", ""},
+ /*11*/ {"Client", "A client handler failed", "", ""},
/*Server faults */
- {"Server", "Unknown Engine Exception", "", ""},
- {"Server", "Cannot load web service", "", ""},
- {"Server", "Cannot load service handlers", "", ""},
- {"Server", "DLOPEN FAILED in loading transport library", "", ""},
- {"Server", "DLOPEN FAILED in loading parser library", "", ""},
- {"Server", "A service handler failed", "", ""},
- {"Server", "Webservice failed", "", ""},
- {"Server", "Handler initialization failed", "", ""},
- {"Server", "Handler creation failed", "", ""},
- {"Server", "Library loading failed", "", ""},
- {"Server", "Handler not loaded", "", ""},
- {"Server", "Handler is being used", "", ""},
- {"Server", "Get hander failed", "", ""},
- {"Server", "Wrong handler type", "", ""},
- {"Server", "Unknown Axis Configuration Exception", "", ""},
- {"Server", "Transport configuration error", "", ""},
- {"Server", "Library path is empty", "", ""},
- {"Server", "Unknown Wsdd Exception", "", ""},
- {"Server", "No handlers configured", "", ""},
- {"Server", "Unknown Soap Exception", "", ""},
- {"Server", "Unknown Transport Exception", "", ""},
- {"Server", "Receive from transport failed", "", ""},
- {"Server", "Send to transport failed", "", ""},
- {"Server", "HTTP Error, cannot process response message", "", ""},
- {"Server", "nknow HTTP response, cannot process response message", "", ""},
- {"Server", "Http transport exception", "", ""},
- {"Server", "Unexpected string", "", ""},
- {"Server", "Cannot initialize a channel to the remote end", "", ""},
- {"Server", "Sockets error Couldn't create socket", "", ""},
- {"Server", "Cannot open a channel to the remote end, shutting down the channel", "", ""},
- {"Server", "Invalid socket. Socket may not be open", "", ""},
- {"Server", "Output streaming error on Channel while writing data", "", ""},
- {"Server", "Input streaming error while getting data", "", ""},
- {"Server", "Channel error while waiting for timeout", "", ""},
- {"Server", "Channel error connection timeout before receving", "", ""},
- {"Server", "Transport buffer is empty", "", ""},
- {"Server", "Buffer received from the parser is empty", "", ""},
- {"Server", "XML_STATUS_ERROR thrown from parser", "", ""},
- {"Server", "Error when getting the byte stream from the transport", "", ""},
- {"Server", "Test exception", "", ""},
- {"Server", "Unknown exception", "", ""}
+ /*12*/ {"Server", "Unknown Engine Exception", "", ""},
+ /*13*/ {"Server", "Cannot load web service", "", ""},
+ /*14*/ {"Server", "Cannot load service handlers", "", ""},
+ /*15*/ {"Server", "DLOPEN FAILED in loading transport library", "", ""},
+ /*16*/ {"Server", "DLOPEN FAILED in loading parser library", "", ""},
+ /*17*/ {"Server", "A service handler failed", "", ""},
+ /*18*/ {"Server", "Webservice failed", "", ""},
+ /*19*/ {"Server", "Handler initialization failed", "", ""},
+ /*20*/ {"Server", "Handler creation failed", "", ""},
+ /*21*/ {"Server", "Library loading failed", "", ""},
+ /*22*/ {"Server", "Handler not loaded", "", ""},
+ /*23*/ {"Server", "Handler is being used", "", ""},
+ /*24*/ {"Server", "Get hander failed", "", ""},
+ /*25*/ {"Server", "Wrong handler type", "", ""},
+ /*26*/ {"Server", "Unknown Axis Configuration Exception", "", ""},
+ /*27*/ {"Server", "Transport configuration error", "", ""},
+ /*28*/ {"Server", "Library path is empty", "", ""},
+ /*29*/ {"Server", "Unknown Wsdd Exception", "", ""},
+ /*30*/ {"Server", "No handlers configured", "", ""},
+ /*31*/ {"Server", "Unknown Soap Exception", "", ""},
+ /*32*/ {"Server", "Unknown Transport Exception", "", ""},
+ /*33*/ {"Server", "Receive from transport failed", "", ""},
+ /*34*/ {"Server", "Send to transport failed", "", ""},
+ /*35*/ {"Server", "HTTP Error, cannot process response message", "", ""},
+ /*36*/ {"Server", "nknow HTTP response, cannot process response message", "", ""},
+ /*37*/ {"Server", "Http transport exception", "", ""},
+ /*38*/ {"Server", "Unexpected string", "", ""},
+ /*39*/ {"Server", "Cannot initialize a channel to the remote end", "", ""},
+ /*40*/ {"Server", "Sockets error Couldn't create socket", "", ""},
+ /*41*/ {"Server", "Cannot open a channel to the remote end, shutting down the channel", "", ""},
+ /*42*/ {"Server", "Invalid socket. Socket may not be open", "", ""},
+ /*43*/ {"Server", "Output streaming error on Channel while writing data", "", ""},
+ /*44*/ {"Server", "Input streaming error while getting data", "", ""},
+ /*45*/ {"Server", "Channel error while waiting for timeout", "", ""},
+ /*46*/ {"Server", "Channel error connection timeout before receving", "", ""},
+ /*47*/ {"Server", "Transport buffer is empty", "", ""},
+ /*48*/ {"Server", "Buffer received from the parser is empty", "", ""},
+ /*49*/ {"Server", "XML_STATUS_ERROR thrown from parser", "", ""},
+ /*50*/ {"Server", "Error when getting the byte stream from the transport", "", ""},
+ /*51*/ {"Server", "Test exception", "", ""},
+ /*52*/ {"Server", "Unknown exception", "", ""}
};
s_parrSoapFaultStruct = s_arrLocalFaultStruct;
1.3 +2 -2 ws-axis/c/src/wsdl/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 26 May 2004 12:38:31 -0000 1.2
+++ build.xml 11 Aug 2004 12:53:05 -0000 1.3
@@ -34,7 +34,7 @@
Copyright (c) 2001-2003 Apache Software Foundation.
</description>
- <property name ="src" value="src"/>
+ <property name ="src" value="src/wsdl"/>
<property name ="lib" value="lib"/>
<property name ="test" value="test"/>
<property name ="classes" value="build/classes"/>
@@ -75,7 +75,7 @@
<!-- =================================================================== -->
<target name="jar" depends="compile">
<mkdir dir="./build/lib"/>
- <jar jarfile="build/lib/wsdl2ws.jar" basedir="${classes}" >
+ <jar jarfile="lib/axis/wsdl2ws.jar" basedir="${classes}" >
<include name="org/**" />
<manifest>
<section name="org/apache/axis">