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 pr...@apache.org on 2005/01/07 12:13:24 UTC

cvs commit: ws-axis/c/include/axis GDefine.hpp AxisException.hpp

prestonf    2005/01/07 03:13:24

  Modified:    c/include/axis GDefine.hpp AxisException.hpp
  Log:
  Hi All,
  These are modifications needed for the draft of the new http transport implementation AXIS3 (see AXISCPP-361).
  Regards,
  Fred Preston.
  
  Revision  Changes    Path
  1.4       +4 -1      ws-axis/c/include/axis/GDefine.hpp
  
  Index: GDefine.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/GDefine.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GDefine.hpp	17 Dec 2004 11:49:44 -0000	1.3
  +++ GDefine.hpp	7 Jan 2005 11:13:24 -0000	1.4
  @@ -62,8 +62,11 @@
       SERVICE_URI,
       OPERATION_NAME,
       SOAP_MESSAGE_LENGTH,
  +	TRANSPORT_PROPERTIES,
       SECURE_PROPERTIES,
  -    DLL_NAME
  +    DLL_NAME,
  +	CHANNEL_HTTP_SSL_DLL_NAME = DLL_NAME,
  +	CHANNEL_HTTP_DLL_NAME
   } AXIS_TRANSPORT_INFORMATION_TYPE;
   
   #define SOAPACTIONHEADER "SOAPAction"
  
  
  
  1.4       +75 -65    ws-axis/c/include/axis/AxisException.hpp
  
  Index: AxisException.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/AxisException.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AxisException.hpp	25 Nov 2004 12:41:53 -0000	1.3
  +++ AxisException.hpp	7 Jan 2005 11:13:24 -0000	1.4
  @@ -41,14 +41,17 @@
    * The following enumeration is used to serve the Axis C++ codes for 
    * faults.
    */
  +#define CLIENT_FAULT_OFFSET		0x0
  +#define SERVER_FAULT_OFFSET		0x1000
  +#define SOAP_FAULT_OFFSET		0x2000
  +#define ENGINE_FAULT_OFFSET		0x3000
  +#define WSDD_FAULT_OFFSET		0x4000
  +#define TRANSPORT_FAULT_OFFSET	0x5000
  +#define CONFIG_FAULT_OFFSET		0x6000
  +#define AXISC_FAULT_OFFSET		0x7000
  +
   enum AXISC_EXCEPTIONS 
   {
  -    /* VersionMismatch faults */
  -/*0*/    SOAP_VERSION_MISMATCH,
  -    
  -    /* MustUnderstand faults */
  -/*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
        *    it's fault code is CLIENT
  @@ -64,8 +67,12 @@
        *    exception
        *CONFIG that comes next to CLIENT/SERVER means this is a axisc++ configuration
        *    related exception
  +	 *AXISC ?
        */
  -     
  +	/* SOAP faults */
  +/*0*/    SOAP_VERSION_MISMATCH, /* VersionMismatch faults */
  +/*1*/    SOAP_MUST_UNDERSTAND,	/* MustUnderstand faults */
  +
       /* Client faults */
   /*2*/    CLIENT_SOAP_MESSAGE_INCOMPLETE,
   /*3*/    CLIENT_SOAP_SOAP_ACTION_EMTPY,
  @@ -79,74 +86,77 @@
   /*11*/	 CLIENT_TRANSPORT_EXCEPTION,
   /*12*/   CLIENT_TRANSPORT_OPEN_CONNECTION_FAILED,
   /*13*/   CLIENT_TRANSPORT_TYPE_MISMATCH,
  -/*14*/   CLIENT_TRANSPORT_HAS_NO_SECURE_TRANSPORT_LAYER,
  -/*15*/   CLIENT_SSLCHANNEL_RECEPTION_EXCEPTION,
  -/*16*/   CLIENT_SSLCHANNEL_SENDING_EXCEPTION,
  -/*17*/   CLIENT_SSLCHANNEL_CHANNEL_INIT_ERROR,
  -/*18*/   CLIENT_SSLCHANNEL_SOCKET_CREATE_ERROR,
  -/*19*/   CLIENT_SSLCHANNEL_SOCKET_CONNECT_ERROR,
  -/*20*/   CLIENT_SSLCHANNEL_INVALID_SOCKET_ERROR,
  -/*21*/   CLIENT_SSLCHANNEL_CONTEXT_CREATE_ERROR,
  -/*22*/   CLIENT_SSLCHANNEL_ERROR,
  +/*14*/   CLIENT_TRANSPORT_HAS_NO_UNSECURE_TRANSPORT_LAYER,
  +/*15*/   CLIENT_TRANSPORT_HAS_NO_SECURE_TRANSPORT_LAYER,
  +/*16*/   CLIENT_SSLCHANNEL_RECEPTION_EXCEPTION,
  +/*17*/   CLIENT_SSLCHANNEL_SENDING_EXCEPTION,
  +/*18*/   CLIENT_SSLCHANNEL_CHANNEL_INIT_ERROR,
  +/*19*/   CLIENT_SSLCHANNEL_SOCKET_CREATE_ERROR,
  +/*20*/   CLIENT_SSLCHANNEL_SOCKET_CONNECT_ERROR,
  +/*21*/   CLIENT_SSLCHANNEL_INVALID_SOCKET_ERROR,
  +/*22*/   CLIENT_SSLCHANNEL_CONTEXT_CREATE_ERROR,
  +/*23*/   CLIENT_SSLCHANNEL_ERROR,
   
       /* Server faults */
  -/*23*/    SERVER_ENGINE_EXCEPTION,
  -/*24*/    SERVER_ENGINE_COULD_NOT_LOAD_SRV,
  -/*25*/    SERVER_ENGINE_COULD_NOT_LOAD_HDL,
  -/*26*/    SERVER_ENGINE_LOADING_TRANSPORT_FAILED,
  -/*27*/    SERVER_ENGINE_LOADING_PARSER_FAILED,
  -/*28*/    SERVER_ENGINE_HANDLER_FAILED,
  -/*29*/    SERVER_ENGINE_WEBSERVICE_FAILED,
  -/*30*/    SERVER_ENGINE_HANDLER_INIT_FAILED,
  -/*31*/    SERVER_ENGINE_HANDLER_CREATION_FAILED,
  -/*32*/    SERVER_ENGINE_LIBRARY_LOADING_FAILED,
  -/*33*/    SERVER_ENGINE_HANDLER_NOT_LOADED,
  -/*34*/    SERVER_ENGINE_HANDLER_BEING_USED,
  -/*35*/    SERVER_ENGINE_GET_HANDLER_FAILED,
  -/*36*/    SERVER_ENGINE_WRONG_HANDLER_TYPE,
  -/*37*/    SERVER_CONFIG_EXCEPTION,
  -/*38*/    SERVER_CONFIG_TRANSPORT_CONF_FAILED,
  -/*39*/    SERVER_CONFIG_LIBRARY_PATH_EMPTY,
  -/*40*/    SERVER_WSDD_FILE_NOT_FOUND,
  -/*41*/    SERVER_WSDD_EXCEPTION,
  -/*42*/    SERVER_WSDD_NO_HANDLERS_CONFIGURED,
  -/*43*/    SERVER_SOAP_EXCEPTION,
  -/*44*/    SERVER_TRANSPORT_EXCEPTION,
  -/*45*/    SERVER_TRANSPORT_RECEPTION_EXCEPTION,
  -/*46*/    SERVER_TRANSPORT_SENDING_EXCEPTION,
  -/*47*/    SERVER_TRANSPORT_PROCESS_EXCEPTION,
  -/*48*/    SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE,
  -/*49*/    SERVER_TRANSPORT_HTTP_EXCEPTION,
  -/*50*/    SERVER_TRANSPORT_UNEXPECTED_STRING,
  -/*51*/    SERVER_TRANSPORT_CHANNEL_INIT_ERROR,
  -/*52*/    SERVER_TRANSPORT_SOCKET_CREATE_ERROR,
  -/*53*/    SERVER_TRANSPORT_SOCKET_CONNECT_ERROR,
  -/*54*/    SERVER_TRANSPORT_INVALID_SOCKET,
  -/*55*/    SERVER_TRANSPORT_OUTPUT_STREAMING_ERROR,
  -/*56*/    SERVER_TRANSPORT_INPUT_STREAMING_ERROR,
  -/*57*/    SERVER_TRANSPORT_TIMEOUT_EXCEPTION,
  -/*58*/    SERVER_TRANSPORT_TIMEOUT_EXPIRED,
  -/*59*/    SERVER_TRANSPORT_LOADING_SSLCHANNEL_FAILED,
  -/*60*/    SERVER_TRANSPORT_BUFFER_EMPTY,
  -/*61*/    SERVER_PARSE_BUFFER_EMPTY,
  -/*62*/    SERVER_PARSE_PARSER_FAILED, 
  -/*63*/    SERVER_PARSE_TRANSPORT_FAILED,
  - 
  -/*64*/    SERVER_TEST_EXCEPTION,
  -/*65*/    SERVER_UNKNOWN_ERROR,
  +/*24*/    SERVER_ENGINE_EXCEPTION,
  +/*25*/    SERVER_ENGINE_COULD_NOT_LOAD_SRV,
  +/*26*/    SERVER_ENGINE_COULD_NOT_LOAD_HDL,
  +/*27*/    SERVER_ENGINE_LOADING_TRANSPORT_FAILED,
  +/*28*/    SERVER_ENGINE_LOADING_PARSER_FAILED,
  +/*29*/    SERVER_ENGINE_HANDLER_FAILED,
  +/*30*/    SERVER_ENGINE_WEBSERVICE_FAILED,
  +/*31*/    SERVER_ENGINE_HANDLER_INIT_FAILED,
  +/*32*/    SERVER_ENGINE_HANDLER_CREATION_FAILED,
  +/*33*/    SERVER_ENGINE_LIBRARY_LOADING_FAILED,
  +/*34*/    SERVER_ENGINE_HANDLER_NOT_LOADED,
  +/*35*/    SERVER_ENGINE_HANDLER_BEING_USED,
  +/*36*/    SERVER_ENGINE_GET_HANDLER_FAILED,
  +/*37*/    SERVER_ENGINE_WRONG_HANDLER_TYPE,
  +/*38*/    SERVER_CONFIG_EXCEPTION,
  +/*39*/    SERVER_CONFIG_TRANSPORT_CONF_FAILED,
  +/*40*/    SERVER_CONFIG_LIBRARY_PATH_EMPTY,
  +/*41*/    SERVER_WSDD_FILE_NOT_FOUND,
  +/*42*/    SERVER_WSDD_EXCEPTION,
  +/*43*/    SERVER_WSDD_NO_HANDLERS_CONFIGURED,
  +/*44*/    SERVER_SOAP_EXCEPTION,
  +/*45*/    SERVER_TRANSPORT_EXCEPTION,
  +/*46*/    SERVER_TRANSPORT_RECEPTION_EXCEPTION,
  +/*47*/    SERVER_TRANSPORT_SENDING_EXCEPTION,
  +/*48*/    SERVER_TRANSPORT_PROCESS_EXCEPTION,
  +/*49*/    SERVER_TRANSPORT_UNKNOWN_HTTP_RESPONSE,
  +/*50*/    SERVER_TRANSPORT_HTTP_EXCEPTION,
  +/*51*/    SERVER_TRANSPORT_UNEXPECTED_STRING,
  +/*52*/    SERVER_TRANSPORT_CHANNEL_INIT_ERROR,
  +/*53*/    SERVER_TRANSPORT_SOCKET_CREATE_ERROR,
  +/*54*/    SERVER_TRANSPORT_SOCKET_CONNECT_ERROR,
  +/*55*/    SERVER_TRANSPORT_INVALID_SOCKET,
  +/*56*/    SERVER_TRANSPORT_OUTPUT_STREAMING_ERROR,
  +/*57*/    SERVER_TRANSPORT_INPUT_STREAMING_ERROR,
  +/*58*/    SERVER_TRANSPORT_TIMEOUT_EXCEPTION,
  +/*59*/    SERVER_TRANSPORT_TIMEOUT_EXPIRED,
  +/*60*/    SERVER_TRANSPORT_LOADING_SSLCHANNEL_FAILED,
  +/*61*/	  SERVER_TRANSPORT_LOADING_CHANNEL_FAILED,
  +/*62*/    SERVER_TRANSPORT_BUFFER_EMPTY,
  +/*63*/    SERVER_PARSE_BUFFER_EMPTY,
  +/*64*/    SERVER_PARSE_PARSER_FAILED, 
  +/*65*/    SERVER_PARSE_TRANSPORT_FAILED,
  +/*66*/    SERVER_TEST_EXCEPTION,
  +/*67*/    SERVER_UNKNOWN_ERROR,
  +
  +    /* AXIS C faults */
       /*Following exceptions are not releated to soap faults
        */
  -/*66*/    AXISC_SERVICE_THROWN_EXCEPTION,
  -/*67*/    AXISC_UNKNOWN_ELEMENT_EXCEPTION,
  -/*68*/    AXISC_NODE_VALUE_MISMATCH_EXCEPTION,
  -/*69*/    AXISC_READ_CONF_EXCEPTION,
  +/*68*/    AXISC_SERVICE_THROWN_EXCEPTION,
  +/*69*/    AXISC_UNKNOWN_ELEMENT_EXCEPTION,
  +/*70*/    AXISC_NODE_VALUE_MISMATCH_EXCEPTION,
  +/*71*/    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.
        */
  -/*70*/    FAULT_LAST 
  +/*72*/    FAULT_LAST 
   };
   
   /**