You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/06/12 13:55:43 UTC
svn commit: r413641 [4/9] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/soap/ axiom/test/soap/
include/ modules/core/clientapi/ modules/core/clientapi/diclient/
modules/core/context/ modules/core/descrip...
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c?rev=413641&r1=413640&r2=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c Mon Jun 12 04:55:38 2006
@@ -14,28 +14,28 @@
* limitations under the License.
*/
- #include "axis2_soap12_builder_helper.h"
+ #include "axiom_soap12_builder_helper.h"
#include <axis2_array_list.h>
- #include "_axis2_soap_body.h"
- #include "_axis2_soap_fault.h"
- #include "_axis2_soap_envelope.h"
- #include <axis2_soap_message.h>
- #include "_axis2_soap_fault_code.h"
- #include "_axis2_soap_fault_sub_code.h"
- #include "_axis2_soap_fault_node.h"
- #include "_axis2_soap_fault_detail.h"
- #include "_axis2_soap_fault_reason.h"
- #include "_axis2_soap_fault_role.h"
- #include "_axis2_soap_fault_value.h"
- #include "_axis2_soap_fault_text.h"
+ #include "_axiom_soap_body.h"
+ #include "_axiom_soap_fault.h"
+ #include "_axiom_soap_envelope.h"
+ #include <axiom_soap_message.h>
+ #include "_axiom_soap_fault_code.h"
+ #include "_axiom_soap_fault_sub_code.h"
+ #include "_axiom_soap_fault_node.h"
+ #include "_axiom_soap_fault_detail.h"
+ #include "_axiom_soap_fault_reason.h"
+ #include "_axiom_soap_fault_role.h"
+ #include "_axiom_soap_fault_value.h"
+ #include "_axiom_soap_fault_text.h"
/********************* impl struct ********************************************/
-typedef struct axis2_soap12_builder_helper_impl_t
+typedef struct axiom_soap12_builder_helper_impl_t
{
- axis2_soap12_builder_helper_t builder_helper;
+ axiom_soap12_builder_helper_t builder_helper;
- axis2_soap_builder_t *soap_builder;
+ axiom_soap_builder_t *soap_builder;
axis2_bool_t code_present;
@@ -64,37 +64,37 @@
axis2_array_list_t *detail_element_names;
-}axis2_soap12_builder_helper_impl_t;
+}axiom_soap12_builder_helper_impl_t;
/******************** Macro ***************************************************/
-#define AXIS2_INTF_TO_IMPL(builder_helper) ((axis2_soap12_builder_helper_impl_t*)builder_helper)
+#define AXIS2_INTF_TO_IMPL(builder_helper) ((axiom_soap12_builder_helper_impl_t*)builder_helper)
/******************** function prototypes *************************************/
axis2_status_t AXIS2_CALL
-axis2_soap12_builder_helper_free(axis2_soap12_builder_helper_t *builder_helper,
+axiom_soap12_builder_helper_free(axiom_soap12_builder_helper_t *builder_helper,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_soap12_builder_helper_handle_event
- (axis2_soap12_builder_helper_t *builder_helper,
+axiom_soap12_builder_helper_handle_event
+ (axiom_soap12_builder_helper_t *builder_helper,
const axis2_env_t *env,
axiom_node_t *om_element_node,
int element_level);
/******************** function implementations ********************************/
-AXIS2_EXTERN axis2_soap12_builder_helper_t* AXIS2_CALL
-axis2_soap12_builder_helper_create(const axis2_env_t *env,
- axis2_soap_builder_t *soap_builder)
+AXIS2_EXTERN axiom_soap12_builder_helper_t* AXIS2_CALL
+axiom_soap12_builder_helper_create(const axis2_env_t *env,
+ axiom_soap_builder_t *soap_builder)
{
- axis2_soap12_builder_helper_impl_t *builder_helper_impl = NULL;
+ axiom_soap12_builder_helper_impl_t *builder_helper_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, soap_builder, NULL);
- builder_helper_impl = (axis2_soap12_builder_helper_impl_t*)AXIS2_MALLOC(
- env->allocator, sizeof(axis2_soap12_builder_helper_impl_t));
+ builder_helper_impl = (axiom_soap12_builder_helper_impl_t*)AXIS2_MALLOC(
+ env->allocator, sizeof(axiom_soap12_builder_helper_impl_t));
if(!builder_helper_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -117,8 +117,8 @@
builder_helper_impl->subcode_value_present = AXIS2_FALSE;
builder_helper_impl->builder_helper.ops = NULL;
- builder_helper_impl->builder_helper.ops = (axis2_soap12_builder_helper_ops_t*) AXIS2_MALLOC(
- env->allocator, sizeof(axis2_soap12_builder_helper_ops_t));
+ builder_helper_impl->builder_helper.ops = (axiom_soap12_builder_helper_ops_t*) AXIS2_MALLOC(
+ env->allocator, sizeof(axiom_soap12_builder_helper_ops_t));
if(!(builder_helper_impl->builder_helper.ops))
{
@@ -128,19 +128,19 @@
}
builder_helper_impl->builder_helper.ops->free_fn =
- axis2_soap12_builder_helper_free;
+ axiom_soap12_builder_helper_free;
builder_helper_impl->builder_helper.ops->handle_event =
- axis2_soap12_builder_helper_handle_event;
+ axiom_soap12_builder_helper_handle_event;
return &(builder_helper_impl->builder_helper);
}
axis2_status_t AXIS2_CALL
-axis2_soap12_builder_helper_free(axis2_soap12_builder_helper_t *builder_helper,
+axiom_soap12_builder_helper_free(axiom_soap12_builder_helper_t *builder_helper,
const axis2_env_t *env)
{
- axis2_soap12_builder_helper_impl_t *builder_helper_impl = NULL;
+ axiom_soap12_builder_helper_impl_t *builder_helper_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
builder_helper_impl = AXIS2_INTF_TO_IMPL(builder_helper);
@@ -161,19 +161,19 @@
}
axis2_status_t AXIS2_CALL
-axis2_soap12_builder_helper_handle_event (axis2_soap12_builder_helper_t *builder_helper,
+axiom_soap12_builder_helper_handle_event (axiom_soap12_builder_helper_t *builder_helper,
const axis2_env_t *env,
axiom_node_t *om_ele_node,
int element_level)
{
- axis2_soap12_builder_helper_impl_t *builder_helper_impl = NULL;
+ axiom_soap12_builder_helper_impl_t *builder_helper_impl = NULL;
axis2_char_t* ele_localname = NULL;
axiom_element_t *om_ele = NULL;
- axis2_soap_body_t *soap_body = NULL;
- axis2_soap_fault_t *soap_fault = NULL;
- axis2_soap_envelope_t *soap_envelope = NULL;
+ axiom_soap_body_t *soap_body = NULL;
+ axiom_soap_fault_t *soap_fault = NULL;
+ axiom_soap_envelope_t *soap_envelope = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_ele_node, AXIS2_FAILURE);
@@ -187,21 +187,21 @@
if(!ele_localname)
return AXIS2_FAILURE;
- soap_envelope = AXIS2_SOAP_BUILDER_GET_SOAP_ENVELOPE(builder_helper_impl->soap_builder, env);
+ soap_envelope = AXIOM_SOAP_BUILDER_GET_SOAP_ENVELOPE(builder_helper_impl->soap_builder, env);
if(!soap_envelope)
return AXIS2_FAILURE;
- soap_body = AXIS2_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+ soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
if(!soap_body)
return AXIS2_FAILURE;
- soap_fault = AXIS2_SOAP_BODY_GET_FAULT(soap_body, env);
+ soap_fault = AXIOM_SOAP_BODY_GET_FAULT(soap_body, env);
if(!soap_fault)
return AXIS2_FAILURE;
if(element_level == 4)
{
- if(AXIS2_STRCMP(AXIS2_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME, ele_localname) == 0)
+ if(AXIS2_STRCMP(AXIOM_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME, ele_localname) == 0)
{
if(builder_helper_impl->code_present)
{
@@ -210,24 +210,24 @@
return AXIS2_FAILURE;
}else
{
- axis2_soap_fault_code_t* soap_fault_code = NULL;
- soap_fault_code = axis2_soap_fault_code_create(env);
+ axiom_soap_fault_code_t* soap_fault_code = NULL;
+ soap_fault_code = axiom_soap_fault_code_create(env);
if(!soap_fault_code)
return AXIS2_FAILURE;
- axis2_soap_fault_code_set_base_node (soap_fault_code , env, om_ele_node);
+ axiom_soap_fault_code_set_base_node (soap_fault_code , env, om_ele_node);
- axis2_soap_fault_code_set_builder(soap_fault_code, env,
+ axiom_soap_fault_code_set_builder(soap_fault_code, env,
builder_helper_impl->soap_builder);
- axis2_soap_fault_set_code (soap_fault, env, soap_fault_code);
+ axiom_soap_fault_set_code (soap_fault, env, soap_fault_code);
builder_helper_impl->code_present = AXIS2_TRUE;
builder_helper_impl->code_processing = AXIS2_TRUE;
}
}
- else if(AXIS2_STRCMP(AXIS2_SOAP12_SOAP_FAULT_REASON_LOCAL_NAME, ele_localname) == 0)
+ else if(AXIS2_STRCMP(AXIOM_SOAP12_SOAP_FAULT_REASON_LOCAL_NAME, ele_localname) == 0)
{
if(!(builder_helper_impl->code_processing) && !(builder_helper_impl->sub_code_processing))
{
@@ -242,16 +242,16 @@
}
else
{
- axis2_soap_fault_reason_t *fault_reason = NULL;
- fault_reason = axis2_soap_fault_reason_create(env);
+ axiom_soap_fault_reason_t *fault_reason = NULL;
+ fault_reason = axiom_soap_fault_reason_create(env);
if(!fault_reason)
return AXIS2_FAILURE;
- axis2_soap_fault_reason_set_base_node (fault_reason, env, om_ele_node);
+ axiom_soap_fault_reason_set_base_node (fault_reason, env, om_ele_node);
- axis2_soap_fault_set_reason (soap_fault, env, fault_reason);
+ axiom_soap_fault_set_reason (soap_fault, env, fault_reason);
- axis2_soap_fault_reason_set_builder (fault_reason , env,
+ axiom_soap_fault_reason_set_builder (fault_reason , env,
builder_helper_impl->soap_builder);
builder_helper_impl->reason_present = AXIS2_TRUE;
@@ -281,7 +281,7 @@
}
}
}
- else if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP12_SOAP_FAULT_NODE_LOCAL_NAME) == 0)
+ else if(AXIS2_STRCMP(ele_localname, AXIOM_SOAP12_SOAP_FAULT_NODE_LOCAL_NAME) == 0)
{
if(!(builder_helper_impl->reason_processing))
{
@@ -297,14 +297,14 @@
}
else
{
- axis2_soap_fault_node_t *soap_fault_node = NULL;
- soap_fault_node = axis2_soap_fault_node_create(env);
+ axiom_soap_fault_node_t *soap_fault_node = NULL;
+ soap_fault_node = axiom_soap_fault_node_create(env);
if(!soap_fault_node)
return AXIS2_FAILURE;
- axis2_soap_fault_node_set_base_node (soap_fault_node, env, om_ele_node);
+ axiom_soap_fault_node_set_base_node (soap_fault_node, env, om_ele_node);
- axis2_soap_fault_set_node (soap_fault, env, soap_fault_node);
+ axiom_soap_fault_set_node (soap_fault, env, soap_fault_node);
builder_helper_impl->node_present = AXIS2_TRUE;
}
@@ -325,7 +325,7 @@
}
}
- else if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME) == 0)
+ else if(AXIS2_STRCMP(ele_localname, AXIOM_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME) == 0)
{
if(!(builder_helper_impl->reason_processing))
{
@@ -340,14 +340,14 @@
}
else
{
- axis2_soap_fault_role_t *soap_fault_role = NULL;
- soap_fault_role = axis2_soap_fault_role_create(env);
+ axiom_soap_fault_role_t *soap_fault_role = NULL;
+ soap_fault_role = axiom_soap_fault_role_create(env);
if(!soap_fault_role)
return AXIS2_FAILURE;
- axis2_soap_fault_role_set_base_node(soap_fault_role, env, om_ele_node);
+ axiom_soap_fault_role_set_base_node(soap_fault_role, env, om_ele_node);
- axis2_soap_fault_set_role (soap_fault, env, soap_fault_role);
+ axiom_soap_fault_set_role (soap_fault, env, soap_fault_role);
builder_helper_impl->role_present = AXIS2_TRUE;
}
}
@@ -365,7 +365,7 @@
return AXIS2_FAILURE;
}
}
- else if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME) == 0)
+ else if(AXIS2_STRCMP(ele_localname, AXIOM_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME) == 0)
{
if(!(builder_helper_impl->reason_processing))
{
@@ -380,14 +380,14 @@
else
{
- axis2_soap_fault_detail_t *soap_fault_detail = NULL;
- soap_fault_detail = axis2_soap_fault_detail_create(env);
+ axiom_soap_fault_detail_t *soap_fault_detail = NULL;
+ soap_fault_detail = axiom_soap_fault_detail_create(env);
if(!soap_fault_detail)
return AXIS2_FAILURE;
- axis2_soap_fault_detail_set_base_node (soap_fault_detail, env, om_ele_node);
+ axiom_soap_fault_detail_set_base_node (soap_fault_detail, env, om_ele_node);
- axis2_soap_fault_set_detail (soap_fault, env, soap_fault_detail);
+ axiom_soap_fault_set_detail (soap_fault, env, soap_fault_detail);
builder_helper_impl->detail_present = AXIS2_TRUE;
}
}
@@ -432,26 +432,26 @@
return AXIS2_FAILURE;
if(AXIS2_STRCMP(parent_localname,
- AXIS2_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME) == 0)
+ AXIOM_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME) == 0)
{
- if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP12_SOAP_FAULT_VALUE_LOCAL_NAME) == 0)
+ if(AXIS2_STRCMP(ele_localname, AXIOM_SOAP12_SOAP_FAULT_VALUE_LOCAL_NAME) == 0)
{
if(!(builder_helper_impl->value_present))
{
- axis2_soap_fault_value_t *soap_fault_value = NULL;
- axis2_soap_fault_code_t *parent_fcode = NULL;
+ axiom_soap_fault_value_t *soap_fault_value = NULL;
+ axiom_soap_fault_code_t *parent_fcode = NULL;
- soap_fault_value = axis2_soap_fault_value_create(env);
+ soap_fault_value = axiom_soap_fault_value_create(env);
if(!soap_fault_value)
return AXIS2_FAILURE;
- axis2_soap_fault_value_set_base_node (soap_fault_value, env, om_ele_node);
+ axiom_soap_fault_value_set_base_node (soap_fault_value, env, om_ele_node);
- parent_fcode = AXIS2_SOAP_FAULT_GET_CODE(soap_fault, env);
+ parent_fcode = AXIOM_SOAP_FAULT_GET_CODE(soap_fault, env);
if(!parent_fcode)
return AXIS2_FAILURE;
- axis2_soap_fault_code_set_value (parent_fcode, env, soap_fault_value);
+ axiom_soap_fault_code_set_value (parent_fcode, env, soap_fault_value);
builder_helper_impl->value_present = AXIS2_TRUE;
builder_helper_impl->code_processing = AXIS2_FALSE;
@@ -465,30 +465,30 @@
}
}
else if(AXIS2_STRCMP(ele_localname,
- AXIS2_SOAP12_SOAP_FAULT_SUB_CODE_LOCAL_NAME) == 0)
+ AXIOM_SOAP12_SOAP_FAULT_SUB_CODE_LOCAL_NAME) == 0)
{
if(!(builder_helper_impl->sub_code_present))
{
if(builder_helper_impl->value_present)
{
- axis2_soap_fault_sub_code_t *fault_subcode = NULL;
- axis2_soap_fault_code_t *fault_code = NULL;
+ axiom_soap_fault_sub_code_t *fault_subcode = NULL;
+ axiom_soap_fault_code_t *fault_code = NULL;
- fault_subcode = axis2_soap_fault_sub_code_create(env);
+ fault_subcode = axiom_soap_fault_sub_code_create(env);
if(!fault_subcode)
return AXIS2_FAILURE;
- axis2_soap_fault_sub_code_set_base_node(fault_subcode, env, om_ele_node);
+ axiom_soap_fault_sub_code_set_base_node(fault_subcode, env, om_ele_node);
- fault_code = AXIS2_SOAP_FAULT_GET_CODE(soap_fault, env);
+ fault_code = AXIOM_SOAP_FAULT_GET_CODE(soap_fault, env);
if(!fault_code)
return AXIS2_FAILURE;
- axis2_soap_fault_code_set_sub_code (fault_code, env, fault_subcode);
+ axiom_soap_fault_code_set_sub_code (fault_code, env, fault_subcode);
- axis2_soap_fault_sub_code_set_builder(fault_subcode, env,
+ axiom_soap_fault_sub_code_set_builder(fault_subcode, env,
builder_helper_impl->soap_builder);
builder_helper_impl->sub_code_present = AXIS2_TRUE;
@@ -514,30 +514,30 @@
return AXIS2_FAILURE;
}
}
- else if(AXIS2_STRCMP(parent_localname, AXIS2_SOAP12_SOAP_FAULT_REASON_LOCAL_NAME) == 0)
+ else if(AXIS2_STRCMP(parent_localname, AXIOM_SOAP12_SOAP_FAULT_REASON_LOCAL_NAME) == 0)
{
- if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP12_SOAP_FAULT_TEXT_LOCAL_NAME) == 0)
+ if(AXIS2_STRCMP(ele_localname, AXIOM_SOAP12_SOAP_FAULT_TEXT_LOCAL_NAME) == 0)
{
- axis2_soap_fault_text_t *soap_fault_text = NULL;
- axis2_soap_fault_reason_t *fault_reason = NULL;
+ axiom_soap_fault_text_t *soap_fault_text = NULL;
+ axiom_soap_fault_reason_t *fault_reason = NULL;
- soap_fault_text = axis2_soap_fault_text_create(env);
+ soap_fault_text = axiom_soap_fault_text_create(env);
if(!soap_fault_text)
return AXIS2_FAILURE;
- axis2_soap_fault_text_set_base_node(soap_fault_text, env, om_ele_node);
+ axiom_soap_fault_text_set_base_node(soap_fault_text, env, om_ele_node);
- fault_reason = AXIS2_SOAP_FAULT_GET_REASON(soap_fault, env);
+ fault_reason = AXIOM_SOAP_FAULT_GET_REASON(soap_fault, env);
if(!fault_reason)
return AXIS2_FAILURE;
- AXIS2_SOAP_FAULT_REASON_ADD_SOAP_FAULT_TEXT (fault_reason, env, soap_fault_text);
+ AXIOM_SOAP_FAULT_REASON_ADD_SOAP_FAULT_TEXT (fault_reason, env, soap_fault_text);
/*****************
AXIOM_NODE_SET_BUILD_STATUS(om_ele_node, env, AXIS2_FALSE);
******************/
builder_helper_impl->reason_processing = AXIS2_FALSE;
- AXIS2_SOAP_BUILDER_SET_BOOL_PROCESSING_MANDATORY_FAULT_ELEMENTS(builder_helper_impl->soap_builder, env, AXIS2_FALSE );
+ AXIOM_SOAP_BUILDER_SET_BOOL_PROCESSING_MANDATORY_FAULT_ELEMENTS(builder_helper_impl->soap_builder, env, AXIS2_FALSE );
}
else
@@ -546,9 +546,9 @@
return AXIS2_FAILURE;
}
- }else if(AXIS2_STRCMP(parent_localname, AXIS2_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME) == 0)
+ }else if(AXIS2_STRCMP(parent_localname, AXIOM_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME) == 0)
{
- AXIS2_SOAP_BUILDER_SET_PROCESSING_DETAIL_ELEMENTS(builder_helper_impl->soap_builder, env, AXIS2_TRUE);
+ AXIOM_SOAP_BUILDER_SET_PROCESSING_DETAIL_ELEMENTS(builder_helper_impl->soap_builder, env, AXIS2_TRUE);
if(!(builder_helper_impl->detail_element_names))
{
@@ -584,9 +584,9 @@
- if(AXIS2_STRCMP(parent_localname, AXIS2_SOAP12_SOAP_FAULT_SUB_CODE_LOCAL_NAME) == 0)
+ if(AXIS2_STRCMP(parent_localname, AXIOM_SOAP12_SOAP_FAULT_SUB_CODE_LOCAL_NAME) == 0)
{
- if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP12_SOAP_FAULT_VALUE_LOCAL_NAME) == 0)
+ if(AXIS2_STRCMP(ele_localname, AXIOM_SOAP12_SOAP_FAULT_VALUE_LOCAL_NAME) == 0)
{
if(builder_helper_impl->subcode_value_present)
{
@@ -596,10 +596,10 @@
else
{
- axis2_soap_fault_sub_code_t *sub_code = NULL;
- axis2_soap_fault_code_t *code = NULL;
- axis2_soap_fault_value_t *value = NULL;
- code = AXIS2_SOAP_FAULT_GET_CODE(soap_fault, env);
+ axiom_soap_fault_sub_code_t *sub_code = NULL;
+ axiom_soap_fault_code_t *code = NULL;
+ axiom_soap_fault_value_t *value = NULL;
+ code = AXIOM_SOAP_FAULT_GET_CODE(soap_fault, env);
if(!code)
{
@@ -607,55 +607,55 @@
return AXIS2_FAILURE;
}
- sub_code = AXIS2_SOAP_FAULT_CODE_GET_SUB_CODE(code, env);
+ sub_code = AXIOM_SOAP_FAULT_CODE_GET_SUB_CODE(code, env);
if(!sub_code)
{
AXIS2_LOG_DEBUG(env->log , AXIS2_LOG_SI, "fault subcode null when it should not be null");
return AXIS2_FAILURE;
}
- value = axis2_soap_fault_value_create(env);
+ value = axiom_soap_fault_value_create(env);
if(!value)
return AXIS2_FAILURE;
- axis2_soap_fault_value_set_base_node (value, env, om_ele_node);
+ axiom_soap_fault_value_set_base_node (value, env, om_ele_node);
- axis2_soap_fault_sub_code_set_value (sub_code, env, value);
+ axiom_soap_fault_sub_code_set_value (sub_code, env, value);
builder_helper_impl->subcode_value_present = AXIS2_TRUE;
builder_helper_impl->sub_sub_code_present = AXIS2_FALSE;
builder_helper_impl->sub_code_processing = AXIS2_FALSE;
}
}
- else if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP12_SOAP_FAULT_SUB_CODE_LOCAL_NAME) == 0)
+ else if(AXIS2_STRCMP(ele_localname, AXIOM_SOAP12_SOAP_FAULT_SUB_CODE_LOCAL_NAME) == 0)
{
if(builder_helper_impl->subcode_value_present)
{
if(!(builder_helper_impl->sub_sub_code_present))
{
- axis2_soap_fault_code_t *fault_code = NULL;
- axis2_soap_fault_sub_code_t *parent_subcode = NULL;
- axis2_soap_fault_sub_code_t *subcode = NULL;
+ axiom_soap_fault_code_t *fault_code = NULL;
+ axiom_soap_fault_sub_code_t *parent_subcode = NULL;
+ axiom_soap_fault_sub_code_t *subcode = NULL;
- subcode = axis2_soap_fault_sub_code_create(env);
+ subcode = axiom_soap_fault_sub_code_create(env);
if(!subcode)
return AXIS2_FAILURE;
- axis2_soap_fault_sub_code_set_base_node(subcode, env, om_ele_node);
+ axiom_soap_fault_sub_code_set_base_node(subcode, env, om_ele_node);
- fault_code = AXIS2_SOAP_FAULT_GET_CODE(soap_fault, env);
+ fault_code = AXIOM_SOAP_FAULT_GET_CODE(soap_fault, env);
if(!fault_code)
{
AXIS2_LOG_DEBUG(env->log , AXIS2_LOG_SI, "fault code null when it should not be null");
return AXIS2_FAILURE;
}
- parent_subcode = AXIS2_SOAP_FAULT_CODE_GET_SUB_CODE(fault_code, env);
+ parent_subcode = AXIOM_SOAP_FAULT_CODE_GET_SUB_CODE(fault_code, env);
if(!parent_subcode)
{
AXIS2_LOG_DEBUG(env->log , AXIS2_LOG_SI, "fault subcode null when it should not be null");
return AXIS2_FAILURE;
}
- axis2_soap_fault_sub_code_set_sub_code (parent_subcode, env, subcode);
+ axiom_soap_fault_sub_code_set_sub_code (parent_subcode, env, subcode);
builder_helper_impl->subcode_value_present = AXIS2_FALSE;
builder_helper_impl->sub_sub_code_present = AXIS2_TRUE;
@@ -683,7 +683,7 @@
return AXIS2_FAILURE;
}
}
- else if(AXIS2_SOAP_BUILDER_IS_PROCESSING_DETAIL_ELEMENTS(builder_helper_impl->soap_builder, env))
+ else if(AXIOM_SOAP_BUILDER_IS_PROCESSING_DETAIL_ELEMENTS(builder_helper_impl->soap_builder, env))
{
int detail_element_level = 0;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_body.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_body.c?rev=413641&r1=413640&r2=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_body.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_body.c Mon Jun 12 04:55:38 2006
@@ -14,84 +14,84 @@
* limitations under the License.
*/
- #include "_axis2_soap_envelope.h"
- #include "_axis2_soap_body.h"
+ #include "_axiom_soap_envelope.h"
+ #include "_axiom_soap_body.h"
#include <axis2_hash.h>
- #include <axis2_soap_const.h>
- #include <axis2_soap_builder.h>
+ #include <axiom_soap_const.h>
+ #include <axiom_soap_builder.h>
/******************* impl struct ****************************************/
-typedef struct axis2_soap_body_impl_t
+typedef struct axiom_soap_body_impl_t
{
- axis2_soap_body_t soap_body;
+ axiom_soap_body_t soap_body;
axiom_node_t *om_ele_node;
axis2_bool_t has_fault;
- axis2_soap_fault_t *soap_fault;
+ axiom_soap_fault_t *soap_fault;
- axis2_soap_builder_t *soap_builder;
+ axiom_soap_builder_t *soap_builder;
int soap_version;
- }axis2_soap_body_impl_t;
+ }axiom_soap_body_impl_t;
/****************** Macro ****************************************************/
- #define AXIS2_INTF_TO_IMPL(body) ((axis2_soap_body_impl_t*)body)
+ #define AXIS2_INTF_TO_IMPL(body) ((axiom_soap_body_impl_t*)body)
/****************** Function prototypes **************************************/
axis2_status_t AXIS2_CALL
-axis2_soap_body_free(axis2_soap_body_t *body,
+axiom_soap_body_free(axiom_soap_body_t *body,
const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
-axis2_soap_body_has_fault(axis2_soap_body_t *body,
+axiom_soap_body_has_fault(axiom_soap_body_t *body,
const axis2_env_t *env);
-axis2_soap_fault_t* AXIS2_CALL
-axis2_soap_body_get_fault(axis2_soap_body_t *body,
+axiom_soap_fault_t* AXIS2_CALL
+axiom_soap_body_get_fault(axiom_soap_body_t *body,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_soap_body_add_fault(axis2_soap_body_t *body,
+axiom_soap_body_add_fault(axiom_soap_body_t *body,
const axis2_env_t *env,
- axis2_soap_fault_t *soap_fault);
+ axiom_soap_fault_t *soap_fault);
axiom_node_t* AXIS2_CALL
-axis2_soap_body_get_base_node(axis2_soap_body_t *body,
+axiom_soap_body_get_base_node(axiom_soap_body_t *body,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_soap_body_build(axis2_soap_body_t *body,
+axiom_soap_body_build(axiom_soap_body_t *body,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_soap_body_add_child(axis2_soap_body_t *body,
+axiom_soap_body_add_child(axiom_soap_body_t *body,
const axis2_env_t *env,
axiom_node_t *child);
int AXIS2_CALL
-axis2_soap_body_get_soap_version(axis2_soap_body_t *body,
+axiom_soap_body_get_soap_version(axiom_soap_body_t *body,
const axis2_env_t *env);
/*************** function implementations *************************************/
-axis2_soap_body_t* AXIS2_CALL
-axis2_soap_body_create(const axis2_env_t *env)
+axiom_soap_body_t* AXIS2_CALL
+axiom_soap_body_create(const axis2_env_t *env)
{
- axis2_soap_body_impl_t *body_impl = NULL;
+ axiom_soap_body_impl_t *body_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- body_impl = (axis2_soap_body_impl_t*)AXIS2_MALLOC(
+ body_impl = (axiom_soap_body_impl_t*)AXIS2_MALLOC(
env->allocator,
- sizeof(axis2_soap_body_impl_t));
+ sizeof(axiom_soap_body_impl_t));
if(!body_impl)
{
@@ -104,8 +104,8 @@
body_impl->has_fault = AXIS2_FALSE;
body_impl->soap_fault = NULL;
- body_impl->soap_body.ops = (axis2_soap_body_ops_t*) AXIS2_MALLOC(
- env->allocator, sizeof(axis2_soap_body_ops_t));
+ body_impl->soap_body.ops = (axiom_soap_body_ops_t*) AXIS2_MALLOC(
+ env->allocator, sizeof(axiom_soap_body_ops_t));
if(!(body_impl->soap_body.ops))
{
@@ -116,25 +116,25 @@
}
body_impl->soap_body.ops->free =
- axis2_soap_body_free;
+ axiom_soap_body_free;
body_impl->soap_body.ops->has_fault =
- axis2_soap_body_has_fault;
+ axiom_soap_body_has_fault;
body_impl->soap_body.ops->get_fault =
- axis2_soap_body_get_fault;
+ axiom_soap_body_get_fault;
body_impl->soap_body.ops->get_base_node =
- axis2_soap_body_get_base_node;
+ axiom_soap_body_get_base_node;
body_impl->soap_body.ops->build =
- axis2_soap_body_build;
+ axiom_soap_body_build;
body_impl->soap_body.ops->add_child =
- axis2_soap_body_add_child;
+ axiom_soap_body_add_child;
body_impl->soap_body.ops->get_soap_version =
- axis2_soap_body_get_soap_version;
+ axiom_soap_body_get_soap_version;
return &(body_impl->soap_body);
@@ -143,12 +143,12 @@
-axis2_soap_body_t* AXIS2_CALL
-axis2_soap_body_create_with_parent(const axis2_env_t *env,
- axis2_soap_envelope_t *envelope)
+axiom_soap_body_t* AXIS2_CALL
+axiom_soap_body_create_with_parent(const axis2_env_t *env,
+ axiom_soap_envelope_t *envelope)
{
- axis2_soap_body_impl_t *body_impl = NULL;
- axis2_soap_body_t *body = NULL;
+ axiom_soap_body_impl_t *body_impl = NULL;
+ axiom_soap_body_t *body = NULL;
axiom_element_t *ele = NULL;
axiom_node_t *parent_node = NULL;
axiom_element_t *parent_ele = NULL;
@@ -157,7 +157,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, envelope, NULL);
- body = axis2_soap_body_create(env);
+ body = axiom_soap_body_create(env);
if(!body)
{
return NULL;
@@ -166,10 +166,10 @@
/*get parent node from SOAP envelope */
- parent_node = AXIS2_SOAP_ENVELOPE_GET_BASE_NODE(envelope, env);
+ parent_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(envelope, env);
if(!parent_node)
{
- AXIS2_SOAP_BODY_FREE(body, env);
+ AXIOM_SOAP_BODY_FREE(body, env);
return NULL;
}
parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
@@ -177,31 +177,31 @@
if(!parent_ele)
{
- AXIS2_SOAP_BODY_FREE(body, env);
+ AXIOM_SOAP_BODY_FREE(body, env);
return NULL;
}
om_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
ele = axiom_element_create(env, parent_node,
- AXIS2_SOAP_BODY_LOCAL_NAME, om_ns,
+ AXIOM_SOAP_BODY_LOCAL_NAME, om_ns,
&(body_impl->om_ele_node));
if (!ele)
{
- axis2_soap_body_free(body, env);
+ axiom_soap_body_free(body, env);
return NULL;
}
- axis2_soap_envelope_set_body (envelope, env, &(body_impl->soap_body));
+ axiom_soap_envelope_set_body (envelope, env, &(body_impl->soap_body));
return &(body_impl->soap_body);
}
axis2_status_t AXIS2_CALL
-axis2_soap_body_free(axis2_soap_body_t *body,
+axiom_soap_body_free(axiom_soap_body_t *body,
const axis2_env_t *env)
{
- axis2_soap_body_impl_t *body_impl = NULL;
+ axiom_soap_body_impl_t *body_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, body, AXIS2_FAILURE);
@@ -209,7 +209,7 @@
if(NULL != body_impl->soap_fault)
{
- AXIS2_SOAP_FAULT_FREE(body_impl->soap_fault, env);
+ AXIOM_SOAP_FAULT_FREE(body_impl->soap_fault, env);
body_impl->soap_fault = NULL;
}
if(NULL != body->ops)
@@ -230,10 +230,10 @@
* this <code>SOAPBody</code> object; <code>false</code>
* otherwise
*/
-axis2_bool_t AXIS2_CALL axis2_soap_body_has_fault(axis2_soap_body_t *body,
+axis2_bool_t AXIS2_CALL axiom_soap_body_has_fault(axiom_soap_body_t *body,
const axis2_env_t *env)
{
- axis2_soap_body_impl_t *body_impl = NULL;
+ axiom_soap_body_impl_t *body_impl = NULL;
int status = AXIS2_SUCCESS;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
body_impl = AXIS2_INTF_TO_IMPL(body);
@@ -247,7 +247,7 @@
{
while(!(body_impl->soap_fault) && !(AXIOM_NODE_IS_COMPLETE(body_impl->om_ele_node, env)))
{
- status = AXIS2_SOAP_BUILDER_NEXT(body_impl->soap_builder, env);
+ status = AXIOM_SOAP_BUILDER_NEXT(body_impl->soap_builder, env);
if(status == AXIS2_FAILURE)
return AXIS2_FALSE;
}
@@ -263,17 +263,17 @@
}
/**
- * Returns the axis2_soap_fault_t struct in this axis2_soap_bodY_t
+ * Returns the axiom_soap_fault_t struct in this axiom_soap_bodY_t
* struct
*
* @return the <code>SOAPFault</code> object in this <code>SOAPBody</code>
* object
*/
-axis2_soap_fault_t* AXIS2_CALL
-axis2_soap_body_get_fault(axis2_soap_body_t *body,
+axiom_soap_fault_t* AXIS2_CALL
+axiom_soap_body_get_fault(axiom_soap_body_t *body,
const axis2_env_t *env)
{
- axis2_soap_body_impl_t *body_impl = NULL;
+ axiom_soap_body_impl_t *body_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
body_impl = AXIS2_INTF_TO_IMPL(body);
if(NULL != body_impl->soap_fault)
@@ -285,7 +285,7 @@
while(!(body_impl->soap_fault) && !(AXIOM_NODE_IS_COMPLETE(body_impl->om_ele_node, env)))
{
int status = AXIS2_SUCCESS;
- status = AXIS2_SOAP_BUILDER_NEXT(body_impl->soap_builder, env);
+ status = AXIOM_SOAP_BUILDER_NEXT(body_impl->soap_builder, env);
if(status == AXIS2_FAILURE)
return NULL;
}
@@ -302,11 +302,11 @@
* @param soapFault
*
axis2_status_t AXIS2_CALL
-axis2_soap_body_add_fault(axis2_soap_body_t *body,
+axiom_soap_body_add_fault(axiom_soap_body_t *body,
const axis2_env_t *env,
- axis2_soap_fault_t *soap_fault)
+ axiom_soap_fault_t *soap_fault)
{
- axis2_soap_body_impl_t *body_impl = NULL;
+ axiom_soap_body_impl_t *body_impl = NULL;
axiom_node_t *fault_node = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_fault, AXIS2_FAILURE);
@@ -318,7 +318,7 @@
AXIS2_ERROR_ONLY_ONE_SOAP_FAULT_ALLOWED_IN_BODY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- fault_node = AXIS2_SOAP_FAULT_GET_BASE_NODE(soap_fault, env);
+ fault_node = AXIOM_SOAP_FAULT_GET_BASE_NODE(soap_fault, env);
if(fault_node)
{
body_impl->soap_fault = soap_fault;
@@ -331,7 +331,7 @@
*/
axiom_node_t* AXIS2_CALL
-axis2_soap_body_get_base_node(axis2_soap_body_t *body,
+axiom_soap_body_get_base_node(axiom_soap_body_t *body,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -339,11 +339,11 @@
}
axis2_status_t AXIS2_CALL
-axis2_soap_body_set_base_node(axis2_soap_body_t *body,
+axiom_soap_body_set_base_node(axiom_soap_body_t *body,
const axis2_env_t *env,
axiom_node_t *node)
{
- axis2_soap_body_impl_t *body_impl = NULL;
+ axiom_soap_body_impl_t *body_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
body_impl = AXIS2_INTF_TO_IMPL(body);
@@ -358,11 +358,11 @@
axis2_status_t AXIS2_CALL
-axis2_soap_body_set_builder(axis2_soap_body_t *body,
+axiom_soap_body_set_builder(axiom_soap_body_t *body,
const axis2_env_t *env,
- axis2_soap_builder_t *builder)
+ axiom_soap_builder_t *builder)
{
- axis2_soap_body_impl_t *body_impl = NULL;
+ axiom_soap_body_impl_t *body_impl = NULL;
AXIS2_PARAM_CHECK(env->error, builder, AXIS2_FAILURE);
body_impl = AXIS2_INTF_TO_IMPL(body);
body_impl->soap_builder = builder;
@@ -371,10 +371,10 @@
axis2_status_t AXIS2_CALL
-axis2_soap_body_build(axis2_soap_body_t *body,
+axiom_soap_body_build(axiom_soap_body_t *body,
const axis2_env_t *env)
{
- axis2_soap_body_impl_t *soap_body_impl = NULL;
+ axiom_soap_body_impl_t *soap_body_impl = NULL;
int status = AXIS2_SUCCESS;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
soap_body_impl = AXIS2_INTF_TO_IMPL(body);
@@ -382,7 +382,7 @@
{
while(AXIOM_NODE_IS_COMPLETE(soap_body_impl->om_ele_node, env) != AXIS2_TRUE)
{
- status = AXIS2_SOAP_BUILDER_NEXT(soap_body_impl->soap_builder, env);
+ status = AXIOM_SOAP_BUILDER_NEXT(soap_body_impl->soap_builder, env);
if(status == AXIS2_FAILURE)
return AXIS2_FAILURE;
}
@@ -395,11 +395,11 @@
*/
axis2_status_t AXIS2_CALL
-axis2_soap_body_set_fault(axis2_soap_body_t *body,
+axiom_soap_body_set_fault(axiom_soap_body_t *body,
const axis2_env_t *env,
- axis2_soap_fault_t *soap_fault)
+ axiom_soap_fault_t *soap_fault)
{
- axis2_soap_body_impl_t *body_impl = NULL;
+ axiom_soap_body_impl_t *body_impl = NULL;
AXIS2_PARAM_CHECK(env->error, soap_fault, AXIS2_FAILURE);
body_impl = AXIS2_INTF_TO_IMPL(body);
if (NULL != body_impl->soap_fault)
@@ -417,11 +417,11 @@
}
axis2_status_t AXIS2_CALL
-axis2_soap_body_add_child(axis2_soap_body_t *body,
+axiom_soap_body_add_child(axiom_soap_body_t *body,
const axis2_env_t *env,
axiom_node_t *child)
{
- axis2_soap_body_impl_t *body_impl = NULL;
+ axiom_soap_body_impl_t *body_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, child, AXIS2_FAILURE);
@@ -433,10 +433,10 @@
return AXIS2_FAILURE;
}
int AXIS2_CALL
-axis2_soap_body_get_soap_version(axis2_soap_body_t *body,
+axiom_soap_body_get_soap_version(axiom_soap_body_t *body,
const axis2_env_t *env)
{
- axis2_soap_body_impl_t *body_impl = NULL;
+ axiom_soap_body_impl_t *body_impl = NULL;
axiom_element_t *body_ele = NULL;
axiom_namespace_t *om_ns = NULL;
axis2_char_t *uri = NULL;
@@ -453,10 +453,10 @@
uri = AXIOM_NAMESPACE_GET_URI(om_ns, env);
if(NULL != uri)
{
- if(AXIS2_STRCMP(uri, AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
- return AXIS2_SOAP11;
- else if(AXIS2_STRCMP(uri, AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
- return AXIS2_SOAP12;
+ if(AXIS2_STRCMP(uri, AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
+ return AXIOM_SOAP11;
+ else if(AXIS2_STRCMP(uri, AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
+ return AXIOM_SOAP12;
}
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c?rev=413641&r1=413640&r2=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c Mon Jun 12 04:55:38 2006
@@ -14,28 +14,28 @@
* limitations under the License.
*/
- #include <axis2_soap_builder.h>
- #include <axis2_soap_message.h>
- #include "_axis2_soap_envelope.h"
- #include "_axis2_soap_header.h"
- #include "axis2_soap11_builder_helper.h"
- #include "axis2_soap12_builder_helper.h"
- #include <axis2_soap_const.h>
- #include "_axis2_soap_body.h"
- #include "_axis2_soap_header_block.h"
+ #include <axiom_soap_builder.h>
+ #include <axiom_soap_message.h>
+ #include "_axiom_soap_envelope.h"
+ #include "_axiom_soap_header.h"
+ #include "axiom_soap11_builder_helper.h"
+ #include "axiom_soap12_builder_helper.h"
+ #include <axiom_soap_const.h>
+ #include "_axiom_soap_body.h"
+ #include "_axiom_soap_header_block.h"
#include <axiom_stax_builder_internal.h>
- #include "_axis2_soap_fault.h"
+ #include "_axiom_soap_fault.h"
/*********************** impl struct *****************************************/
- typedef struct axis2_soap_builder_impl_t
+ typedef struct axiom_soap_builder_impl_t
{
- axis2_soap_builder_t soap_builder;
+ axiom_soap_builder_t soap_builder;
axiom_stax_builder_t *om_builder;
- axis2_soap_message_t *soap_message;
+ axiom_soap_message_t *soap_message;
- axis2_soap_envelope_t *soap_envelope;
+ axiom_soap_envelope_t *soap_envelope;
axis2_bool_t header_present;
@@ -65,7 +65,7 @@
axis2_hash_t *mime_body_parts;
-}axis2_soap_builder_impl_t;
+}axiom_soap_builder_impl_t;
typedef enum axis2_builder_last_node_states
{
@@ -78,110 +78,110 @@
/***************** Macro ******************************************************/
- #define AXIS2_INTF_TO_IMPL(builder) ((axis2_soap_builder_impl_t*)builder)
+ #define AXIS2_INTF_TO_IMPL(builder) ((axiom_soap_builder_impl_t*)builder)
/**************** function prototypes ****************************************/
axis2_status_t AXIS2_CALL
-axis2_soap_builder_free(axis2_soap_builder_t *builder,
+axiom_soap_builder_free(axiom_soap_builder_t *builder,
const axis2_env_t *env);
-axis2_soap_envelope_t* AXIS2_CALL
-axis2_soap_builder_get_soap_envelope
- (axis2_soap_builder_t *builder,
+axiom_soap_envelope_t* AXIS2_CALL
+axiom_soap_builder_get_soap_envelope
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env);
axiom_document_t* AXIS2_CALL
-axis2_soap_builder_get_document
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_get_document
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_soap_builder_next(axis2_soap_builder_t *builder,
+axiom_soap_builder_next(axiom_soap_builder_t *builder,
const axis2_env_t *env);
axiom_node_t* AXIS2_CALL
-axis2_soap_builder_get_document_element
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_get_document_element
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env);
axis2_status_t
-axis2_soap_builder_create_om_element
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_create_om_element
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axiom_node_t *current_node,
int current_event);
axis2_status_t AXIS2_CALL
-axis2_soap_builder_process_namespace_data
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_process_namespace_data
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axiom_node_t *om_node,
int is_soap_element);
static axis2_status_t
-axis2_soap_builder_identify_soap_version(axis2_soap_builder_t *builder,
+axiom_soap_builder_identify_soap_version(axiom_soap_builder_t *builder,
const axis2_env_t *env,
const axis2_char_t* soap_version_uri_from_transport);
static axis2_status_t
-axis2_soap_builder_construct_node(axis2_soap_builder_t *builder,
+axiom_soap_builder_construct_node(axiom_soap_builder_t *builder,
const axis2_env_t *env,
axiom_node_t *parent,
axiom_node_t *element_node,
axis2_bool_t is_soap_envelope);
static axis2_status_t
-axis2_soap_builder_construct_node_for_empty_element
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_construct_node_for_empty_element
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axiom_node_t *parent,
axiom_node_t *element_node);
static axis2_status_t
-axis2_soap_builder_parse_headers(axis2_soap_builder_t *builder,
+axiom_soap_builder_parse_headers(axiom_soap_builder_t *builder,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_soap_builder_set_bool_processing_mandatory_fault_elements
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_set_bool_processing_mandatory_fault_elements
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axis2_bool_t value);
axis2_status_t AXIS2_CALL
-axis2_soap_builder_set_processing_detail_elements
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_set_processing_detail_elements
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axis2_bool_t value);
axis2_bool_t AXIS2_CALL
-axis2_soap_builder_is_processing_detail_elements
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_is_processing_detail_elements
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env);
int AXIS2_CALL
-axis2_soap_builder_get_soap_version (axis2_soap_builder_t *builder,
+axiom_soap_builder_get_soap_version (axiom_soap_builder_t *builder,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_soap_builder_set_mime_body_parts
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_set_mime_body_parts
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axis2_hash_t *map);
/***************** function implementations ***********************************/
-AXIS2_EXTERN axis2_soap_builder_t * AXIS2_CALL
-axis2_soap_builder_create(const axis2_env_t *env,
+AXIS2_EXTERN axiom_soap_builder_t * AXIS2_CALL
+axiom_soap_builder_create(const axis2_env_t *env,
axiom_stax_builder_t *builder,
const axis2_char_t *soap_version)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
axis2_status_t status = AXIS2_SUCCESS;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, builder, NULL);
- builder_impl = (axis2_soap_builder_impl_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axis2_soap_builder_impl_t));
+ builder_impl = (axiom_soap_builder_impl_t*)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_soap_builder_impl_t));
if(builder_impl == NULL)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -199,7 +199,7 @@
builder_impl->processing_mandatory_fault_elements = AXIS2_FALSE;
builder_impl->receiver_fault_code = NULL;
builder_impl->sender_fault_code = NULL;
- builder_impl->soap_version = AXIS2_SOAP12;
+ builder_impl->soap_version = AXIOM_SOAP12;
builder_impl->soap_builder.ops = NULL;
builder_impl->last_node_status = -1;
builder_impl->envelope_ns = NULL;
@@ -207,8 +207,8 @@
builder_impl->soap_message = NULL;
builder_impl->mime_body_parts = NULL;
- builder_impl->soap_builder.ops = (axis2_soap_builder_ops_t*)
- AXIS2_MALLOC(env->allocator, sizeof(axis2_soap_builder_ops_t));
+ builder_impl->soap_builder.ops = (axiom_soap_builder_ops_t*)
+ AXIS2_MALLOC(env->allocator, sizeof(axiom_soap_builder_ops_t));
if(!(builder_impl->soap_builder.ops))
{
@@ -219,46 +219,46 @@
builder_impl->om_builder = builder;
builder_impl->soap_builder.ops->free =
- axis2_soap_builder_free;
+ axiom_soap_builder_free;
builder_impl->soap_builder.ops->next =
- axis2_soap_builder_next;
+ axiom_soap_builder_next;
builder_impl->soap_builder.ops->get_soap_envelope =
- axis2_soap_builder_get_soap_envelope;
+ axiom_soap_builder_get_soap_envelope;
builder_impl->soap_builder.ops->get_document =
- axis2_soap_builder_get_document;
+ axiom_soap_builder_get_document;
builder_impl->soap_builder.ops->set_bool_processing_mandatory_fault_elements =
- axis2_soap_builder_set_bool_processing_mandatory_fault_elements;
+ axiom_soap_builder_set_bool_processing_mandatory_fault_elements;
builder_impl->soap_builder.ops->set_processing_detail_elements =
- axis2_soap_builder_set_processing_detail_elements;
+ axiom_soap_builder_set_processing_detail_elements;
builder_impl->soap_builder.ops->is_processing_detail_elements =
- axis2_soap_builder_is_processing_detail_elements;
+ axiom_soap_builder_is_processing_detail_elements;
builder_impl->soap_builder.ops->get_soap_version =
- axis2_soap_builder_get_soap_version;
+ axiom_soap_builder_get_soap_version;
builder_impl->soap_builder.ops->process_namespace_data =
- axis2_soap_builder_process_namespace_data;
+ axiom_soap_builder_process_namespace_data;
builder_impl->soap_builder.ops->set_mime_body_parts =
- axis2_soap_builder_set_mime_body_parts;
+ axiom_soap_builder_set_mime_body_parts;
- status = axis2_soap_builder_identify_soap_version(&(builder_impl->soap_builder), env, soap_version);
+ status = axiom_soap_builder_identify_soap_version(&(builder_impl->soap_builder), env, soap_version);
if(status == AXIS2_FAILURE)
{
- axis2_soap_builder_free(&(builder_impl->soap_builder), env);
+ axiom_soap_builder_free(&(builder_impl->soap_builder), env);
return NULL;
}
- status = axis2_soap_builder_parse_headers(&(builder_impl->soap_builder), env);
+ status = axiom_soap_builder_parse_headers(&(builder_impl->soap_builder), env);
if(status == AXIS2_FAILURE)
{
- axis2_soap_builder_free(&(builder_impl->soap_builder), env);
+ axiom_soap_builder_free(&(builder_impl->soap_builder), env);
return NULL;
}
return &(builder_impl->soap_builder);
}
axis2_status_t AXIS2_CALL
-axis2_soap_builder_free(axis2_soap_builder_t *builder,
+axiom_soap_builder_free(axiom_soap_builder_t *builder,
const axis2_env_t *env)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(!builder)
return AXIS2_FAILURE;
@@ -266,14 +266,14 @@
builder_impl = AXIS2_INTF_TO_IMPL(builder);
if(NULL != builder_impl->builder_helper)
{
- if(builder_impl->soap_version == AXIS2_SOAP11 && builder_impl->builder_helper)
+ if(builder_impl->soap_version == AXIOM_SOAP11 && builder_impl->builder_helper)
{
- AXIS2_SOAP11_BUILDER_HELPER_FREE((axis2_soap11_builder_helper_t *)(builder_impl->builder_helper), env);
+ AXIOM_SOAP11_BUILDER_HELPER_FREE((axiom_soap11_builder_helper_t *)(builder_impl->builder_helper), env);
builder_impl->builder_helper = NULL;
}
- else if(builder_impl->soap_version == AXIS2_SOAP12 && builder_impl->builder_helper)
+ else if(builder_impl->soap_version == AXIOM_SOAP12 && builder_impl->builder_helper)
{
- AXIS2_SOAP12_BUILDER_HELPER_FREE((axis2_soap12_builder_helper_t *)(builder_impl->builder_helper), env);
+ AXIOM_SOAP12_BUILDER_HELPER_FREE((axiom_soap12_builder_helper_t *)(builder_impl->builder_helper), env);
builder_impl->builder_helper = NULL;
}
}
@@ -292,12 +292,12 @@
}
-axis2_soap_envelope_t* AXIS2_CALL
-axis2_soap_builder_get_soap_envelope
- (axis2_soap_builder_t *builder,
+axiom_soap_envelope_t* AXIS2_CALL
+axiom_soap_builder_get_soap_envelope
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
int status = AXIS2_SUCCESS ;
AXIS2_ENV_CHECK(env, NULL);
@@ -311,7 +311,7 @@
while(!(builder_impl->soap_envelope) &&
!AXIOM_STAX_BUILDER_IS_COMPLETE(builder_impl->om_builder, env))
{
- status = axis2_soap_builder_next(builder, env);
+ status = axiom_soap_builder_next(builder, env);
if(status == AXIS2_FAILURE)
break;
}
@@ -320,11 +320,11 @@
}
axiom_document_t* AXIS2_CALL
-axis2_soap_builder_get_document
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_get_document
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
if(!builder)
return NULL;
@@ -338,10 +338,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_soap_builder_next(axis2_soap_builder_t *builder,
+axiom_soap_builder_next(axiom_soap_builder_t *builder,
const axis2_env_t *env)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
axiom_node_t *lastnode = NULL;
int current_event = AXIS2_MAX_EVENT;
axiom_node_t *current_node = NULL;
@@ -378,7 +378,7 @@
{
current_node = axiom_stax_builder_get_lastnode(builder_impl->om_builder, env);
if(current_node)
- status = axis2_soap_builder_create_om_element(builder, env, current_node, current_event);
+ status = axiom_soap_builder_create_om_element(builder, env, current_node, current_event);
else
return AXIS2_FAILURE;
}
@@ -387,16 +387,16 @@
}
axiom_node_t* AXIS2_CALL
-axis2_soap_builder_get_document_element
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_get_document_element
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
if(builder_impl->soap_envelope)
{
- return AXIS2_SOAP_ENVELOPE_GET_BASE_NODE(builder_impl->soap_envelope, env);
+ return AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(builder_impl->soap_envelope, env);
}
else
return NULL;
@@ -405,13 +405,13 @@
axis2_status_t
-axis2_soap_builder_create_om_element
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_create_om_element
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axiom_node_t *current_node,
int current_event)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
int ret_val = AXIS2_SUCCESS;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, current_node, AXIS2_FAILURE);
@@ -421,7 +421,7 @@
builder_impl = AXIS2_INTF_TO_IMPL(builder);
if(builder_impl->last_node_status == AXIS2_BUILDER_LAST_NODE_NULL)
{
- ret_val = axis2_soap_builder_construct_node(builder, env, NULL, current_node, AXIS2_TRUE);
+ ret_val = axiom_soap_builder_construct_node(builder, env, NULL, current_node, AXIS2_TRUE);
}
else
{
@@ -435,11 +435,11 @@
builder_impl->om_builder, env);
if(parent_node && element_level == 1 && current_event == AXIS2_XML_READER_EMPTY_ELEMENT)
{
- ret_val = axis2_soap_builder_construct_node_for_empty_element(builder, env, parent_node , current_node);
+ ret_val = axiom_soap_builder_construct_node_for_empty_element(builder, env, parent_node , current_node);
}
else if(parent_node)
{
- ret_val = axis2_soap_builder_construct_node(builder, env, parent_node , current_node, AXIS2_FALSE);
+ ret_val = axiom_soap_builder_construct_node(builder, env, parent_node , current_node, AXIS2_FALSE);
}
else
return AXIS2_FAILURE;
@@ -448,13 +448,13 @@
}
static axis2_status_t
-axis2_soap_builder_construct_node(axis2_soap_builder_t *builder,
+axiom_soap_builder_construct_node(axiom_soap_builder_t *builder,
const axis2_env_t *env,
axiom_node_t *parent,
axiom_node_t *om_element_node,
axis2_bool_t is_soap_envelope)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
axiom_element_t *parent_ele = NULL;
axis2_char_t *parent_localname = NULL;
@@ -544,7 +544,7 @@
if(!parent && is_soap_envelope)
{
/** this is the soap envelope element */
- if(AXIS2_STRCASECMP(ele_localname, AXIS2_SOAP_ENVELOPE_LOCAL_NAME) != 0)
+ if(AXIS2_STRCASECMP(ele_localname, AXIOM_SOAP_ENVELOPE_LOCAL_NAME) != 0)
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_SOAP_MESSAGE_FIRST_ELEMENT_MUST_CONTAIN_LOCAL_NAME, AXIS2_FAILURE);
@@ -552,24 +552,24 @@
}
/** create a null soap envelope struct */
- builder_impl->soap_envelope = axis2_soap_envelope_create_null(env);
+ builder_impl->soap_envelope = axiom_soap_envelope_create_null(env);
if(!builder_impl->soap_envelope)
return AXIS2_FAILURE;
/** wrap this om node in it */
- status = axis2_soap_envelope_set_base_node(builder_impl->soap_envelope,
+ status = axiom_soap_envelope_set_base_node(builder_impl->soap_envelope,
env, om_element_node);
- axis2_soap_envelope_set_builder(builder_impl->soap_envelope, env, builder);
- status = axis2_soap_builder_process_namespace_data(builder, env, om_element_node, AXIS2_TRUE);
+ axiom_soap_envelope_set_builder(builder_impl->soap_envelope, env, builder);
+ status = axiom_soap_builder_process_namespace_data(builder, env, om_element_node, AXIS2_TRUE);
if(status == AXIS2_FAILURE)
return AXIS2_FAILURE;
}
else if(element_level == 2)
{
- if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP_HEADER_LOCAL_NAME) == 0)
+ if(AXIS2_STRCMP(ele_localname, AXIOM_SOAP_HEADER_LOCAL_NAME) == 0)
{
/** this is the soap header element */
- axis2_soap_header_t *soap_header = NULL;
+ axiom_soap_header_t *soap_header = NULL;
if(builder_impl->header_present)
{
AXIS2_ERROR_SET(env->error,
@@ -585,28 +585,28 @@
builder_impl->header_present = AXIS2_TRUE;
- soap_header = axis2_soap_header_create(env);
+ soap_header = axiom_soap_header_create(env);
if(!soap_header)
return AXIS2_FAILURE;
- axis2_soap_header_set_base_node (soap_header, env, om_element_node);
+ axiom_soap_header_set_base_node (soap_header, env, om_element_node);
- axis2_soap_envelope_set_header(builder_impl->soap_envelope, env, soap_header);
+ axiom_soap_envelope_set_header(builder_impl->soap_envelope, env, soap_header);
- axis2_soap_header_set_builder (soap_header, env, builder);
+ axiom_soap_header_set_builder (soap_header, env, builder);
- axis2_soap_header_set_soap_version (soap_header, env, builder_impl->soap_version);
+ axiom_soap_header_set_soap_version (soap_header, env, builder_impl->soap_version);
- status = axis2_soap_builder_process_namespace_data(builder, env,
+ status = axiom_soap_builder_process_namespace_data(builder, env,
om_element_node, AXIS2_TRUE);
if(status == AXIS2_FAILURE)
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP_BODY_LOCAL_NAME) == 0)
+ else if(AXIS2_STRCMP(ele_localname, AXIOM_SOAP_BODY_LOCAL_NAME) == 0)
{
- axis2_soap_body_t *soap_body = NULL;
+ axiom_soap_body_t *soap_body = NULL;
if(builder_impl->body_present)
{
AXIS2_ERROR_SET(env->error,
@@ -616,17 +616,17 @@
}
builder_impl->body_present = AXIS2_TRUE;
- soap_body = axis2_soap_body_create(env);
+ soap_body = axiom_soap_body_create(env);
if(!soap_body)
return AXIS2_FAILURE;
- axis2_soap_body_set_base_node (soap_body, env, om_element_node);
+ axiom_soap_body_set_base_node (soap_body, env, om_element_node);
- axis2_soap_body_set_builder (soap_body, env, builder);
+ axiom_soap_body_set_builder (soap_body, env, builder);
- axis2_soap_envelope_set_body(builder_impl->soap_envelope, env, soap_body);
+ axiom_soap_envelope_set_body(builder_impl->soap_envelope, env, soap_body);
- status = axis2_soap_builder_process_namespace_data(builder, env,
+ status = axiom_soap_builder_process_namespace_data(builder, env,
om_element_node, AXIS2_TRUE);
if(status == AXIS2_FAILURE)
@@ -640,84 +640,84 @@
}
}
else if((element_level == 3) && parent_localname &&
- AXIS2_STRCASECMP(parent_localname, AXIS2_SOAP_HEADER_LOCAL_NAME) == 0)
+ AXIS2_STRCASECMP(parent_localname, AXIOM_SOAP_HEADER_LOCAL_NAME) == 0)
{
- axis2_soap_header_block_t *header_block = NULL;
- axis2_soap_header_t *soap_header = NULL;
+ axiom_soap_header_block_t *header_block = NULL;
+ axiom_soap_header_t *soap_header = NULL;
- soap_header = AXIS2_SOAP_ENVELOPE_GET_HEADER(builder_impl->soap_envelope, env);
+ soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(builder_impl->soap_envelope, env);
if(!soap_header)
return AXIS2_FAILURE;
- header_block = axis2_soap_header_block_create(env);
+ header_block = axiom_soap_header_block_create(env);
if(!header_block)
return AXIS2_FAILURE;
- axis2_soap_header_block_set_base_node (header_block, env, om_element_node);
+ axiom_soap_header_block_set_base_node (header_block, env, om_element_node);
- axis2_soap_header_set_header_block (soap_header, env, header_block);
+ axiom_soap_header_set_header_block (soap_header, env, header_block);
- axis2_soap_header_block_set_soap_version (header_block, env, builder_impl->soap_version);
+ axiom_soap_header_block_set_soap_version (header_block, env, builder_impl->soap_version);
}
else if((element_level == 3) && parent_localname &&
- AXIS2_STRCASECMP(parent_localname, AXIS2_SOAP_BODY_LOCAL_NAME) == 0 &&
- AXIS2_STRCASECMP(ele_localname, AXIS2_SOAP_BODY_FAULT_LOCAL_NAME) == 0)
+ AXIS2_STRCASECMP(parent_localname, AXIOM_SOAP_BODY_LOCAL_NAME) == 0 &&
+ AXIS2_STRCASECMP(ele_localname, AXIOM_SOAP_BODY_FAULT_LOCAL_NAME) == 0)
{
- axis2_soap_body_t *soap_body = NULL;
- axis2_soap_fault_t *soap_fault = NULL;
+ axiom_soap_body_t *soap_body = NULL;
+ axiom_soap_fault_t *soap_fault = NULL;
axiom_namespace_t *env_ns = NULL;
- env_ns = AXIS2_SOAP_ENVELOPE_GET_NAMESPACE(builder_impl->soap_envelope, env);
+ env_ns = AXIOM_SOAP_ENVELOPE_GET_NAMESPACE(builder_impl->soap_envelope, env);
if(!env_ns)
return AXIS2_FAILURE;
- soap_body = AXIS2_SOAP_ENVELOPE_GET_BODY(builder_impl->soap_envelope, env);
+ soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(builder_impl->soap_envelope, env);
if(!soap_body )
return AXIS2_FAILURE;
- soap_fault = axis2_soap_fault_create(env);
+ soap_fault = axiom_soap_fault_create(env);
if(!soap_fault)
return AXIS2_FAILURE;
- axis2_soap_fault_set_base_node (soap_fault, env, om_element_node);
+ axiom_soap_fault_set_base_node (soap_fault, env, om_element_node);
- axis2_soap_body_set_fault (soap_body, env, soap_fault);
+ axiom_soap_body_set_fault (soap_body, env, soap_fault);
builder_impl->processing_fault = AXIS2_TRUE;
builder_impl->processing_mandatory_fault_elements = AXIS2_TRUE;
- if(AXIS2_STRCMP(AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI,
+ if(AXIS2_STRCMP(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI,
AXIOM_NAMESPACE_GET_URI(env_ns , env)) == 0)
{
- builder_impl->builder_helper = axis2_soap12_builder_helper_create(env, builder);
+ builder_impl->builder_helper = axiom_soap12_builder_helper_create(env, builder);
if(!(builder_impl->builder_helper))
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI,
+ else if(AXIS2_STRCMP(AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI,
AXIOM_NAMESPACE_GET_URI(env_ns , env)) == 0)
{
- builder_impl->builder_helper = axis2_soap11_builder_helper_create(env, builder, builder_impl->om_builder); if(!(builder_impl->builder_helper))
+ builder_impl->builder_helper = axiom_soap11_builder_helper_create(env, builder, builder_impl->om_builder); if(!(builder_impl->builder_helper))
return AXIS2_FAILURE;
}
}
else if(element_level > 3 && builder_impl->processing_fault)
{
- if(builder_impl->soap_version == AXIS2_SOAP11)
+ if(builder_impl->soap_version == AXIOM_SOAP11)
{
- status = AXIS2_SOAP11_BUILDER_HELPER_HANDLE_EVENT(
- ((axis2_soap11_builder_helper_t*)(builder_impl->builder_helper)),
+ status = AXIOM_SOAP11_BUILDER_HELPER_HANDLE_EVENT(
+ ((axiom_soap11_builder_helper_t*)(builder_impl->builder_helper)),
env, om_element_node , element_level);
}
- else if(builder_impl->soap_version == AXIS2_SOAP12)
+ else if(builder_impl->soap_version == AXIOM_SOAP12)
{
- status = AXIS2_SOAP12_BUILDER_HELPER_HANDLE_EVENT(
- ((axis2_soap12_builder_helper_t *)(builder_impl->builder_helper)),
+ status = AXIOM_SOAP12_BUILDER_HELPER_HANDLE_EVENT(
+ ((axiom_soap12_builder_helper_t *)(builder_impl->builder_helper)),
env, om_element_node , element_level);
}
@@ -726,8 +726,8 @@
}
axis2_status_t AXIS2_CALL
-axis2_soap_builder_process_namespace_data
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_process_namespace_data
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axiom_node_t *om_node,
int is_soap_element)
@@ -754,8 +754,8 @@
{
ns_uri = AXIOM_NAMESPACE_GET_URI(om_ns, env);
if(ns_uri &&
- (AXIS2_STRCMP(ns_uri, AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) != 0) &&
- (AXIS2_STRCMP(ns_uri, AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI) != 0))
+ (AXIS2_STRCMP(ns_uri, AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) != 0) &&
+ (AXIS2_STRCMP(ns_uri, AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI) != 0))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI, AXIS2_FAILURE);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI");
@@ -769,11 +769,11 @@
}
static axis2_status_t
-axis2_soap_builder_identify_soap_version(axis2_soap_builder_t *builder,
+axiom_soap_builder_identify_soap_version(axiom_soap_builder_t *builder,
const axis2_env_t *env,
const axis2_char_t* soap_version_uri_from_transport)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
axiom_namespace_t *om_ns = NULL;
axiom_node_t *envelope_node = NULL;
axiom_element_t *om_ele = NULL;
@@ -785,7 +785,7 @@
builder_impl = AXIS2_INTF_TO_IMPL(builder);
- builder_impl->soap_envelope = axis2_soap_builder_get_soap_envelope(builder, env);
+ builder_impl->soap_envelope = axiom_soap_builder_get_soap_envelope(builder, env);
if(builder_impl->soap_envelope == NULL)
{
@@ -796,7 +796,7 @@
return AXIS2_FAILURE;
}
- envelope_node = AXIS2_SOAP_ENVELOPE_GET_BASE_NODE(builder_impl->soap_envelope, env);
+ envelope_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(builder_impl->soap_envelope, env);
if(!envelope_node)
return AXIS2_FAILURE;
@@ -822,24 +822,24 @@
"AXIS2_ERROR_TRANSPORT_LEVEL_INFORMATION_DOES_NOT_MATCH_WITH_SOAP");
return AXIS2_FAILURE;
}
- if(AXIS2_STRCMP(AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, ns_uri) == 0)
+ if(AXIS2_STRCMP(AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, ns_uri) == 0)
{
- builder_impl->soap_version = AXIS2_SOAP11;
+ builder_impl->soap_version = AXIOM_SOAP11;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Identified soap version is soap11");
- axis2_soap_envelope_set_soap_version_internal(builder_impl->soap_envelope,
+ axiom_soap_envelope_set_soap_version_internal(builder_impl->soap_envelope,
env, builder_impl->soap_version);
return AXIS2_SUCCESS;
}
- else if(AXIS2_STRCMP(AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, ns_uri) == 0)
+ else if(AXIS2_STRCMP(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, ns_uri) == 0)
{
- builder_impl->soap_version = AXIS2_SOAP12;
+ builder_impl->soap_version = AXIOM_SOAP12;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "identified soap version is soap12");
- axis2_soap_envelope_set_soap_version_internal(builder_impl->soap_envelope,
+ axiom_soap_envelope_set_soap_version_internal(builder_impl->soap_envelope,
env, builder_impl->soap_version);
return AXIS2_SUCCESS;
@@ -849,12 +849,12 @@
}
static axis2_status_t
-axis2_soap_builder_parse_headers(axis2_soap_builder_t *builder,
+axiom_soap_builder_parse_headers(axiom_soap_builder_t *builder,
const axis2_env_t *env)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
axiom_node_t *om_node = NULL;
- axis2_soap_header_t *soap_header = NULL;
+ axiom_soap_header_t *soap_header = NULL;
int status = AXIS2_SUCCESS;
if(!builder)
{
@@ -866,15 +866,15 @@
if(!builder_impl->soap_envelope)
return AXIS2_FAILURE;
- soap_header = AXIS2_SOAP_ENVELOPE_GET_HEADER(builder_impl->soap_envelope, env);
+ soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(builder_impl->soap_envelope, env);
if(soap_header != NULL)
{
- om_node = AXIS2_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
+ om_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
if(om_node)
{ while(!AXIOM_NODE_IS_COMPLETE(om_node, env))
{
- status = axis2_soap_builder_next(builder, env);
+ status = axiom_soap_builder_next(builder, env);
if(status == AXIS2_FAILURE)
return AXIS2_FAILURE;
}
@@ -889,12 +889,12 @@
}
axis2_status_t AXIS2_CALL
-axis2_soap_builder_set_bool_processing_mandatory_fault_elements
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_set_bool_processing_mandatory_fault_elements
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axis2_bool_t value)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
builder_impl->processing_mandatory_fault_elements = value;
@@ -902,12 +902,12 @@
}
axis2_status_t AXIS2_CALL
-axis2_soap_builder_set_processing_detail_elements
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_set_processing_detail_elements
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axis2_bool_t value)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
builder_impl->processing_detail_elements = value;
@@ -915,29 +915,29 @@
}
axis2_bool_t AXIS2_CALL
-axis2_soap_builder_is_processing_detail_elements
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_is_processing_detail_elements
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
return builder_impl->processing_detail_elements ;
}
int AXIS2_CALL
-axis2_soap_builder_get_soap_version (axis2_soap_builder_t *builder,
+axiom_soap_builder_get_soap_version (axiom_soap_builder_t *builder,
const axis2_env_t *env)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
return builder_impl->soap_version ;
}
axis2_status_t AXIS2_CALL
-axis2_soap_builder_set_mime_body_parts
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_set_mime_body_parts
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axis2_hash_t *map)
{
@@ -947,14 +947,14 @@
}
static axis2_status_t
-axis2_soap_builder_construct_node_for_empty_element
- (axis2_soap_builder_t *builder,
+axiom_soap_builder_construct_node_for_empty_element
+ (axiom_soap_builder_t *builder,
const axis2_env_t *env,
axiom_node_t *parent,
axiom_node_t *om_element_node)
{
- axis2_soap_builder_impl_t *builder_impl = NULL;
+ axiom_soap_builder_impl_t *builder_impl = NULL;
axiom_element_t *parent_ele = NULL;
axis2_char_t *parent_localname = NULL;
@@ -1000,10 +1000,10 @@
if(element_level == 1)
{
- if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP_HEADER_LOCAL_NAME) == 0)
+ if(AXIS2_STRCMP(ele_localname, AXIOM_SOAP_HEADER_LOCAL_NAME) == 0)
{
/** this is the soap header element */
- axis2_soap_header_t *soap_header = NULL;
+ axiom_soap_header_t *soap_header = NULL;
if(builder_impl->header_present)
{
AXIS2_ERROR_SET(env->error,
@@ -1019,27 +1019,27 @@
builder_impl->header_present = AXIS2_TRUE;
- soap_header = axis2_soap_header_create(env);
+ soap_header = axiom_soap_header_create(env);
if(!soap_header)
return AXIS2_FAILURE;
- axis2_soap_header_set_base_node (soap_header, env, om_element_node);
+ axiom_soap_header_set_base_node (soap_header, env, om_element_node);
- axis2_soap_envelope_set_header(builder_impl->soap_envelope, env, soap_header);
+ axiom_soap_envelope_set_header(builder_impl->soap_envelope, env, soap_header);
- axis2_soap_header_set_builder (soap_header, env, builder);
+ axiom_soap_header_set_builder (soap_header, env, builder);
- axis2_soap_header_set_soap_version(soap_header, env, builder_impl->soap_version);
+ axiom_soap_header_set_soap_version(soap_header, env, builder_impl->soap_version);
- status = axis2_soap_builder_process_namespace_data(builder, env,
+ status = axiom_soap_builder_process_namespace_data(builder, env,
om_element_node, AXIS2_TRUE);
if(status == AXIS2_FAILURE)
return AXIS2_FAILURE;
- } else if(AXIS2_STRCMP(ele_localname, AXIS2_SOAP_BODY_LOCAL_NAME) == 0)
+ } else if(AXIS2_STRCMP(ele_localname, AXIOM_SOAP_BODY_LOCAL_NAME) == 0)
{
- axis2_soap_body_t *soap_body = NULL;
+ axiom_soap_body_t *soap_body = NULL;
if(builder_impl->body_present)
{
AXIS2_ERROR_SET(env->error,
@@ -1049,17 +1049,17 @@
}
builder_impl->body_present = AXIS2_TRUE;
- soap_body = axis2_soap_body_create(env);
+ soap_body = axiom_soap_body_create(env);
if(!soap_body)
return AXIS2_FAILURE;
- axis2_soap_body_set_base_node (soap_body, env, om_element_node);
+ axiom_soap_body_set_base_node (soap_body, env, om_element_node);
- axis2_soap_body_set_builder (soap_body, env, builder);
+ axiom_soap_body_set_builder (soap_body, env, builder);
- axis2_soap_envelope_set_body(builder_impl->soap_envelope, env, soap_body);
+ axiom_soap_envelope_set_body(builder_impl->soap_envelope, env, soap_body);
- status = axis2_soap_builder_process_namespace_data(builder, env,
+ status = axiom_soap_builder_process_namespace_data(builder, env,
om_element_node, AXIS2_TRUE);
if(status == AXIS2_FAILURE)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org