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 sa...@apache.org on 2006/05/04 15:07:37 UTC
svn commit: r399695 - in /webservices/axis2/trunk/c: include/axis2_error.h
modules/util/dir_handler.c modules/util/error.c modules/util/stream.c
samples/user_guide/clients/echo_rest.c
Author: sahan
Date: Thu May 4 06:07:36 2006
New Revision: 399695
URL: http://svn.apache.org/viewcvs?rev=399695&view=rev
Log:
More error code groupings, fixed some minor issues/warnings
Modified:
webservices/axis2/trunk/c/include/axis2_error.h
webservices/axis2/trunk/c/modules/util/dir_handler.c
webservices/axis2/trunk/c/modules/util/error.c
webservices/axis2/trunk/c/modules/util/stream.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c
Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=399695&r1=399694&r2=399695&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Thu May 4 06:07:36 2006
@@ -95,8 +95,6 @@
*/
/** Invalid SOAP envelope state */
AXIS2_ERROR_INVALID_SOAP_ENVELOPE_STATE,
- /** Invalid SOAP version */
- AXIS2_ERROR_INVALID_SOAP_VERSION,
/** Invalid message context state */
AXIS2_ERROR_INVALID_STATE_MSG_CTX,
/** Service accessed has invalid state */
@@ -277,6 +275,8 @@
AXIS2_ERROR_SSL_ENGINE,
/* Either axis2c cannot find certificates or the env variable is not set*/
AXIS2_ERROR_SSL_NO_CA_FILE,
+ /* Error in writing the response in response writer */
+ AXIS2_ERROR_WRITING_RESPONSE,
/*
* Group - mod_addr
*/
@@ -288,10 +288,18 @@
/*
* Group - utils
*/
+ /** Could not open the file */
+ AXIS2_ERROR_COULD_NOT_OPEN_FILE,
/*TODO ADDCOMMENT*/
AXIS2_ERROR_DLL_CREATE_FAILED,
/*TODO ADDCOMMENT*/
AXIS2_ERROR_DLL_LOADING_FAILED,
+ /** Environment passed is null */
+ AXIS2_ERROR_ENVIRONMENT_IS_NULL,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_FILE_NAME_NOT_SET,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_INVALID_STATE_DLL_DESC,
/*TODO ADDCOMMENT*/
AXIS2_ERROR_HANDLER_CREATION_FAILED,
/** Array list index out of bounds */
@@ -419,126 +427,85 @@
AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE_PREFIX,
/** error in writing cdata section */
AXIS2_ERROR_WRITING_CDATA,
-
- /*================================================================ */
- /** Iterator state invalid e.g. next called before calling first */
- AXIS2_ERROR_INVALID_ITERATOR_STATE,
- /** Node type is different from what is expected */
- AXIS2_ERROR_INVALID_NODE_TYPE,
- /** A document not associated with builder */
- AXIS2_ERROR_BUILDER_NOT_ASSOCIATED_WITH_DOCUMENT,
- /** Trying to release unallocated memory */
- AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED,
- /** Struct is not properly initialized */
- AXIS2_ERROR_STRUCT_NOT_INITIALIZED,
- /** Could not open the file */
- AXIS2_ERROR_COULD_NOT_OPEN_FILE,
- /** Environment passed is null */
- AXIS2_ERROR_ENVIRONMENT_IS_NULL,
- /** Parent requested, but parent is null */
- AXIS2_ERROR_INVALID_STATE_PARENT_NULL,
- /** Operation accessed has invalid state */
- AXIS2_ERROR_INVALID_STATE_OP,
-
-
-
-
- /* Operation cannot be NULL in MEP client */
- AXIS2_ERROR_OPERATION_CANNOT_BE_NULL_IN_MEP_CLIENT,
+ /*
+ * Group - xml:soap
+ */
/** invalid type passed */
AXIS2_ERROR_INVALID_BASE_TYPE,
- /** om element is expected */
- AXIS2_ERROR_OM_ELEMENT_EXPECTED,
-
+ /** invalid soap namespace uri found */
+ AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI,
+ /** Invalid SOAP version */
+ AXIS2_ERROR_INVALID_SOAP_VERSION,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_INVALID_VALUE_FOUND_IN_MUST_UNDERSTAND,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_MULTIPLE_CODE_ELEMENTS_ENCOUNTERED,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_MULTIPLE_DETAIL_ELEMENTS_ENCOUNTERED,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_MULTIPLE_NODE_ELEMENTS_ENCOUNTERED,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_MULTIPLE_REASON_ELEMENTS_ENCOUNTERED,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_MULTIPLE_ROLE_ELEMENTS_ENCOUNTERED,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_MULTIPLE_SUB_CODE_VALUES_ENCOUNTERED,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_MULTIPLE_VALUE_ENCOUNTERED_IN_CODE_ELEMENT,
/* must understatnd attribute should have values of true or false */
AXIS2_ERROR_MUST_UNDERSTAND_SHOULD_BE_1_0_TRUE_FALSE,
-
- AXIS2_ERROR_INVALID_VALUE_FOUND_IN_MUST_UNDERSTAND,
+ /** om element is expected */
+ AXIS2_ERROR_OM_ELEMENT_EXPECTED,
+ /* processing soap11 fault value element should have only
+ text as its children */
+ AXIS2_ERROR_ONLY_CHARACTERS_ARE_ALLOWED_HERE,
/** only one SOAP fault allowed in SOAP body */
AXIS2_ERROR_ONLY_ONE_SOAP_FAULT_ALLOWED_IN_BODY,
- /** Error in creating the stream for the socket */
- AXIS2_ERROR_SOCKET_STREAM_CREATION,
-
-
-
-
-
-
- AXIS2_ERROR_SOAP_ENVELOPE_MUST_HAVE_BODY_ELEMENT,
-
-
- AXIS2_ERROR_SOAP_MESSAGE_FIRST_ELEMENT_MUST_CONTAIN_LOCAL_NAME,
- /** soap builder encountered multiple headers */
- AXIS2_ERROR_SOAP_BUILDER_MULTIPLE_HEADERS_ENCOUNTERED,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_SOAP11_FAULT_ACTOR_SHOULD_NOT_HAVE_CHILD_ELEMENTS,
+ /** soap builder found a child element other than header or body in envelope
+ element */
+ AXIS2_ERROR_SOAP_BUILDER_ENVELOPE_CAN_HAVE_ONLY_HEADER_AND_BODY,
/** soap builder encounterd body element first and header next */
AXIS2_ERROR_SOAP_BUILDER_HEADER_BODY_WRONG_ORDER,
/** soap builder multiple body elements encounterd */
AXIS2_ERROR_SOAP_BUILDER_MULTIPLE_BODY_ELEMENTS_ENCOUNTERED,
- /** soap builder found a child element other than header or body in envelope
- element */
- AXIS2_ERROR_SOAP_BUILDER_ENVELOPE_CAN_HAVE_ONLY_HEADER_AND_BODY,
-
- /** invalid soap namespace uri found */
- AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI,
- /** soap message does not have an envelope element */
- AXIS2_ERROR_SOAP_MESSAGE_DOES_NOT_CONTAIN_AN_ENVELOPE,
-
- AXIS2_ERROR_TRANSPORT_LEVEL_INFORMATION_DOES_NOT_MATCH_WITH_SOAP,
-
- /* Error in writing the response in response writer */
- AXIS2_ERROR_WRITING_RESPONSE,
-
- AXIS2_ERROR_MULTIPLE_CODE_ELEMENTS_ENCOUNTERED,
-
- AXIS2_ERROR_MULTIPLE_REASON_ELEMENTS_ENCOUNTERED,
-
- AXIS2_ERROR_WRONG_ELEMENT_ORDER_ENCOUNTERED,
-
+ /** soap builder encountered multiple headers */
+ AXIS2_ERROR_SOAP_BUILDER_MULTIPLE_HEADERS_ENCOUNTERED,
+ /*TODO ADDCOMMENT*/
AXIS2_ERROR_SOAP_FAULT_CODE_DOES_NOT_HAVE_A_VALUE,
-
- AXIS2_ERROR_SOAP_FAULT_SUB_CODE_DOES_NOT_HAVE_A_VALUE,
-
- AXIS2_ERROR_MULTIPLE_NODE_ELEMENTS_ENCOUNTERED,
+ /*TODO ADDCOMMENT*/
AXIS2_ERROR_SOAP_FAULT_REASON_ELEMENT_SHOULD_HAVE_A_TEXT,
-
- AXIS2_ERROR_MULTIPLE_ROLE_ELEMENTS_ENCOUNTERED,
-
+ /*TODO ADDCOMMENT*/
AXIS2_ERROR_SOAP_FAULT_ROLE_ELEMENT_SHOULD_HAVE_A_TEXT,
-
- AXIS2_ERROR_MULTIPLE_DETAIL_ELEMENTS_ENCOUNTERED,
-
- AXIS2_ERROR_UNSUPPORTED_ELEMENT_IN_SOAP_FAULT_ELEMENT,
-
- AXIS2_ERROR_MULTIPLE_SUB_CODE_VALUES_ENCOUNTERED,
-
- AXIS2_ERROR_MULTIPLE_VALUE_ENCOUNTERED_IN_CODE_ELEMENT,
-
+ /*TODO ADDCOMMENT*/
AXIS2_ERROR_SOAP_FAULT_VALUE_SHOULD_BE_PRESENT_BEFORE_SUB_CODE,
-
- AXIS2_ERROR_THIS_LOCALNAME_NOT_SUPPORTED_INSIDE_THE_CODE_ELEMENT,
-
+ /** soap message does not have an envelope element */
+ AXIS2_ERROR_SOAP_MESSAGE_DOES_NOT_CONTAIN_AN_ENVELOPE,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_SOAP_MESSAGE_FIRST_ELEMENT_MUST_CONTAIN_LOCAL_NAME,
+ /*TODO ADDCOMMENT*/
AXIS2_ERROR_THIS_LOCALNAME_IS_NOT_SUPPORTED_INSIDE_THE_REASON_ELEMENT,
-
+ /*TODO ADDCOMMENT*/
AXIS2_ERROR_THIS_LOCALNAME_IS_NOT_SUPPORTED_INSIDE_THE_SUB_CODE_ELEMENT,
-
- AXIS2_ERROR_ROLE_ELEMENT_SHOULD_HAVE_A_TEXT,
-
- AXIS2_ERROR_SOAP11_FAULT_ACTOR_SHOULD_NOT_HAVE_CHILD_ELEMENTS,
-
- /* processing soap11 fault value element should have only
- text as its children */
- AXIS2_ERROR_ONLY_CHARACTERS_ARE_ALLOWED_HERE,
-
- AXIS2_ERROR_FILE_NAME_NOT_SET,
- AXIS2_ERROR_INVALID_STATE_DLL_DESC,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_THIS_LOCALNAME_NOT_SUPPORTED_INSIDE_THE_CODE_ELEMENT,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_TRANSPORT_LEVEL_INFORMATION_DOES_NOT_MATCH_WITH_SOAP,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_UNSUPPORTED_ELEMENT_IN_SOAP_FAULT_ELEMENT,
+ /*TODO ADDCOMMENT*/
+ AXIS2_ERROR_WRONG_ELEMENT_ORDER_ENCOUNTERED,
+ /*
+ * Group - services
+ */
/** Invalid XML format in request */
AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST,
/** Input OM node NULL, Probably error in SOAP request */
AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL,
/** Invalid parameters for service operation in SOAP request */
AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST,
- /* Flow type of PhaseOrder element cannot be null */
- AXIS2_ERROR_FLOW_TYPE_CANNOT_BE_NULL,
+
/** The following has to be the last error value all the time.
All other error codes should appear above this.
AXIS2_ERROR_LAST is used to track the number of error codes present
Modified: webservices/axis2/trunk/c/modules/util/dir_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/dir_handler.c?rev=399695&r1=399694&r2=399695&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/dir_handler.c (original)
+++ webservices/axis2/trunk/c/modules/util/dir_handler.c Thu May 4 06:07:36 2006
@@ -360,7 +360,6 @@
int dir_select(struct dirent *entry)
{
- axis2_char_t *ptr;
axis2_char_t *rindex(const axis2_char_t *s, int c);
if ((strcmp(entry->d_name, ".")== 0) ||
Modified: webservices/axis2/trunk/c/modules/util/error.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/error.c?rev=399695&r1=399694&r2=399695&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/error.c (original)
+++ webservices/axis2/trunk/c/modules/util/error.c Thu May 4 06:07:36 2006
@@ -44,10 +44,6 @@
axis2_error_messages[AXIS2_ERROR_NO_MEMORY] = "Out of memory";
axis2_error_messages[AXIS2_ERROR_INVALID_NULL_PARAM] =
"NULL paramater was passed when a non NULL parameter was expected";
- axis2_error_messages[AXIS2_ERROR_INVALID_ITERATOR_STATE] =
- "Iterator state invalid e.g. next called before calling first";
- axis2_error_messages[AXIS2_ERROR_INVALID_NODE_TYPE] =
- "Node type is different from what is expected";
axis2_error_messages[AXIS2_ERROR_XML_READER_ELEMENT_NULL] =
"axis2_xml_reader returned NULL element";
axis2_error_messages[AXIS2_ERROR_XML_READER_VALUE_NULL] =
@@ -56,32 +52,22 @@
"Builder done with pulling. Cannot pull any more";
axis2_error_messages[AXIS2_ERROR_INVALID_BUILDER_STATE_LAST_NODE_NULL] =
"Bulder's last node is NULL when it is not supposed to be NULL";
- axis2_error_messages[AXIS2_ERROR_BUILDER_NOT_ASSOCIATED_WITH_DOCUMENT] =
- "A document not associated with builder";
axis2_error_messages[AXIS2_ERROR_INVALID_BUILDER_STATE_CANNOT_DISCARD] =
"Discard faile because the builder state is invalid";
axis2_error_messages[AXIS2_ERROR_INVALID_DOCUMENT_STATE_ROOT_NULL] =
"Document root is NULL] = when it is not supposed to be NULL";
axis2_error_messages[AXIS2_ERROR_INVALID_DOCUMENT_STATE_UNDEFINED_NAMESPACE] =
"Undefined namespace used";
- axis2_error_messages[AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED] =
- "Trying to release unallocated memory";
- axis2_error_messages[AXIS2_ERROR_STRUCT_NOT_INITIALIZED] =
- "Struct is not properly initialized";
axis2_error_messages[AXIS2_ERROR_COULD_NOT_OPEN_FILE] =
"Could not open the file";
axis2_error_messages[AXIS2_ERROR_ENVIRONMENT_IS_NULL] =
"Environment passed is null";
- axis2_error_messages[AXIS2_ERROR_INVALID_STATE_PARENT_NULL] =
- "Parent requested, but parent is null";
axis2_error_messages[AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE] =
"Parameter locked, Cannot override";
axis2_error_messages[AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER] =
"Parameter container not set";
axis2_error_messages[AXIS2_ERROR_INVALID_STATE_PARAM] =
"Parameter not set";
- axis2_error_messages[AXIS2_ERROR_INVALID_STATE_OP] =
- "Operation accessed has invalid state";
axis2_error_messages[AXIS2_ERROR_INVALID_STATE_SVC] =
"Service accessed has invalid state";
axis2_error_messages[AXIS2_ERROR_INVALID_STATE_WSDL_SVC] =
@@ -196,8 +182,6 @@
"AXIS2_ERROR_HANDLER_CREATION_FAILED";
axis2_error_messages[AXIS2_ERROR_MSG_RECV_CREATION_FAILED] =
"AXIS2_ERROR_MSG_RECV_CREATION_FAILED";
- axis2_error_messages[AXIS2_ERROR_OPERATION_CANNOT_BE_NULL_IN_MEP_CLIENT] =
- "Operation cannot be NULL in MEP client";
axis2_error_messages[AXIS2_ERROR_MEP_CANNOT_BE_NULL_IN_MEP_CLIENT] =
"MEP cannot be NULL in MEP client";
axis2_error_messages[AXIS2_ERROR_MEP_MISMATCH_IN_MEP_CLIENT] =
@@ -236,8 +220,6 @@
"AXIS2_ERROR_INVALID_VALUE_FOUND_IN_MUST_UNDERSTAND";
axis2_error_messages[AXIS2_ERROR_ONLY_ONE_SOAP_FAULT_ALLOWED_IN_BODY] =
"only one SOAP fault allowed in SOAP body";
- axis2_error_messages[AXIS2_ERROR_SOCKET_STREAM_CREATION] =
- "Error in creating the stream for the socket";
axis2_error_messages[AXIS2_ERROR_INVALID_SOCKET] =
"Trying to do operation on closed/not opened socket";
axis2_error_messages[AXIS2_ERROR_INVALID_FD] =
@@ -294,8 +276,6 @@
"AXIS2_ERROR_INVALID_MODULE";
axis2_error_messages[AXIS2_ERROR_MODULE_CREATION_FAILED] =
"AXIS2_ERROR_MODULE_CREATION_FAILED";
- axis2_error_messages[AXIS2_ERROR_SOAP_ENVELOPE_MUST_HAVE_BODY_ELEMENT] =
- "AXIS2_ERROR_SOAP_ENVELOPE_MUST_HAVE_BODY_ELEMENT";
axis2_error_messages[AXIS2_ERROR_INVALID_MODULE_CONF] =
"AXIS2_ERROR_INVALID_MODULE_CONF";
axis2_error_messages[AXIS2_ERROR_SOAP_MESSAGE_FIRST_ELEMENT_MUST_CONTAIN_LOCAL_NAME] =
@@ -326,8 +306,6 @@
"AXIS2_ERROR_WRONG_ELEMENT_ORDER_ENCOUNTERED";
axis2_error_messages[AXIS2_ERROR_SOAP_FAULT_CODE_DOES_NOT_HAVE_A_VALUE] =
"AXIS2_ERROR_SOAP_FAULT_CODE_DOES_NOT_HAVE_A_VALUE";
- axis2_error_messages[AXIS2_ERROR_SOAP_FAULT_SUB_CODE_DOES_NOT_HAVE_A_VALUE] =
- "AXIS2_ERROR_SOAP_FAULT_SUB_CODE_DOES_NOT_HAVE_A_VALUE";
axis2_error_messages[AXIS2_ERROR_MULTIPLE_NODE_ELEMENTS_ENCOUNTERED] =
"AXIS2_ERROR_MULTIPLE_NODE_ELEMENTS_ENCOUNTERED";
axis2_error_messages[AXIS2_ERROR_SOAP_FAULT_REASON_ELEMENT_SHOULD_HAVE_A_TEXT] =
@@ -352,8 +330,6 @@
"AXIS2_ERROR_THIS_LOCALNAME_IS_NOT_SUPPORTED_INSIDE_THE_REASON_ELEMENT";
axis2_error_messages[AXIS2_ERROR_THIS_LOCALNAME_IS_NOT_SUPPORTED_INSIDE_THE_SUB_CODE_ELEMENT] =
"AXIS2_ERROR_THIS_LOCALNAME_IS_NOT_SUPPORTED_INSIDE_THE_SUB_CODE_ELEMENT";
- axis2_error_messages[AXIS2_ERROR_ROLE_ELEMENT_SHOULD_HAVE_A_TEXT] =
- "AXIS2_ERROR_ROLE_ELEMENT_SHOULD_HAVE_A_TEXT";
axis2_error_messages[AXIS2_ERROR_NULL_OM_OUTPUT] =
"OM output is NULL";
axis2_error_messages[AXIS2_ERROR_NULL_STREAM_IN_RESPONSE_BODY] =
@@ -401,8 +377,6 @@
"Input stream is NULL in msg_ctx";
axis2_error_messages[AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM] =
"NULL stream in the http chunked stream";
- axis2_error_messages[AXIS2_ERROR_FLOW_TYPE_CANNOT_BE_NULL] =
- "Flow type of PhaseOrder element cannot be null";
axis2_error_messages[AXIS2_ERROR_DATA_ELEMENT_IS_NULL] =
"Data element of the OM Node is null";
axis2_error_messages[AXIS2_ERROR_WSDL_BINDING_NAME_IS_REQUIRED] =
Modified: webservices/axis2/trunk/c/modules/util/stream.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/stream.c?rev=399695&r1=399694&r2=399695&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/stream.c (original)
+++ webservices/axis2/trunk/c/modules/util/stream.c Thu May 4 06:07:36 2006
@@ -584,7 +584,6 @@
void *buffer, size_t count)
{
int len = 0;
- axis2_char_t *temp = NULL;
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
@@ -624,7 +623,6 @@
const void *buffer, size_t count)
{
int len = 0;
- axis2_char_t *temp = NULL;
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c?rev=399695&r1=399694&r2=399695&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c Thu May 4 06:07:36 2006
@@ -31,7 +31,7 @@
axis2_om_node_t *ret_node = NULL;
/* Set up the envioronment */
- env = axis2_env_create_all("echo_blocking.log", AXIS2_LOG_LEVEL_TRACE);
+ env = axis2_env_create_all("echo_rest.log", AXIS2_LOG_LEVEL_TRACE);
/* Set end point reference of echo service */
address = "http://localhost:9090/axis2/services/echo";