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 di...@apache.org on 2007/03/19 20:13:29 UTC
svn commit: r520049 [2/3] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/soap/ axiom/test/soap/
modules/core/clientapi/ modules/core/context/ modules/core/engine/
modules/core/receivers/ modules/core/transport/http/sen...
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c Mon Mar 19 12:13:26 2007
@@ -45,8 +45,8 @@
};
static axis2_status_t
check_and_set_soap_version(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env,
- axiom_namespace_t *ns);
+ const axis2_env_t *env,
+ axiom_namespace_t *ns);
AXIS2_EXTERN axiom_soap_envelope_t* AXIS2_CALL
axiom_soap_envelope_create_null(const axis2_env_t *env)
@@ -54,8 +54,8 @@
axiom_soap_envelope_t *soap_envelope = NULL;
AXIS2_ENV_CHECK(env, NULL);
soap_envelope = (axiom_soap_envelope_t*)AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_soap_envelope_t));
+ env->allocator,
+ sizeof(axiom_soap_envelope_t));
if (!soap_envelope)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -73,7 +73,7 @@
AXIS2_EXTERN axiom_soap_envelope_t* AXIS2_CALL
axiom_soap_envelope_create(const axis2_env_t *env,
- axiom_namespace_t *ns)
+ axiom_namespace_t *ns)
{
axiom_soap_envelope_t *soap_envelope = NULL;
axiom_element_t *ele = NULL;
@@ -93,8 +93,8 @@
}
ele = axiom_element_create(env, NULL,
- AXIOM_SOAP_ENVELOPE_LOCAL_NAME, ns,
- &(soap_envelope->om_ele_node));
+ AXIOM_SOAP_ENVELOPE_LOCAL_NAME, ns,
+ &(soap_envelope->om_ele_node));
if (!ele)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -106,8 +106,8 @@
AXIS2_EXTERN axiom_soap_envelope_t* AXIS2_CALL
axiom_soap_envelope_create_with_soap_version_prefix(const axis2_env_t *env,
- int soap_version,
- const axis2_char_t *prefix)
+ int soap_version,
+ const axis2_char_t *prefix)
{
axiom_namespace_t *ns = NULL;
const axis2_char_t *ns_prefix = NULL;
@@ -143,52 +143,46 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_envelope_free(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (soap_envelope->header)
{
- AXIOM_SOAP_HEADER_FREE(soap_envelope->header, env);
- soap_envelope->header = NULL;
+ axiom_soap_header_free(soap_envelope->header, env);
}
if (soap_envelope->body)
{
- AXIOM_SOAP_BODY_FREE(soap_envelope->body, env);
- soap_envelope->body = NULL;
+ axiom_soap_body_free(soap_envelope->body, env);
}
if (soap_envelope->om_ele_node)
{
if (soap_envelope->soap_builder)
{
- AXIOM_SOAP_BUILDER_FREE(soap_envelope->soap_builder, env);
- soap_envelope->soap_builder = NULL;
+ axiom_soap_builder_free(soap_envelope->soap_builder, env);
soap_envelope->om_ele_node = NULL;
}
else
{
AXIOM_NODE_FREE_TREE(soap_envelope->om_ele_node, env);
- soap_envelope->om_ele_node = NULL;
}
}
AXIS2_FREE(env->allocator, soap_envelope);
- soap_envelope = NULL;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
axiom_soap_envelope_get_base_node(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return soap_envelope->om_ele_node;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_envelope_set_base_node(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env,
- axiom_node_t *node)
+ const axis2_env_t *env,
+ axiom_node_t *node)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
@@ -204,17 +198,16 @@
AXIS2_EXTERN int AXIS2_CALL
axiom_soap_envelope_get_soap_version(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return soap_envelope->soap_version;
}
/** this is an internal function */
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_envelope_set_soap_version_internal(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env,
- int soap_version)
+ const axis2_env_t *env,
+ int soap_version)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
soap_envelope->soap_version = soap_version;
@@ -224,10 +217,9 @@
AXIS2_EXTERN axiom_soap_header_t* AXIS2_CALL
axiom_soap_envelope_get_header(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
int status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, NULL);
if (soap_envelope->header)
{
@@ -238,7 +230,7 @@
while (!(soap_envelope->header) && !AXIOM_NODE_IS_COMPLETE(
soap_envelope->om_ele_node, env))
{
- status = AXIOM_SOAP_BUILDER_NEXT(soap_envelope->soap_builder, env);
+ status = axiom_soap_builder_next(soap_envelope->soap_builder, env);
if (status == AXIS2_FAILURE)
break;
}
@@ -249,9 +241,9 @@
AXIS2_EXTERN axiom_soap_header_block_t* AXIS2_CALL
axiom_soap_envelope_add_header(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env,
- axis2_char_t *namespace_uri,
- axis2_char_t *name)
+ const axis2_env_t *env,
+ axis2_char_t *namespace_uri,
+ axis2_char_t *name)
{
axiom_namespace_t *ns = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -270,10 +262,9 @@
AXIS2_EXTERN axiom_soap_body_t* AXIS2_CALL
axiom_soap_envelope_get_body(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
int status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, NULL);
if (soap_envelope->body)
{
@@ -283,7 +274,7 @@
{
while (!(soap_envelope->body) && !AXIOM_NODE_IS_COMPLETE(soap_envelope->om_ele_node, env))
{
- status = AXIOM_SOAP_BUILDER_NEXT(soap_envelope->soap_builder, env);
+ status = axiom_soap_builder_next(soap_envelope->soap_builder, env);
if (status == AXIS2_FAILURE)
{
return NULL;
@@ -295,9 +286,9 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_envelope_serialize(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env,
- axiom_output_t *om_output,
- axis2_bool_t cache)
+ const axis2_env_t *env,
+ axiom_output_t *om_output,
+ axis2_bool_t cache)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_envelope, AXIS2_FAILURE);
@@ -312,20 +303,20 @@
if (soap_envelope->soap_version == AXIOM_SOAP11)
{
axiom_soap_body_t *soap_body = NULL;
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+ soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
if (soap_body)
{
axiom_soap_fault_t *soap_fault = NULL;
- if (AXIOM_SOAP_BODY_HAS_FAULT(soap_body, env))
+ if (axiom_soap_body_has_fault(soap_body, env))
{
- soap_fault = AXIOM_SOAP_BODY_GET_FAULT(soap_body, env);
+ soap_fault = axiom_soap_body_get_fault(soap_body, env);
if (soap_fault)
{
axiom_soap_fault_code_t *fault_code = NULL;
axiom_soap_fault_reason_t *fault_reason = NULL;
axiom_soap_fault_detail_t *fault_detail = NULL;
axiom_soap_fault_role_t *fault_role = NULL;
- fault_code = AXIOM_SOAP_FAULT_GET_CODE(soap_fault, env);
+ fault_code = axiom_soap_fault_get_code(soap_fault, env);
if (fault_code)
{
axiom_node_t *fault_code_om_node = NULL;
@@ -335,26 +326,26 @@
axiom_soap_fault_value_t *fault_value = NULL;
axis2_char_t *text = NULL;
- fault_code_om_node = AXIOM_SOAP_FAULT_CODE_GET_BASE_NODE(fault_code, env);
+ fault_code_om_node = axiom_soap_fault_code_get_base_node(fault_code, env);
if (fault_code_om_node)
{
fault_code_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_code_om_node, env);
+ AXIOM_NODE_GET_DATA_ELEMENT(fault_code_om_node, env);
if (fault_code_om_ele)
{
axiom_element_set_localname(fault_code_om_ele,
- env, AXIOM_SOAP11_SOAP_FAULT_CODE_LOCAL_NAME);
+ env, AXIOM_SOAP11_SOAP_FAULT_CODE_LOCAL_NAME);
- fault_value = AXIOM_SOAP_FAULT_CODE_GET_VALUE(fault_code, env);
+ fault_value = axiom_soap_fault_code_get_value(fault_code, env);
if (fault_value)
{
- fault_value_om_node = AXIOM_SOAP_FAULT_VALUE_GET_BASE_NODE(fault_value, env);
+ fault_value_om_node = axiom_soap_fault_value_get_base_node(fault_value, env);
if (fault_value_om_node)
{
fault_value_om_node = AXIOM_NODE_DETACH(fault_value_om_node, env);
fault_value_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_value_om_node, env);
+ AXIOM_NODE_GET_DATA_ELEMENT(fault_value_om_node, env);
if (fault_value_om_ele)
{
text = axiom_element_get_text(fault_value_om_ele, env, fault_value_om_node);
@@ -370,7 +361,7 @@
}
}
}
- fault_reason = AXIOM_SOAP_FAULT_GET_REASON(soap_fault, env);
+ fault_reason = axiom_soap_fault_get_reason(soap_fault, env);
if (fault_reason)
{
axiom_node_t *fault_reason_om_node = NULL;
@@ -380,35 +371,35 @@
axiom_soap_fault_text_t *fault_text = NULL;
axis2_char_t *text = NULL;
- fault_reason_om_node = AXIOM_SOAP_FAULT_REASON_GET_BASE_NODE(fault_reason, env);
+ fault_reason_om_node = axiom_soap_fault_reason_get_base_node(fault_reason, env);
if (fault_reason_om_node)
{
fault_reason_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_reason_om_node, env);
+ AXIOM_NODE_GET_DATA_ELEMENT(fault_reason_om_node, env);
if (fault_reason_om_ele)
{
axiom_element_set_localname(fault_reason_om_ele,
- env, AXIOM_SOAP11_SOAP_FAULT_STRING_LOCAL_NAME);
+ env, AXIOM_SOAP11_SOAP_FAULT_STRING_LOCAL_NAME);
fault_text =
- AXIOM_SOAP_FAULT_REASON_GET_FIRST_SOAP_FAULT_TEXT(fault_reason, env);
+ axiom_soap_fault_reason_get_first_soap_fault_text(fault_reason, env);
if (fault_text)
{
- fault_text_om_node = AXIOM_SOAP_FAULT_TEXT_GET_BASE_NODE(fault_text, env);
+ fault_text_om_node = axiom_soap_fault_text_get_base_node(fault_text, env);
if (fault_text_om_node)
{
fault_text_om_node = AXIOM_NODE_DETACH(fault_text_om_node, env);
fault_text_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_text_om_node, env);
+ AXIOM_NODE_GET_DATA_ELEMENT(fault_text_om_node, env);
if (fault_text_om_ele)
{
text = axiom_element_get_text(fault_text_om_ele, env, fault_text_om_node);
if (text)
{
axiom_element_set_text(fault_reason_om_ele,
- env, text, fault_reason_om_node);
+ env, text, fault_reason_om_node);
}
}
AXIOM_NODE_FREE_TREE(fault_text_om_node, env);
@@ -418,39 +409,39 @@
}
}
- fault_role = AXIOM_SOAP_FAULT_GET_ROLE(soap_fault, env);
+ fault_role = axiom_soap_fault_get_role(soap_fault, env);
if (fault_role)
{
axiom_node_t *fault_role_om_node = NULL;
axiom_element_t *fault_role_om_ele = NULL;
- fault_role_om_node = AXIOM_SOAP_FAULT_ROLE_GET_BASE_NODE(fault_role, env);
+ fault_role_om_node = axiom_soap_fault_role_get_base_node(fault_role, env);
if (fault_role_om_node)
{
fault_role_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_role_om_node, env);
+ AXIOM_NODE_GET_DATA_ELEMENT(fault_role_om_node, env);
if (fault_role_om_ele)
{
axiom_element_set_localname(fault_role_om_ele, env,
- AXIOM_SOAP11_SOAP_FAULT_ACTOR_LOCAL_NAME);
+ AXIOM_SOAP11_SOAP_FAULT_ACTOR_LOCAL_NAME);
}
}
}
- fault_detail = AXIOM_SOAP_FAULT_GET_DETAIL(soap_fault, env);
+ fault_detail = axiom_soap_fault_get_detail(soap_fault, env);
if (fault_detail)
{
axiom_node_t *fault_detail_om_node = NULL;
axiom_element_t *fault_detail_om_ele = NULL;
- fault_detail_om_node = AXIOM_SOAP_FAULT_DETAIL_GET_BASE_NODE(fault_detail, env);
+ fault_detail_om_node = axiom_soap_fault_detail_get_base_node(fault_detail, env);
if (fault_detail_om_node)
{
fault_detail_om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_detail_om_node, env);
+ AXIOM_NODE_GET_DATA_ELEMENT(fault_detail_om_node, env);
if (fault_detail_om_ele)
{
axiom_element_set_localname(fault_detail_om_ele,
- env, AXIOM_SOAP11_SOAP_FAULT_DETAIL_LOCAL_NAME);
+ env, AXIOM_SOAP11_SOAP_FAULT_DETAIL_LOCAL_NAME);
}
}
}
@@ -468,8 +459,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_envelope_set_body(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env,
- axiom_soap_body_t *body)
+ const axis2_env_t *env,
+ axiom_soap_body_t *body)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -480,14 +471,14 @@
else
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "trying to set a soap bedy to soap_envelope when a soap body alrady exists");
+ "trying to set a soap bedy to soap_envelope when a soap body alrady exists");
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL axiom_soap_envelope_set_header(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env, axiom_soap_header_t *header)
+ const axis2_env_t *env, axiom_soap_header_t *header)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -498,7 +489,7 @@
else
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- " trying to set a soap header to soap_envelope when a soap header alrady exists");
+ " trying to set a soap header to soap_envelope when a soap header alrady exists");
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -506,7 +497,7 @@
AXIS2_EXTERN axiom_namespace_t* AXIS2_CALL
axiom_soap_envelope_get_namespace(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -527,8 +518,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_envelope_set_builder(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env,
- axiom_soap_builder_t *soap_builder)
+ const axis2_env_t *env,
+ axiom_soap_builder_t *soap_builder)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_builder, AXIS2_FAILURE);
@@ -538,7 +529,7 @@
AXIS2_EXTERN axiom_soap_envelope_t * AXIS2_CALL
axiom_soap_envelope_create_default_soap_envelope(const axis2_env_t *env,
- int soap_version)
+ int soap_version)
{
axiom_soap_envelope_t *soap_envelope = NULL;
axiom_soap_header_t *soap_header = NULL;
@@ -548,8 +539,8 @@
if (soap_version == AXIOM_SOAP11)
{
om_ns = axiom_namespace_create(env,
- AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI,
- AXIOM_SOAP_DEFAULT_NAMESPACE_PREFIX);
+ AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI,
+ AXIOM_SOAP_DEFAULT_NAMESPACE_PREFIX);
if (!om_ns)
return NULL;
soap_envelope = axiom_soap_envelope_create(env, om_ns);
@@ -563,8 +554,8 @@
else if (soap_version == AXIOM_SOAP12)
{
om_ns = axiom_namespace_create(env,
- AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI,
- AXIOM_SOAP_DEFAULT_NAMESPACE_PREFIX);
+ AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI,
+ AXIOM_SOAP_DEFAULT_NAMESPACE_PREFIX);
if (!om_ns)
return NULL;
soap_envelope = axiom_soap_envelope_create(env, om_ns);
@@ -577,17 +568,17 @@
}
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_SOAP_VERSION, AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_SOAP_VERSION, AXIS2_FAILURE);
return NULL;
}
AXIS2_EXTERN axiom_soap_envelope_t * AXIS2_CALL
axiom_soap_envelope_create_default_soap_fault_envelope(const axis2_env_t *env,
- const axis2_char_t *code_value,
- const axis2_char_t *reason_text,
- const int soap_version,
- axis2_array_list_t *sub_codes,
- axiom_node_t *detail_node)
+ const axis2_char_t *code_value,
+ const axis2_char_t *reason_text,
+ const int soap_version,
+ axis2_array_list_t *sub_codes,
+ axiom_node_t *detail_node)
{
axiom_soap_envelope_t *soap_envelope = NULL;
axiom_soap_body_t *soap_body = NULL;
@@ -597,7 +588,7 @@
if (AXIOM_SOAP11 != soap_version && AXIOM_SOAP12 != soap_version)
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_SOAP_VERSION, AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_SOAP_VERSION, AXIS2_FAILURE);
return NULL;
}
@@ -607,17 +598,17 @@
return NULL;
}
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+ soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
if (!soap_body)
{
- AXIOM_SOAP_ENVELOPE_FREE(soap_envelope, env);
+ axiom_soap_envelope_free(soap_envelope, env);
return NULL;
}
fault = axiom_soap_fault_create_default_fault(env, soap_body,
- code_value, reason_text, soap_version);
+ code_value, reason_text, soap_version);
if (!fault)
{
- AXIOM_SOAP_ENVELOPE_FREE(soap_envelope, env);
+ axiom_soap_envelope_free(soap_envelope, env);
return NULL;
}
@@ -625,7 +616,7 @@
{
int i = 0;
axiom_soap_fault_code_t *fault_code = NULL;
- fault_code = AXIOM_SOAP_FAULT_GET_CODE(fault, env);
+ fault_code = axiom_soap_fault_get_code(fault, env);
if (fault_code)
{
for (i = 0; i < axis2_array_list_size(sub_codes, env); i++)
@@ -645,7 +636,7 @@
axiom_soap_fault_detail_create_with_parent(env, fault);
if (detail)
{
- AXIOM_SOAP_FAULT_DETAIL_ADD_DETAIL_ENTRY(detail, env, detail_node);
+ axiom_soap_fault_detail_add_detail_entry(detail, env, detail_node);
}
}
@@ -655,8 +646,8 @@
static axis2_status_t
check_and_set_soap_version(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env,
- axiom_namespace_t *ns)
+ const axis2_env_t *env,
+ axiom_namespace_t *ns)
{
axis2_char_t *uri = NULL;
if (!soap_envelope)
@@ -681,15 +672,15 @@
else
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI, AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI, AXIS2_FAILURE);
}
return AXIS2_FAILURE;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_envelope_set_soap_version(axiom_soap_envelope_t *soap_envelope,
- const axis2_env_t *env,
- int soap_version)
+ const axis2_env_t *env,
+ int soap_version)
{
axiom_element_t *env_ele = NULL;
axiom_namespace_t *env_ns = NULL;
@@ -711,8 +702,8 @@
}
env_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(soap_envelope->om_ele_node,
- env);
+ AXIOM_NODE_GET_DATA_ELEMENT(soap_envelope->om_ele_node,
+ env);
if (!env_ele)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c Mon Mar 19 12:13:26 2007
@@ -94,14 +94,14 @@
if (!soap_fault)
return NULL;
- parent_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
+ parent_node = axiom_soap_body_get_base_node(body, env);
if (!parent_node)
{
AXIS2_FREE(env->allocator, soap_fault);
return NULL;
}
soap_fault->soap_version =
- AXIOM_SOAP_BODY_GET_SOAP_VERSION(body, env);
+ axiom_soap_body_get_soap_version(body, env);
parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
parent_node, env);
@@ -160,27 +160,27 @@
if (soap_fault->fcode)
{
- AXIOM_SOAP_FAULT_CODE_FREE(soap_fault->fcode, env);
+ axiom_soap_fault_code_free(soap_fault->fcode, env);
soap_fault->fcode = NULL;
}
if (soap_fault->fdetail)
{
- AXIOM_SOAP_FAULT_DETAIL_FREE(soap_fault->fdetail, env);
+ axiom_soap_fault_detail_free(soap_fault->fdetail, env);
soap_fault->fdetail = NULL;
}
if (soap_fault->fnode)
{
- AXIOM_SOAP_FAULT_NODE_FREE(soap_fault->fnode, env);
+ axiom_soap_fault_node_free(soap_fault->fnode, env);
soap_fault->fnode = NULL;
}
if (soap_fault->freason)
{
- AXIOM_SOAP_FAULT_REASON_FREE(soap_fault->freason, env);
+ axiom_soap_fault_reason_free(soap_fault->freason, env);
soap_fault->freason = NULL;
}
if (soap_fault->frole)
{
- AXIOM_SOAP_FAULT_ROLE_FREE(soap_fault->frole, env);
+ axiom_soap_fault_role_free(soap_fault->frole, env);
soap_fault->frole = NULL;
}
AXIS2_FREE(env->allocator, soap_fault);
@@ -223,7 +223,7 @@
{
while (!(soap_fault->fcode) && !(AXIOM_NODE_IS_COMPLETE(soap_fault->om_ele_node, env)))
{
- status = AXIOM_SOAP_BUILDER_NEXT(soap_fault->soap_builder, env);
+ status = axiom_soap_builder_next(soap_fault->soap_builder, env);
if (status == AXIS2_FAILURE)
break;
}
@@ -265,7 +265,7 @@
{
while (!(soap_fault->freason) && !(AXIOM_NODE_IS_COMPLETE(soap_fault->om_ele_node, env)))
{
- status = AXIOM_SOAP_BUILDER_NEXT(soap_fault->soap_builder, env);
+ status = axiom_soap_builder_next(soap_fault->soap_builder, env);
if (status == AXIS2_FAILURE)
break;
}
@@ -308,7 +308,7 @@
{
while (!(soap_fault->fnode) && !(AXIOM_NODE_IS_COMPLETE(soap_fault->om_ele_node, env)))
{
- status = AXIOM_SOAP_BUILDER_NEXT(soap_fault->soap_builder, env);
+ status = axiom_soap_builder_next(soap_fault->soap_builder, env);
if (status == AXIS2_FAILURE)
break;
}
@@ -352,7 +352,7 @@
{
while (!(soap_fault->frole) && !(AXIOM_NODE_IS_COMPLETE(soap_fault->om_ele_node, env)))
{
- status = AXIOM_SOAP_BUILDER_NEXT(soap_fault->soap_builder, env);
+ status = axiom_soap_builder_next(soap_fault->soap_builder, env);
if (status == AXIS2_FAILURE)
break;
}
@@ -396,7 +396,7 @@
{
while (!(soap_fault->fdetail) && !(AXIOM_NODE_IS_COMPLETE(soap_fault->om_ele_node, env)))
{
- status = AXIOM_SOAP_BUILDER_NEXT(soap_fault->soap_builder, env);
+ status = axiom_soap_builder_next(soap_fault->soap_builder, env);
if (status == AXIS2_FAILURE)
break;
}
@@ -447,7 +447,7 @@
detail = axiom_soap_fault_get_detail(soap_fault, env);
if (!detail)
return NULL;
- detail_node = AXIOM_SOAP_FAULT_DETAIL_GET_BASE_NODE(detail, env);
+ detail_node = axiom_soap_fault_detail_get_base_node(detail, env);
if (detail_node)
{
detail_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
@@ -505,7 +505,7 @@
axiom_element_set_text(fault_detail_ele,
env, exception, fault_detail_entry_node);
/** now add this om element as a child of soap soap_fault detail om element node */
- return AXIOM_SOAP_FAULT_DETAIL_ADD_DETAIL_ENTRY(detail, env, fault_detail_entry_node);
+ return axiom_soap_fault_detail_add_detail_entry(detail, env, fault_detail_entry_node);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -547,24 +547,24 @@
soap_fault = axiom_soap_fault_create_with_parent(env, parent);
if (!soap_fault)
return NULL;
- fault_node = AXIOM_SOAP_FAULT_GET_BASE_NODE(soap_fault, env);
+ fault_node = axiom_soap_fault_get_base_node(soap_fault, env);
if (!fault_node)
{
- AXIOM_SOAP_FAULT_FREE(soap_fault, env);
+ axiom_soap_fault_free(soap_fault, env);
return NULL;
}
soap_fault_code = axiom_soap_fault_code_create_with_parent(env, soap_fault);
if (!soap_fault_code)
{
- AXIOM_SOAP_FAULT_FREE(soap_fault, env);
+ axiom_soap_fault_free(soap_fault, env);
AXIOM_NODE_FREE_TREE(fault_node, env);
return NULL;
}
soap_fault_reason = axiom_soap_fault_reason_create_with_parent(env, soap_fault);
if (!soap_fault_reason)
{
- AXIOM_SOAP_FAULT_FREE(soap_fault, env);
+ axiom_soap_fault_free(soap_fault, env);
AXIOM_NODE_FREE_TREE(fault_node, env);
return NULL;
}
@@ -572,12 +572,12 @@
soap_fault_value = axiom_soap_fault_value_create_with_code(env, soap_fault_code);
if (!soap_fault_value)
{
- AXIOM_SOAP_FAULT_FREE(soap_fault, env);
+ axiom_soap_fault_free(soap_fault, env);
AXIOM_NODE_FREE_TREE(fault_node, env);
return NULL;
}
- value_node = AXIOM_SOAP_FAULT_VALUE_GET_BASE_NODE(soap_fault_value, env);
+ value_node = axiom_soap_fault_value_get_base_node(soap_fault_value, env);
if (!value_node)
{
return NULL;
@@ -589,13 +589,13 @@
soap_fault_text = axiom_soap_fault_text_create_with_parent(env, soap_fault_reason);
if (!soap_fault_text)
{
- AXIOM_SOAP_FAULT_FREE(soap_fault, env);
+ axiom_soap_fault_free(soap_fault, env);
AXIOM_NODE_FREE_TREE(fault_node, env);
return NULL;
}
- AXIOM_SOAP_FAULT_TEXT_SET_LANG(soap_fault_text, env, "en");
+ axiom_soap_fault_text_set_lang(soap_fault_text, env, "en");
- text_node = AXIOM_SOAP_FAULT_TEXT_GET_BASE_NODE(soap_fault_text, env);
+ text_node = axiom_soap_fault_text_get_base_node(soap_fault_text, env);
if (!text_node)
{
return NULL;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c Mon Mar 19 12:13:26 2007
@@ -41,8 +41,9 @@
axiom_soap_fault_code_t *fault_code = NULL;
AXIS2_ENV_CHECK(env, NULL);
fault_code = (axiom_soap_fault_code_t*) AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_soap_fault_code_t));
+ env->allocator,
+ sizeof(axiom_soap_fault_code_t));
+
if (!fault_code)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -60,7 +61,7 @@
AXIS2_EXTERN axiom_soap_fault_code_t * AXIS2_CALL
axiom_soap_fault_code_create_with_parent(const axis2_env_t *env,
- axiom_soap_fault_t *fault)
+ axiom_soap_fault_t *fault)
{
axiom_soap_fault_code_t *fault_code = NULL;
axiom_element_t *this_ele = NULL;
@@ -76,20 +77,22 @@
fault_code = axiom_soap_fault_code_create(env);
if (!fault_code)
+ {
return NULL;
+ }
- parent_node = AXIOM_SOAP_FAULT_GET_BASE_NODE(fault, env);
+ parent_node = axiom_soap_fault_get_base_node(fault, env);
if (!parent_node)
{
- AXIOM_SOAP_FAULT_CODE_FREE(fault_code, env);
+ axiom_soap_fault_code_free(fault_code, env);
return NULL;
}
parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
- parent_node, env);
+ parent_node, env);
if (!parent_ele)
{
- AXIOM_SOAP_FAULT_CODE_FREE(fault_code, env);
+ axiom_soap_fault_code_free(fault_code, env);
return NULL;
}
fault_code->soap_version =
@@ -99,13 +102,14 @@
parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
}
this_ele = axiom_element_create(env,
- parent_node,
- AXIOM_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME,
- parent_ns,
- &this_node);
+ parent_node,
+ AXIOM_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME,
+ parent_ns,
+ &this_node);
+
if (!this_ele)
{
- AXIOM_SOAP_FAULT_CODE_FREE(fault_code, env);
+ axiom_soap_fault_code_free(fault_code, env);
return NULL;
}
@@ -118,8 +122,8 @@
AXIS2_EXTERN axiom_soap_fault_code_t * AXIS2_CALL
axiom_soap_fault_code_create_with_parent_value(const axis2_env_t *env,
- axiom_soap_fault_t *fault,
- axis2_char_t *value)
+ axiom_soap_fault_t *fault,
+ axis2_char_t *value)
{
axiom_soap_fault_code_t *fault_code = NULL;
axiom_soap_fault_value_t *fault_value = NULL;
@@ -128,7 +132,9 @@
fault_code = axiom_soap_fault_code_create_with_parent(env, fault);
if (!fault_code)
+ {
return NULL;
+ }
fault_value = axiom_soap_fault_value_create_with_code(env, fault_code);
if (!fault_value)
@@ -136,36 +142,33 @@
axiom_soap_fault_code_free(fault_code, env);
return NULL;
}
- AXIOM_SOAP_FAULT_VALUE_SET_TEXT(fault_value, env, value);
+ axiom_soap_fault_value_set_text(fault_value, env, value);
return fault_code;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_code_free(axiom_soap_fault_code_t *fault_code,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (fault_code->subcode)
{
- AXIOM_SOAP_FAULT_SUB_CODE_FREE(fault_code->subcode, env);
- fault_code->subcode = NULL;
+ axiom_soap_fault_sub_code_free(fault_code->subcode, env);
}
if (fault_code->value)
{
- AXIOM_SOAP_FAULT_VALUE_FREE(fault_code->value, env);
- fault_code->value = NULL;
+ axiom_soap_fault_value_free(fault_code->value, env);
}
AXIS2_FREE(env->allocator, fault_code);
- fault_code = NULL;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_code_set_value(axiom_soap_fault_code_t *fault_code,
- const axis2_env_t *env,
- axiom_soap_fault_value_t *fault_val)
+ const axis2_env_t *env,
+ axiom_soap_fault_value_t *fault_val)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -179,15 +182,15 @@
else
{
AXIS2_LOG_DEBUG(env->log , AXIS2_LOG_SI,
- "trying to set fault value to fault code more than once");
+ "trying to set fault value to fault code more than once");
}
return AXIS2_FAILURE;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_code_set_sub_code(axiom_soap_fault_code_t *fault_code,
- const axis2_env_t *env,
- axiom_soap_fault_sub_code_t *fault_subcode)
+ const axis2_env_t *env,
+ axiom_soap_fault_sub_code_t *fault_subcode)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, fault_subcode, AXIS2_FAILURE);
@@ -200,17 +203,16 @@
else
{
AXIS2_LOG_DEBUG(env->log , AXIS2_LOG_SI,
- "trying to set fault subcode to fault code more than once ");
+ "trying to set fault subcode to fault code more than once ");
}
return AXIS2_FAILURE;
}
AXIS2_EXTERN axiom_soap_fault_sub_code_t* AXIS2_CALL
axiom_soap_fault_code_get_sub_code(axiom_soap_fault_code_t *fault_code,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
int status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, NULL);
if (fault_code->subcode)
{
@@ -219,9 +221,9 @@
else if (fault_code->builder)
{
while (!(fault_code->subcode) &&
- !(AXIOM_NODE_IS_COMPLETE(fault_code->om_ele_node, env)))
+ !(AXIOM_NODE_IS_COMPLETE(fault_code->om_ele_node, env)))
{
- status = AXIOM_SOAP_BUILDER_NEXT(fault_code->builder, env);
+ status = axiom_soap_builder_next(fault_code->builder, env);
if (status == AXIS2_FAILURE)
{
break;
@@ -233,12 +235,10 @@
AXIS2_EXTERN axiom_soap_fault_value_t* AXIS2_CALL
axiom_soap_fault_code_get_value(axiom_soap_fault_code_t *fault_code,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
int status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, NULL);
-
if (fault_code->value)
{
return fault_code->value;
@@ -246,9 +246,9 @@
else if (fault_code->builder)
{
while (!(fault_code->value) &&
- !(AXIOM_NODE_IS_COMPLETE(fault_code->om_ele_node, env)))
+ !(AXIOM_NODE_IS_COMPLETE(fault_code->om_ele_node, env)))
{
- status = AXIOM_SOAP_BUILDER_NEXT(fault_code->builder, env);
+ status = axiom_soap_builder_next(fault_code->builder, env);
if (status == AXIS2_FAILURE)
{
break;
@@ -260,8 +260,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_code_set_base_node(axiom_soap_fault_code_t *fault_code,
- const axis2_env_t *env,
- axiom_node_t *node)
+ const axis2_env_t *env,
+ axiom_node_t *node)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
@@ -273,21 +273,19 @@
}
fault_code->om_ele_node = node;
return AXIS2_SUCCESS;
-
}
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
axiom_soap_fault_code_get_base_node(axiom_soap_fault_code_t *fault_code,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return fault_code->om_ele_node;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_code_set_builder(axiom_soap_fault_code_t *fault_code,
- const axis2_env_t *env,
- axiom_soap_builder_t *soap_builder)
+ const axis2_env_t *env,
+ axiom_soap_builder_t *soap_builder)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_builder, AXIS2_FAILURE);
@@ -297,15 +295,15 @@
AXIS2_EXTERN int AXIS2_CALL
axiom_soap_fault_code_get_soap_version(axiom_soap_fault_code_t *fault_code,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
return fault_code->soap_version;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_code_set_soap_version(axiom_soap_fault_code_t *fault_code,
- const axis2_env_t *env,
- int soap_version)
+ const axis2_env_t *env,
+ int soap_version)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
fault_code->soap_version = soap_version;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c Mon Mar 19 12:13:26 2007
@@ -33,8 +33,8 @@
AXIS2_ENV_CHECK(env, NULL);
fault_detail = (axiom_soap_fault_detail_t*)AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_soap_fault_detail_t));
+ env->allocator,
+ sizeof(axiom_soap_fault_detail_t));
if (!fault_detail)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -49,7 +49,7 @@
AXIS2_EXTERN axiom_soap_fault_detail_t * AXIS2_CALL
axiom_soap_fault_detail_create_with_parent
(const axis2_env_t *env,
- axiom_soap_fault_t *fault)
+ axiom_soap_fault_t *fault)
{
axiom_soap_fault_detail_t *fault_detail = NULL;
axiom_element_t *this_ele = NULL;
@@ -66,12 +66,12 @@
if (!fault_detail)
return NULL;
- parent_node = AXIOM_SOAP_FAULT_GET_BASE_NODE(fault, env);
+ parent_node = axiom_soap_fault_get_base_node(fault, env);
if (!parent_node)
return NULL;
parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
- parent_node, env);
+ parent_node, env);
if (!parent_ele)
return NULL;
soap_version = axiom_soap_fault_get_soap_version(fault, env);
@@ -80,13 +80,14 @@
parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
}
this_ele = axiom_element_create(env,
- parent_node,
- AXIOM_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME,
- parent_ns,
- &this_node);
+ parent_node,
+ AXIOM_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME,
+ parent_ns,
+ &this_node);
+
if (!this_ele)
{
- AXIOM_SOAP_FAULT_DETAIL_FREE(fault_detail, env);
+ axiom_soap_fault_detail_free(fault_detail, env);
return NULL;
}
fault_detail->om_ele_node = this_node;
@@ -96,19 +97,18 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_detail_free(axiom_soap_fault_detail_t *fault_detail,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_FREE(env->allocator, fault_detail);
- fault_detail = NULL;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_detail_add_detail_entry
(axiom_soap_fault_detail_t *fault_detail,
- const axis2_env_t *env,
- axiom_node_t *node)
+ const axis2_env_t *env,
+ axiom_node_t *node)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
@@ -116,7 +116,7 @@
if (AXIOM_NODE_GET_NODE_TYPE(node, env) != AXIOM_ELEMENT)
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_OM_ELEMENT_EXPECTED, AXIS2_FAILURE);
+ AXIS2_ERROR_OM_ELEMENT_EXPECTED, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -127,16 +127,15 @@
AXIS2_EXTERN axiom_children_iterator_t* AXIS2_CALL
axiom_soap_fault_detail_get_all_detail_entries
(axiom_soap_fault_detail_t *fault_detail,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axiom_element_t *om_ele = NULL;
- AXIS2_ENV_CHECK(env, NULL);
if (fault_detail->om_ele_node)
{
om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_detail->om_ele_node, env);
+ AXIOM_NODE_GET_DATA_ELEMENT(fault_detail->om_ele_node, env);
return axiom_element_get_children(om_ele, env,
- fault_detail->om_ele_node);
+ fault_detail->om_ele_node);
}
return NULL;
}
@@ -145,8 +144,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_detail_set_base_node
(axiom_soap_fault_detail_t *fault_detail,
- const axis2_env_t *env,
- axiom_node_t *node)
+ const axis2_env_t *env,
+ axiom_node_t *node)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
@@ -163,8 +162,7 @@
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
axiom_soap_fault_detail_get_base_node
(axiom_soap_fault_detail_t *fault_detail,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return fault_detail->om_ele_node;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c Mon Mar 19 12:13:26 2007
@@ -31,8 +31,9 @@
axiom_soap_fault_node_t *fault_node = NULL;
fault_node = (axiom_soap_fault_node_t*)AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_soap_fault_node_t));
+ env->allocator,
+ sizeof(axiom_soap_fault_node_t));
+
if (!fault_node)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -45,7 +46,7 @@
AXIS2_EXTERN axiom_soap_fault_node_t * AXIS2_CALL
axiom_soap_fault_node_create_with_parent(const axis2_env_t *env,
- axiom_soap_fault_t *fault)
+ axiom_soap_fault_t *fault)
{
axiom_soap_fault_node_t *fault_node = NULL;
axiom_element_t *this_ele = NULL;
@@ -63,31 +64,32 @@
if (!fault_node)
return NULL;
- parent_node = AXIOM_SOAP_FAULT_GET_BASE_NODE(fault, env);
+ parent_node = axiom_soap_fault_get_base_node(fault, env);
if (!parent_node)
{
- AXIOM_SOAP_FAULT_NODE_FREE(fault_node, env);
+ axiom_soap_fault_node_free(fault_node, env);
return NULL;
}
parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
- parent_node, env);
+ parent_node, env);
if (!parent_ele)
{
- AXIOM_SOAP_FAULT_NODE_FREE(fault_node, env);
+ axiom_soap_fault_node_free(fault_node, env);
return NULL;
}
parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
this_ele = axiom_element_create(env,
- parent_node,
- AXIOM_SOAP12_SOAP_FAULT_NODE_LOCAL_NAME,
- parent_ns,
- &this_node);
+ parent_node,
+ AXIOM_SOAP12_SOAP_FAULT_NODE_LOCAL_NAME,
+ parent_ns,
+ &this_node);
+
if (!this_ele)
{
- AXIOM_SOAP_FAULT_NODE_FREE(fault_node, env);
+ axiom_soap_fault_node_free(fault_node, env);
return NULL;
}
@@ -102,7 +104,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_node_free(axiom_soap_fault_node_t *fault_node,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_FREE(env->allocator, fault_node);
@@ -111,8 +113,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_node_set_value(axiom_soap_fault_node_t *fault_node,
- const axis2_env_t *env,
- axis2_char_t *uri)
+ const axis2_env_t *env,
+ axis2_char_t *uri)
{
axiom_element_t *om_ele = NULL;
@@ -122,12 +124,12 @@
if (fault_node->om_ele_node)
{
om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
- fault_node->om_ele_node, env);
+ fault_node->om_ele_node, env);
if (om_ele)
{
return axiom_element_set_text(om_ele, env, uri,
- fault_node->om_ele_node);
+ fault_node->om_ele_node);
}
}
@@ -136,7 +138,7 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_soap_fault_node_get_value(axiom_soap_fault_node_t *fault_node,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axiom_element_t *om_ele = NULL;
@@ -144,11 +146,11 @@
if (fault_node->om_ele_node)
{
om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
- fault_node->om_ele_node, env);
+ fault_node->om_ele_node, env);
if (om_ele)
{
return axiom_element_get_text(om_ele,
- env, fault_node->om_ele_node);
+ env, fault_node->om_ele_node);
}
}
@@ -157,14 +159,14 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_node_set_base_node(axiom_soap_fault_node_t *fault_node,
- const axis2_env_t *env,
- axiom_node_t *node)
+ const axis2_env_t *env,
+ axiom_node_t *node)
{
AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
if (AXIOM_NODE_GET_NODE_TYPE(node, env) != AXIOM_ELEMENT)
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -175,7 +177,7 @@
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
axiom_soap_fault_node_get_base_node(axiom_soap_fault_node_t *fault_node,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return fault_node->om_ele_node;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c Mon Mar 19 12:13:26 2007
@@ -77,7 +77,7 @@
if (!fault_reason)
return NULL;
- parent_node = AXIOM_SOAP_FAULT_GET_BASE_NODE(fault, env);
+ parent_node = axiom_soap_fault_get_base_node(fault, env);
if (!parent_node)
{
return NULL;
@@ -131,7 +131,7 @@
if (value)
{
fault_text = (axiom_soap_fault_text_t *)value;
- AXIOM_SOAP_FAULT_TEXT_FREE(fault_text, env);
+ axiom_soap_fault_text_free(fault_text, env);
fault_text = NULL;
}
}
@@ -170,7 +170,7 @@
{
while (!(AXIOM_NODE_IS_COMPLETE(fault_reason->om_ele_node, env)))
{
- status = AXIOM_SOAP_BUILDER_NEXT(fault_reason->soap_builder, env);
+ status = axiom_soap_builder_next(fault_reason->soap_builder, env);
if (status == AXIS2_FAILURE)
return NULL;
}
@@ -192,7 +192,7 @@
{
axis2_char_t *fault_lang = NULL;
fault_text = (axiom_soap_fault_text_t *)value;
- fault_lang = AXIOM_SOAP_FAULT_TEXT_GET_LANG(fault_text, env);
+ fault_lang = axiom_soap_fault_text_get_lang(fault_text, env);
if (fault_lang && axis2_strcmp(lang, fault_lang) == 0)
{
return fault_text;
@@ -255,7 +255,7 @@
{
while (!(AXIOM_NODE_IS_COMPLETE(fault_reason->om_ele_node, env)))
{
- status = AXIOM_SOAP_BUILDER_NEXT(fault_reason->soap_builder, env);
+ status = axiom_soap_builder_next(fault_reason->soap_builder, env);
if (status == AXIS2_FAILURE)
return NULL;
}
@@ -278,7 +278,7 @@
{
while (!(AXIOM_NODE_IS_COMPLETE(fault_reason->om_ele_node, env)))
{
- status = AXIOM_SOAP_BUILDER_NEXT(fault_reason->soap_builder, env);
+ status = axiom_soap_builder_next(fault_reason->soap_builder, env);
if (status == AXIS2_FAILURE)
return NULL;
}
@@ -315,7 +315,7 @@
{
axis2_char_t *lang = NULL;
axis2_bool_t is_exists = AXIS2_FALSE;
- lang = AXIOM_SOAP_FAULT_TEXT_GET_LANG(fault_text, env);
+ lang = axiom_soap_fault_text_get_lang(fault_text, env);
if (lang)
{
is_exists = axiom_soap_fault_reason_lang_exists(fault_reason, env, lang);
@@ -351,7 +351,7 @@
axis2_char_t *text_lang = NULL;
fault_text = (axiom_soap_fault_text_t *)value;
- text_lang = AXIOM_SOAP_FAULT_TEXT_GET_LANG(fault_text, env);
+ text_lang = axiom_soap_fault_text_get_lang(fault_text, env);
if (text_lang && (axis2_strcmp(lang, text_lang) == 0))
{
return AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c Mon Mar 19 12:13:26 2007
@@ -33,8 +33,9 @@
AXIS2_ENV_CHECK(env, NULL);
fault_role = (axiom_soap_fault_role_t*) AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_soap_fault_role_t));
+ env->allocator,
+ sizeof(axiom_soap_fault_role_t));
+
if (!fault_role)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -48,7 +49,7 @@
AXIS2_EXTERN axiom_soap_fault_role_t * AXIS2_CALL
axiom_soap_fault_role_create_with_parent(const axis2_env_t *env,
- axiom_soap_fault_t *fault)
+ axiom_soap_fault_t *fault)
{
axiom_soap_fault_role_t *fault_role = NULL;
int soap_version = -1;
@@ -68,18 +69,18 @@
if (!fault_role)
return NULL;
- parent_node = AXIOM_SOAP_FAULT_GET_BASE_NODE(fault, env);
+ parent_node = axiom_soap_fault_get_base_node(fault, env);
if (!parent_node)
{
- AXIOM_SOAP_FAULT_ROLE_FREE(fault_role, env);
+ axiom_soap_fault_role_free(fault_role, env);
return NULL;
}
parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
- parent_node, env);
+ parent_node, env);
if (!parent_ele)
{
- AXIOM_SOAP_FAULT_ROLE_FREE(fault_role, env);
+ axiom_soap_fault_role_free(fault_role, env);
return NULL;
}
soap_version = axiom_soap_fault_get_soap_version(fault, env);
@@ -88,11 +89,12 @@
parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
}
this_ele = axiom_element_create(env,
- parent_node, AXIOM_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME,
- parent_ns, &this_node);
+ parent_node, AXIOM_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME,
+ parent_ns, &this_node);
+
if (!this_ele)
{
- AXIOM_SOAP_FAULT_ROLE_FREE(fault_role, env);
+ axiom_soap_fault_role_free(fault_role, env);
return NULL;
}
@@ -106,7 +108,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_role_free(axiom_soap_fault_role_t *fault_role,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_FREE(env->allocator, fault_role);
@@ -116,8 +118,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_role_set_role_value
(axiom_soap_fault_role_t *fault_role,
- const axis2_env_t *env,
- axis2_char_t* uri)
+ const axis2_env_t *env,
+ axis2_char_t* uri)
{
axiom_element_t *role_ele = NULL;
@@ -128,12 +130,12 @@
return AXIS2_FAILURE;
role_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT
- (fault_role->om_ele_node, env);
+ (fault_role->om_ele_node, env);
if (role_ele)
{
return axiom_element_set_text(role_ele, env, uri,
- fault_role->om_ele_node);
+ fault_role->om_ele_node);
}
return AXIS2_FAILURE;
}
@@ -141,21 +143,20 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_soap_fault_role_get_role_value
(axiom_soap_fault_role_t *fault_role,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axiom_element_t *role_ele = NULL;
- AXIS2_ENV_CHECK(env, NULL);
if (!fault_role->om_ele_node)
return NULL;
role_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT
- (fault_role->om_ele_node, env);
+ (fault_role->om_ele_node, env);
if (role_ele)
{
return axiom_element_get_text(role_ele, env,
- fault_role->om_ele_node);
+ fault_role->om_ele_node);
}
return NULL;
}
@@ -163,8 +164,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_role_set_base_node
(axiom_soap_fault_role_t *fault_role,
- const axis2_env_t *env,
- axiom_node_t *node)
+ const axis2_env_t *env,
+ axiom_node_t *node)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
@@ -181,8 +182,7 @@
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
axiom_soap_fault_role_get_base_node
(axiom_soap_fault_role_t *fault_role,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return fault_role->om_ele_node;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c Mon Mar 19 12:13:26 2007
@@ -74,10 +74,10 @@
if (!fault_sub_code)
return NULL;
- parent_node = AXIOM_SOAP_FAULT_CODE_GET_BASE_NODE(fault_code, env);
+ parent_node = axiom_soap_fault_code_get_base_node(fault_code, env);
if (!parent_node)
{
- AXIOM_SOAP_FAULT_SUB_CODE_FREE(fault_sub_code, env);
+ axiom_soap_fault_sub_code_free(fault_sub_code, env);
return NULL;
}
@@ -85,7 +85,7 @@
parent_node, env);
if (!parent_ele)
{
- AXIOM_SOAP_FAULT_SUB_CODE_FREE(fault_sub_code, env);
+ axiom_soap_fault_sub_code_free(fault_sub_code, env);
return NULL;
}
fault_sub_code->soap_version =
@@ -102,7 +102,7 @@
if (!this_ele)
{
- AXIOM_SOAP_FAULT_SUB_CODE_FREE(fault_sub_code, env);
+ axiom_soap_fault_sub_code_free(fault_sub_code, env);
return NULL;
}
@@ -132,11 +132,11 @@
fault_value = axiom_soap_fault_value_create_with_subcode(env, fault_sub_code);
if (!fault_value)
{
- AXIOM_SOAP_FAULT_SUB_CODE_FREE(fault_sub_code, env);
+ axiom_soap_fault_sub_code_free(fault_sub_code, env);
return NULL;
}
- AXIOM_SOAP_FAULT_VALUE_SET_TEXT(fault_value, env, value);
+ axiom_soap_fault_value_set_text(fault_value, env, value);
return fault_sub_code;
}
@@ -147,12 +147,12 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (fault_sub_code->value)
{
- AXIOM_SOAP_FAULT_VALUE_FREE(fault_sub_code->value, env);
+ axiom_soap_fault_value_free(fault_sub_code->value, env);
fault_sub_code->value = NULL;
}
if (fault_sub_code->subcode)
{
- AXIOM_SOAP_FAULT_SUB_CODE_FREE(fault_sub_code->subcode, env);
+ axiom_soap_fault_sub_code_free(fault_sub_code->subcode, env);
fault_sub_code->subcode = NULL;
}
AXIS2_FREE(env->allocator, fault_sub_code);
@@ -197,7 +197,7 @@
while (!(fault_sub_code->value) &&
!AXIOM_NODE_IS_COMPLETE(fault_sub_code->om_ele_node, env))
{
- status = AXIOM_SOAP_BUILDER_NEXT(fault_sub_code->builder, env);
+ status = axiom_soap_builder_next(fault_sub_code->builder, env);
if (status == AXIS2_FAILURE)
break;
}
@@ -241,7 +241,7 @@
while (!(fault_sub_code->subcode) &&
!AXIOM_NODE_IS_COMPLETE(fault_sub_code->om_ele_node, env))
{
- status = AXIOM_SOAP_BUILDER_NEXT(fault_sub_code->builder, env);
+ status = axiom_soap_builder_next(fault_sub_code->builder, env);
if (status == AXIS2_FAILURE)
break;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c Mon Mar 19 12:13:26 2007
@@ -87,10 +87,10 @@
return NULL;
}
- parent_node = AXIOM_SOAP_FAULT_REASON_GET_BASE_NODE(parent, env);
+ parent_node = axiom_soap_fault_reason_get_base_node(parent, env);
if (!parent_node)
{
- AXIOM_SOAP_FAULT_TEXT_FREE(fault_text, env);
+ axiom_soap_fault_text_free(fault_text, env);
return NULL;
}
@@ -98,7 +98,7 @@
AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
if (!parent_ele)
{
- AXIOM_SOAP_FAULT_TEXT_FREE(fault_text, env);
+ axiom_soap_fault_text_free(fault_text, env);
return NULL;
}
soap_version = axiom_soap_fault_reason_get_soap_version(parent, env);
@@ -112,13 +112,13 @@
if (!this_ele)
{
- AXIOM_SOAP_FAULT_TEXT_FREE(fault_text, env);
+ axiom_soap_fault_text_free(fault_text, env);
return NULL;
}
fault_text->om_ele_node = this_node;
- AXIOM_SOAP_FAULT_REASON_ADD_SOAP_FAULT_TEXT(parent, env, fault_text);
+ axiom_soap_fault_reason_add_soap_fault_text(parent, env, fault_text);
return fault_text;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c Mon Mar 19 12:13:26 2007
@@ -33,8 +33,9 @@
AXIS2_ENV_CHECK(env, NULL);
fault_value = (axiom_soap_fault_value_t *)AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_soap_fault_value_t));
+ env->allocator,
+ sizeof(axiom_soap_fault_value_t));
+
if (!fault_value)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -49,7 +50,7 @@
AXIS2_EXTERN axiom_soap_fault_value_t * AXIS2_CALL
axiom_soap_fault_value_create_with_subcode(const axis2_env_t *env,
- axiom_soap_fault_sub_code_t *parent)
+ axiom_soap_fault_sub_code_t *parent)
{
axiom_soap_fault_value_t *fault_value = NULL;
@@ -70,20 +71,20 @@
return NULL;
}
- parent_node = AXIOM_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(parent, env);
+ parent_node = axiom_soap_fault_sub_code_get_base_node(parent, env);
if (!parent_node)
{
- AXIOM_SOAP_FAULT_VALUE_FREE(fault_value, env);
+ axiom_soap_fault_value_free(fault_value, env);
return NULL;
}
parent_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+ AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
if (!parent_ele)
{
- AXIOM_SOAP_FAULT_VALUE_FREE(fault_value, env);
+ axiom_soap_fault_value_free(fault_value, env);
return NULL;
}
soap_version =
@@ -94,13 +95,14 @@
}
this_ele = axiom_element_create(env,
- parent_node,
- AXIOM_SOAP12_SOAP_FAULT_VALUE_LOCAL_NAME,
- parent_ns,
- &this_node);
+ parent_node,
+ AXIOM_SOAP12_SOAP_FAULT_VALUE_LOCAL_NAME,
+ parent_ns,
+ &this_node);
+
if (!this_ele)
{
- AXIOM_SOAP_FAULT_VALUE_FREE(fault_value, env);
+ axiom_soap_fault_value_free(fault_value, env);
return NULL;
}
@@ -113,7 +115,7 @@
AXIS2_EXTERN axiom_soap_fault_value_t * AXIS2_CALL
axiom_soap_fault_value_create_with_code(const axis2_env_t *env,
- axiom_soap_fault_code_t *parent)
+ axiom_soap_fault_code_t *parent)
{
axiom_soap_fault_value_t *fault_value = NULL;
int soap_version = -1;
@@ -133,17 +135,17 @@
return NULL;
}
- parent_node = AXIOM_SOAP_FAULT_CODE_GET_BASE_NODE(parent, env);
+ parent_node = axiom_soap_fault_code_get_base_node(parent, env);
if (!parent_node)
{
- AXIOM_SOAP_FAULT_VALUE_FREE(fault_value, env);
+ axiom_soap_fault_value_free(fault_value, env);
return NULL;
}
parent_ele = (axiom_element_t*)
- AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+ AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
if (!parent_ele)
{
- AXIOM_SOAP_FAULT_VALUE_FREE(fault_value, env);
+ axiom_soap_fault_value_free(fault_value, env);
return NULL;
}
soap_version = axiom_soap_fault_code_get_soap_version(parent, env);
@@ -152,12 +154,12 @@
parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
}
this_ele = axiom_element_create(env,
- parent_node, AXIOM_SOAP12_SOAP_FAULT_VALUE_LOCAL_NAME,
- parent_ns, &this_node);
+ parent_node, AXIOM_SOAP12_SOAP_FAULT_VALUE_LOCAL_NAME,
+ parent_ns, &this_node);
if (!this_ele)
{
- AXIOM_SOAP_FAULT_VALUE_FREE(fault_value, env);
+ axiom_soap_fault_value_free(fault_value, env);
return NULL;
}
fault_value->om_ele_node = this_node;
@@ -170,25 +172,24 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_value_free(axiom_soap_fault_value_t *fault_value,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_FREE(env->allocator, fault_value);
- fault_value = NULL;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_value_set_base_node(axiom_soap_fault_value_t *fault_value,
- const axis2_env_t *env,
- axiom_node_t *node)
+ const axis2_env_t *env,
+ axiom_node_t *node)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (AXIOM_NODE_GET_NODE_TYPE(node, env) != AXIOM_ELEMENT)
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -198,14 +199,14 @@
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
axiom_soap_fault_value_get_base_node(axiom_soap_fault_value_t *fault_value,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
return fault_value->om_ele_node;
}
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
axiom_soap_fault_value_get_text(axiom_soap_fault_value_t *fault_value,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axiom_node_t *value_node = NULL;
axiom_element_t *value_element = NULL;
@@ -216,7 +217,7 @@
return NULL;
value_element = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(
- value_node, env);
+ value_node, env);
if (!value_element)
return NULL;
@@ -226,17 +227,17 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_fault_value_set_text(axiom_soap_fault_value_t *fault_value,
- const axis2_env_t *env,
- axis2_char_t *text)
+ const axis2_env_t *env,
+ axis2_char_t *text)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, text, AXIS2_FAILURE);
if (fault_value->om_ele_node &&
- AXIOM_NODE_GET_NODE_TYPE(fault_value->om_ele_node, env) == AXIOM_ELEMENT)
+ AXIOM_NODE_GET_NODE_TYPE(fault_value->om_ele_node, env) == AXIOM_ELEMENT)
{
axiom_element_t *om_ele = NULL;
om_ele = (axiom_element_t *)
- AXIOM_NODE_GET_DATA_ELEMENT(fault_value->om_ele_node, env);
+ AXIOM_NODE_GET_DATA_ELEMENT(fault_value->om_ele_node, env);
return axiom_element_set_text(om_ele, env, text, fault_value->om_ele_node);
}
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header.c Mon Mar 19 12:13:26 2007
@@ -99,14 +99,14 @@
if (!soap_header)
return NULL;
- soap_header->soap_version = AXIOM_SOAP_ENVELOPE_GET_SOAP_VERSION(envelope, env);
+ soap_header->soap_version = axiom_soap_envelope_get_soap_version(envelope, env);
- parent_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(envelope, env);
+ parent_node = axiom_soap_envelope_get_base_node(envelope, env);
if (!parent_node ||
AXIOM_NODE_GET_NODE_TYPE(parent_node, env) != AXIOM_ELEMENT)
{
- AXIOM_SOAP_HEADER_FREE(soap_header, env);
+ axiom_soap_header_free(soap_header, env);
return NULL;
}
@@ -114,7 +114,7 @@
AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
if (!parent_ele)
{
- AXIOM_SOAP_HEADER_FREE(soap_header, env);
+ axiom_soap_header_free(soap_header, env);
return NULL;
}
if (AXIOM_NODE_GET_FIRST_CHILD(parent_node, env))
@@ -128,7 +128,7 @@
AXIOM_SOAP_HEADER_LOCAL_NAME, parent_ns, &this_node);
if (!this_ele)
{
- AXIOM_SOAP_HEADER_FREE(soap_header, env);
+ axiom_soap_header_free(soap_header, env);
return NULL;
}
@@ -159,7 +159,7 @@
if (val)
{
- AXIOM_SOAP_HEADER_BLOCK_FREE((axiom_soap_header_block_t *)val, env);
+ axiom_soap_header_block_free((axiom_soap_header_block_t *)val, env);
val = NULL;
}
}
@@ -216,7 +216,7 @@
if (!header_block)
return NULL;
- header_block_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(
+ header_block_node = axiom_soap_header_block_get_base_node(
header_block, env);
if (header_block_node)
@@ -475,7 +475,7 @@
{
header_block = (axiom_soap_header_block_t*)hb;
- header_block_om_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
+ header_block_om_node = axiom_soap_header_block_get_base_node(header_block, env);
if (header_block_om_node)
{
header_block_om_ele = (axiom_element_t *)
@@ -555,7 +555,7 @@
axiom_node_t *node = NULL;
header_block = (axiom_soap_header_block_t*)val;
- node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
+ node = axiom_soap_header_block_get_base_node(header_block, env);
if (node)
{
axis2_qname_t *element_qname = NULL;
@@ -568,7 +568,7 @@
AXIOM_NODE_FREE_TREE(node, env);
axis2_hash_set(soap_header->header_blocks, key, AXIS2_HASH_KEY_STRING,
NULL);
- AXIOM_SOAP_HEADER_BLOCK_FREE(header_block, env);
+ axiom_soap_header_block_free(header_block, env);
return AXIS2_SUCCESS;
}
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c Mon Mar 19 12:13:26 2007
@@ -69,7 +69,7 @@
if (!header_block)
return NULL;
- parent_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(header, env);
+ parent_node = axiom_soap_header_get_base_node(header, env);
if (!parent_node)
return NULL;
@@ -77,7 +77,7 @@
ns , &this_node);
if (!om_ele)
{
- AXIOM_SOAP_HEADER_BLOCK_FREE(header_block, env);
+ axiom_soap_header_block_free(header_block, env);
return NULL;
}
header_block->om_ele_node = this_node;
@@ -85,7 +85,7 @@
axiom_soap_header_set_header_block(header, env, header_block);
header_block->soap_version =
- AXIOM_SOAP_HEADER_GET_SOAP_VERSION(header, env);
+ axiom_soap_header_get_soap_version(header, env);
return header_block;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_message.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_message.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_message.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_message.c Mon Mar 19 12:13:26 2007
@@ -29,8 +29,8 @@
AXIS2_EXTERN axiom_soap_message_t* AXIS2_CALL
axiom_soap_message_create(const axis2_env_t *env,
- axiom_soap_builder_t *builder,
- axiom_document_t *om_doc)
+ axiom_soap_builder_t *builder,
+ axiom_document_t *om_doc)
{
axiom_soap_message_t *soap_message = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -38,7 +38,7 @@
AXIS2_PARAM_CHECK(env->error, builder, NULL);
soap_message = (axiom_soap_message_t *)AXIS2_MALLOC(env->allocator,
- sizeof(axiom_soap_message_t));
+ sizeof(axiom_soap_message_t));
if (!soap_message)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -53,7 +53,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_message_free(axiom_soap_message_t *soap_message,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (soap_message->om_doc)
@@ -63,19 +63,16 @@
}
if (soap_message->soap_envelope)
{
- AXIOM_SOAP_ENVELOPE_FREE(soap_message->soap_envelope, env);
- soap_message->soap_envelope = NULL;
+ axiom_soap_envelope_free(soap_message->soap_envelope, env);
}
AXIS2_FREE(env->allocator, soap_message);
- soap_message = NULL;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axiom_soap_envelope_t* AXIS2_CALL
axiom_soap_message_get_soap_envelope(axiom_soap_message_t *soap_message,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
if (soap_message->soap_envelope)
{
return soap_message->soap_envelope;
@@ -90,8 +87,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_message_serialize(axiom_soap_message_t *soap_message,
- const axis2_env_t *env,
- axiom_output_t *om_output)
+ const axis2_env_t *env,
+ axiom_output_t *om_output)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return axiom_document_serialize(soap_message->om_doc, env, om_output);
Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Mon Mar 19 12:13:26 2007
@@ -152,28 +152,28 @@
printf("%s \n", axis2_error_get_message(env->error));
return AXIS2_FAILURE;
}
- soap_envelope = AXIOM_SOAP_BUILDER_GET_SOAP_ENVELOPE(soap_builder, env);
+ soap_envelope = axiom_soap_builder_get_soap_envelope(soap_builder, env);
if (!soap_envelope)
{
- AXIOM_SOAP_BUILDER_FREE(soap_builder, env);
+ axiom_soap_builder_free(soap_builder, env);
printf("%s \n", axis2_error_get_message(env->error));
return AXIS2_FAILURE;
}
- om_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(soap_envelope, env);
+ om_node = axiom_soap_envelope_get_base_node(soap_envelope, env);
if (om_node)
printnode(om_node, env);
- soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env);
+ soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
if (soap_header)
{
- om_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
+ om_node = axiom_soap_header_get_base_node(soap_header, env);
if (om_node)
printnode(om_node, env);
- children_iter = AXIOM_SOAP_HEADER_EXAMINE_ALL_HEADER_BLOCKS(soap_header, env);
+ children_iter = axiom_soap_header_examine_all_header_blocks(soap_header, env);
if (children_iter)
{
while (axiom_children_iterator_has_next(children_iter, env))
@@ -185,10 +185,10 @@
}
}
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+ soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
if (soap_body)
{
- om_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+ om_node = axiom_soap_body_get_base_node(soap_body, env);
if (om_node)
printnode(om_node, env);
else
@@ -202,17 +202,17 @@
}
- if (AXIOM_SOAP_BODY_HAS_FAULT(soap_body, env))
+ if (axiom_soap_body_has_fault(soap_body, env))
{
printf("\n\nsoap body has a fault element\n\n\n ");
}
- om_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+ om_node = axiom_soap_body_get_base_node(soap_body, env);
if (om_node)
{
while (!(AXIOM_NODE_IS_COMPLETE(om_node, env)))
{
- status = AXIOM_SOAP_BUILDER_NEXT(soap_builder, env);
+ status = axiom_soap_builder_next(soap_builder, env);
if (status == AXIS2_FAILURE)
{
printf("failure %s" , axis2_error_get_message(env->error));
@@ -225,20 +225,20 @@
AXIS2_XML_PARSER_TYPE_BUFFER);
if (!xml_writer)
{
- AXIOM_SOAP_BUILDER_FREE(soap_builder, env);
+ axiom_soap_builder_free(soap_builder, env);
return AXIS2_FAILURE;
}
om_output = axiom_output_create(env, xml_writer);
if (!om_output)
{
- AXIOM_SOAP_BUILDER_FREE(soap_builder, env);
+ axiom_soap_builder_free(soap_builder, env);
AXIOM_XML_WRITER_FREE(xml_writer, env);
return AXIS2_FAILURE;
}
- AXIOM_SOAP_ENVELOPE_SERIALIZE(soap_envelope, env, om_output, AXIS2_FALSE);
+ axiom_soap_envelope_serialize(soap_envelope, env, om_output, AXIS2_FALSE);
buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
@@ -247,7 +247,7 @@
if (buffer)
AXIS2_FREE(env->allocator, buffer);
- AXIOM_SOAP_ENVELOPE_FREE(soap_envelope, env);
+ axiom_soap_envelope_free(soap_envelope, env);
axiom_output_free(om_output, env);
@@ -300,7 +300,7 @@
hb1 = axiom_soap_header_block_create_with_parent(env, "echoOk", role_ns , soap_header);
- hb_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(hb1, env);
+ hb_node = axiom_soap_header_block_get_base_node(hb1, env);
hb_ele = AXIOM_NODE_GET_DATA_ELEMENT(hb_node, env);
@@ -318,13 +318,13 @@
om_output = axiom_output_create(env, xml_writer);
- AXIOM_SOAP_ENVELOPE_SERIALIZE(soap_envelope, env, om_output, AXIS2_FALSE);
+ axiom_soap_envelope_serialize(soap_envelope, env, om_output, AXIS2_FALSE);
buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
printf("%s \n", buffer);
- AXIOM_SOAP_ENVELOPE_FREE(soap_envelope, env);
+ axiom_soap_envelope_free(soap_envelope, env);
AXIS2_FREE(env->allocator, buffer);
@@ -350,19 +350,19 @@
axiom_soap_envelope_create_default_soap_fault_envelope(env,
"Fault Code", "Fault Reason", AXIOM_SOAP12,
NULL, NULL);
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
- soap_fault = AXIOM_SOAP_BODY_GET_FAULT(soap_body, env);
+ soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
+ soap_fault = axiom_soap_body_get_fault(soap_body, env);
axiom_soap_fault_detail_create_with_parent(env, soap_fault);
axiom_soap_fault_role_create_with_parent(env, soap_fault);
xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE,
AXIS2_XML_PARSER_TYPE_BUFFER);
om_output = axiom_output_create(env, xml_writer);
- AXIOM_SOAP_ENVELOPE_SERIALIZE(soap_envelope, env, om_output, AXIS2_FALSE);
+ axiom_soap_envelope_serialize(soap_envelope, env, om_output, AXIS2_FALSE);
buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
printf("%s \n", buffer);
AXIS2_FREE(env->allocator, buffer);
- AXIOM_SOAP_ENVELOPE_FREE(soap_envelope, env);
+ axiom_soap_envelope_free(soap_envelope, env);
axiom_output_free(om_output, env);
return 0;
}
@@ -380,11 +380,11 @@
soap_envelope = axiom_soap_envelope_create_default_soap_fault_envelope(
env, "env:Receiver", "Something went wrong!", AXIOM_SOAP12,
NULL, NULL);
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
- soap_fault = AXIOM_SOAP_BODY_GET_FAULT(soap_body, env);
- soap_code = AXIOM_SOAP_FAULT_GET_CODE(soap_fault, env);
- value = AXIOM_SOAP_FAULT_CODE_GET_VALUE(soap_code, env);
- value_text = AXIOM_SOAP_FAULT_VALUE_GET_TEXT(value, env);
+ soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
+ soap_fault = axiom_soap_body_get_fault(soap_body, env);
+ soap_code = axiom_soap_fault_get_code(soap_fault, env);
+ value = axiom_soap_fault_code_get_value(soap_code, env);
+ value_text = axiom_soap_fault_value_get_text(value, env);
printf("Actual = %s Expected = %s |", value_text, "env:Receiver");
if (0 == strcmp(value_text, "env:Receiver"))
@@ -392,7 +392,7 @@
else
printf("FAILURE\n");
- AXIOM_SOAP_ENVELOPE_FREE(soap_envelope, env);
+ axiom_soap_envelope_free(soap_envelope, env);
return 0;
}
int main(int argc, char *argv[])
Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Mon Mar 19 12:13:26 2007
@@ -208,11 +208,11 @@
if (to_send)
{
axiom_soap_body_t *soap_body = NULL;
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env);
+ soap_body = axiom_soap_envelope_get_body(envelope, env);
if (soap_body)
{
axiom_node_t *node = NULL;
- node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+ node = axiom_soap_body_get_base_node(soap_body, env);
if (node)
{
AXIOM_NODE_ADD_CHILD(node, env, to_send);
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Mon Mar 19 12:13:26 2007
@@ -654,11 +654,11 @@
soap_envelope = axis2_msg_ctx_get_soap_envelope(res_msg_ctx, env);
if (soap_envelope)
{
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+ soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
if (soap_body)
{
- soap_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+ soap_node = axiom_soap_body_get_base_node(soap_body, env);
if (soap_node)
{
return AXIOM_NODE_GET_FIRST_ELEMENT(soap_node, env);
@@ -737,14 +737,14 @@
{
return NULL;
}
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+ soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
if (!soap_body)
{
return NULL;
}
- soap_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+ soap_node = axiom_soap_body_get_base_node(soap_body, env);
if (!soap_node)
{
return NULL;
@@ -1188,12 +1188,12 @@
if (svc_client->headers)
{
axiom_soap_header_t *soap_header = NULL;
- soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(envelope, env);
+ soap_header = axiom_soap_envelope_get_header(envelope, env);
if (soap_header)
{
axiom_node_t *header_node = NULL;
- header_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
+ header_node = axiom_soap_header_get_base_node(soap_header, env);
if (header_node)
{
@@ -1216,11 +1216,11 @@
if (payload)
{
axiom_soap_body_t *soap_body = NULL;
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env);
+ soap_body = axiom_soap_envelope_get_body(envelope, env);
if (soap_body)
{
axiom_node_t *node = NULL;
- node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+ node = axiom_soap_body_get_base_node(soap_body, env);
if (node)
{
AXIOM_NODE_ADD_CHILD(node, env, (axiom_node_t *)payload);
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Mon Mar 19 12:13:26 2007
@@ -330,7 +330,7 @@
if (msg_ctx->fault_soap_envelope)
{
- AXIOM_SOAP_ENVELOPE_FREE(msg_ctx->fault_soap_envelope, env);
+ axiom_soap_envelope_free(msg_ctx->fault_soap_envelope, env);
}
if (msg_ctx->charset_encoding)
@@ -614,7 +614,7 @@
if (soap_envelope)
{
int soap_v = AXIOM_SOAP12;
- soap_v = AXIOM_SOAP_ENVELOPE_GET_SOAP_VERSION(soap_envelope, env);
+ soap_v = axiom_soap_envelope_get_soap_version(soap_envelope, env);
msg_ctx->is_soap_11 = (soap_v == AXIOM_SOAP12) ? AXIS2_FALSE : AXIS2_TRUE;
msg_ctx->soap_envelope = soap_envelope;
}
@@ -638,7 +638,7 @@
if (soap_envelope)
{
int soap_v = AXIOM_SOAP12;
- soap_v = AXIOM_SOAP_ENVELOPE_GET_SOAP_VERSION(soap_envelope, env);
+ soap_v = axiom_soap_envelope_get_soap_version(soap_envelope, env);
msg_ctx->response_soap_envelope = soap_envelope;
}
else
Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Mon Mar 19 12:13:26 2007
@@ -207,7 +207,7 @@
soap_version = AXIOM_SOAP11;
}
soap_envelope = axiom_soap_envelope_create_default_soap_envelope (env, soap_version);
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+ soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
soap_fault = axiom_soap_fault_create_default_fault (env, soap_body, "Receiver", "Service Not Found", soap_version);
axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, soap_envelope);
return AXIS2_FAILURE;
@@ -218,7 +218,7 @@
{
AXIS2_LOG_INFO(env->log, "Operation Not found. Endpoint reference is : %s", (address) ? address : "NULL");
soap_envelope = axiom_soap_envelope_create_default_soap_envelope (env, soap_version);
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+ soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
soap_fault = axiom_soap_fault_create_default_fault (env, soap_body, "Receiver", "Operation Not Found", soap_version);
axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env, soap_envelope);
return AXIS2_FAILURE;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org