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 [1/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...

Author: dinesh
Date: Mon Mar 19 12:13:26 2007
New Revision: 520049

URL: http://svn.apache.org/viewvc?view=rev&rev=520049
Log:
axis2c-555, applied patch submitted by Diluka

Modified:
    webservices/axis2/trunk/c/axiom/include/axiom_soap_body.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_builder.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_envelope.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_fault.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_code.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_detail.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_node.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_reason.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h
    webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h
    webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_body.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_envelope.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_code.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_detail.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_node.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_reason.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_role.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_sub_code.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_text.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_value.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_header.h
    webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_header_block.h
    webservices/axis2/trunk/c/axiom/src/soap/axiom_soap11_builder_helper.h
    webservices/axis2/trunk/c/axiom/src/soap/axiom_soap12_builder_helper.h
    webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c
    webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_body.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_message.c
    webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
    webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
    webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
    webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
    webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
    webservices/axis2/trunk/c/modules/core/engine/engine.c
    webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
    webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
    webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
    webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
    webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
    webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
    webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c
    webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c
    webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c
    webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
    webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
    webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
    webservices/axis2/trunk/c/savan/src/util/savan_util.c

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_body.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_body.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_body.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_body.h Mon Mar 19 12:13:26 2007
@@ -141,31 +141,7 @@
             const axis2_env_t *env,
             axiom_node_t *child);
 
-    /******************** Macros **************************************************/
 
-    /** free soap_body */
-#define AXIOM_SOAP_BODY_FREE( body, env) \
-        axiom_soap_body_free( body, env)
-
-    /** indecate whether soap_body has a fault or not*/
-#define AXIOM_SOAP_BODY_HAS_FAULT( body, env) \
-        axiom_soap_body_has_fault( body, env)
-
-#define AXIOM_SOAP_BODY_GET_FAULT( body, env) \
-        axiom_soap_body_get_fault( body, env)
-
-#define AXIOM_SOAP_BODY_GET_BASE_NODE( body, env) \
-        axiom_soap_body_get_base_node( body, env)
-
-#define AXIOM_SOAP_BODY_GET_SOAP_VERSION( body, env) \
-        axiom_soap_body_get_soap_version( body, env)
-
-#define AXIOM_SOAP_BODY_BUILD( body, env) \
-        axiom_soap_body_build( body, env)
-
-#define AXIOM_SOAP_BODY_ADD_CHILD( body, env, child) \
-        axiom_soap_body_add_child( body, env, child);
-    /** @} */
 #ifdef __cplusplus
 }
 #endif

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_builder.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_builder.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_builder.h Mon Mar 19 12:13:26 2007
@@ -99,44 +99,6 @@
             const axis2_env_t *env,
             axis2_hash_t *map);
 
-/******************** Macros **************************************************/
-
-#define AXIOM_SOAP_BUILDER_FREE(builder, env) \
-        axiom_soap_builder_free(builder, env)
-
-#define AXIOM_SOAP_BUILDER_GET_SOAP_ENVELOPE(builder, env) \
-        axiom_soap_builder_get_soap_envelope(builder, env)
-
-#define AXIOM_SOAP_BUILDER_GET_DOCUMENT_ELEMENT(builder, env) \
-        axiom_soap_builder_get_document_element(builder, env)
-
-#define AXIOM_SOAP_BUILDER_NEXT(builder, env) \
-        axiom_soap_builder_next(builder, env)
-
-#define AXIOM_SOAP_BUILDER_GET_DOCUMENT(builder, env) \
-        axiom_soap_builder_get_document(builder, env)
-
-#define AXIOM_SOAP_BUILDER_NEXT(builder, env) \
-        axiom_soap_builder_next(builder, env)
-
-#define AXIOM_SOAP_BUILDER_SET_BOOL_PROCESSING_MANDATORY_FAULT_ELEMENTS(builder, env, value) \
-        axiom_soap_builder_set_bool_processing_mandatory_fault_elements(builder, env, value)
-
-#define AXIOM_SOAP_BUILDER_SET_PROCESSING_DETAIL_ELEMENTS(builder, env, value) \
-        axiom_soap_builder_set_processing_detail_elements(builder, env, value)
-
-#define AXIOM_SOAP_BUILDER_IS_PROCESSING_DETAIL_ELEMENTS(builder, env) \
-        axiom_soap_builder_is_processing_detail_elements(builder, env)
-
-
-#define AXIOM_SOAP_BUILDER_GET_SOAP_VERSION(builder, env) \
-        axiom_soap_builder_get_soap_version(builder, env)
-
-#define AXIOM_SOAP_BUILDER_PROCESS_NAMESPACE_DATA(builder, env, om_node, is_soap_element) \
-        axiom_soap_builder_process_namespace_data(builder, env, om_node, is_soap_element)
-
-#define AXIOM_SOAP_BUILDER_SET_MIME_BODY_PARTS(builder, env, map) \
-        axiom_soap_builder_set_mime_body_parts(builder, env, map)
 
     /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_envelope.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_envelope.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_envelope.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_envelope.h Mon Mar 19 12:13:26 2007
@@ -165,30 +165,6 @@
         const axis2_env_t *env,
         int soap_version);
 
-#define AXIOM_SOAP_ENVELOPE_GET_HEADER(envelope, env) \
-        axiom_soap_envelope_get_header(envelope, env)
-
-#define AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env) \
-        axiom_soap_envelope_get_body(envelope, env)
-
-#define AXIOM_SOAP_ENVELOPE_SERIALIZE(envelope, env, om_output, cache) \
-        axiom_soap_envelope_serialize(envelope, env, om_output, cache)
-
-#define AXIOM_SOAP_ENVELOPE_FREE(envelope, env) \
-        axiom_soap_envelope_free(envelope, env)
-
-#define AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(envelope, env) \
-        axiom_soap_envelope_get_base_node(envelope, env)
-
-#define AXIOM_SOAP_ENVELOPE_GET_SOAP_VERSION(envelope, env) \
-        axiom_soap_envelope_get_soap_version(envelope, env)
-
-#define AXIOM_SOAP_ENVELOPE_GET_NAMESPACE(envelope, env) \
-        axiom_soap_envelope_get_namespace(envelope, env)
-
-#define AXIOM_SOAP_ENVELOPE_SET_SOAP_VERSION(envelope, env, soap_version) \
-        axiom_soap_envelope_set_soap_version(envelope, env, soap_version)
-
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault.h Mon Mar 19 12:13:26 2007
@@ -181,34 +181,6 @@
     axiom_soap_fault_get_base_node(axiom_soap_fault_t *fault,
             const axis2_env_t *env);
 
-#define AXIOM_SOAP_FAULT_FREE(fault , env) \
-        axiom_soap_fault_free(fault, env)
-
-#define AXIOM_SOAP_FAULT_GET_CODE(fault , env) \
-        axiom_soap_fault_get_code(fault, env)
-
-#define AXIOM_SOAP_FAULT_GET_REASON(fault , env) \
-        axiom_soap_fault_get_reason(fault, env)
-
-#define AXIOM_SOAP_FAULT_GET_DETAIL(fault , env) \
-        axiom_soap_fault_get_detail(fault, env)
-
-#define AXIOM_SOAP_FAULT_GET_ROLE(fault , env) \
-        axiom_soap_fault_get_role(fault, env)
-
-#define AXIOM_SOAP_FAULT_GET_NODE(fault , env) \
-        axiom_soap_fault_get_node(fault, env)
-
-#define AXIOM_SOAP_FAULT_GET_BASE_NODE(fault, env) \
-        axiom_soap_fault_get_base_node(fault, env)
-
-
-#define AXIOM_SOAP_FAULT_GET_EXCEPTION(fault, env) \
-        axiom_soap_fault_get_exception(fault, env)
-
-#define AXIOM_SOAP_FAULT_SET_EXCEPTION(fault, env, exception) \
-        axiom_soap_fault_set_exception(fault, env, exception)
-
     /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_code.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_code.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_code.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_code.h Mon Mar 19 12:13:26 2007
@@ -86,19 +86,6 @@
     axiom_soap_fault_code_get_base_node(axiom_soap_fault_code_t *fault_code,
             const axis2_env_t *env);
 
-    /** free soap_fault_code */
-#define AXIOM_SOAP_FAULT_CODE_FREE(fault_code , env) \
-        axiom_soap_fault_code_free(fault_code, env)
-
-#define AXIOM_SOAP_FAULT_CODE_GET_SUB_CODE(fault_code , env) \
-        axiom_soap_fault_code_get_sub_code(fault_code, env)
-
-#define AXIOM_SOAP_FAULT_CODE_GET_VALUE(fault_code , env) \
-        axiom_soap_fault_code_get_value(fault_code, env)
-
-#define AXIOM_SOAP_FAULT_CODE_GET_BASE_NODE(fault_code, env) \
-        axiom_soap_fault_code_get_base_node(fault_code, env)
-
     /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_detail.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_detail.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_detail.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_detail.h Mon Mar 19 12:13:26 2007
@@ -74,22 +74,6 @@
     axiom_soap_fault_detail_get_base_node(axiom_soap_fault_detail_t *fault_code,
             const axis2_env_t *env);
 
-    /******************** Macros **************************************************/
-
-    /** free soap_fault_detail */
-#define AXIOM_SOAP_FAULT_DETAIL_FREE(fault_detail , env) \
-        axiom_soap_fault_detail_free(fault_detail, env)
-
-#define AXIOM_SOAP_FAULT_DETAIL_ADD_DETAIL_ENTRY(fault_detail, env, ele_node) \
-        axiom_soap_fault_detail_add_detail_entry(fault_detail, env, ele_node)
-
-#define AXIOM_SOAP_FAULT_DETAIL_GET_ALL_DETAIL_ENTRIES(fault_detail, env) \
-        axiom_soap_fault_detail_get_all_detail_entries(fault_detail, env)
-
-#define AXIOM_SOAP_FAULT_DETAIL_GET_BASE_NODE(fault_detail, env) \
-        axiom_soap_fault_detail_get_base_node(fault_detail, env)
-
-
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_node.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_node.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_node.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_node.h Mon Mar 19 12:13:26 2007
@@ -70,18 +70,6 @@
     axiom_soap_fault_node_get_base_node(axiom_soap_fault_node_t *fault_node,
             const axis2_env_t *env);
 
-#define AXIOM_SOAP_FAULT_NODE_FREE(fault_node , env) \
-        axiom_soap_fault_node_free(fault_node, env)
-
-#define AXIOM_SOAP_FAULT_NODE_GET_VALUE(fault_node , env) \
-        axiom_soap_fault_node_get_value(fault_node, env)
-
-#define AXIOM_SOAP_FAULT_NODE_GET_BASE_NODE(fault_node, env) \
-        axiom_soap_fault_node_get_base_node(fault_node, env)
-
-#define AXIOM_SOAP_FAULT_NODE_SET_VALUE(fault_node , env, uri) \
-        axiom_soap_fault_node_set_value(fault_node, env, uri)
-
     /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_reason.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_reason.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_reason.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_reason.h Mon Mar 19 12:13:26 2007
@@ -82,25 +82,6 @@
     axiom_soap_fault_reason_get_base_node(axiom_soap_fault_reason_t *fault_reason,
             const axis2_env_t *env);
 
-#define AXIOM_SOAP_FAULT_REASON_FREE(fault_reason , env) \
-        axiom_soap_fault_reason_free(fault_reason, env)
-
-
-#define AXIOM_SOAP_FAULT_REASON_GET_SOAP_FAULT_TEXT(fault_reason , env, lang) \
-        axiom_soap_fault_reason_get_soap_fault_text(fault_reason, env, lang)
-
-#define AXIOM_SOAP_FAULT_REASON_GET_BASE_NODE(fault_reason, env) \
-        axiom_soap_fault_reason_get_base_node(fault_reason, env)
-
-#define AXIOM_SOAP_FAULT_REASON_ADD_SOAP_FAULT_TEXT(fault_reason, env, fault_text) \
-        axiom_soap_fault_reason_add_soap_fault_text(fault_reason, env, fault_text)
-
-#define AXIOM_SOAP_FAULT_REASON_GET_ALL_SOAP_FAULT_TEXTS(fault_reason, env) \
-        axiom_soap_fault_reason_get_all_soap_fault_texts(fault_reason, env)
-
-#define AXIOM_SOAP_FAULT_REASON_GET_FIRST_SOAP_FAULT_TEXT(fault_reason, env) \
-        axiom_soap_fault_reason_get_first_soap_fault_text(fault_reason, env)
-
     /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h Mon Mar 19 12:13:26 2007
@@ -71,17 +71,6 @@
     axiom_soap_fault_role_get_base_node(axiom_soap_fault_role_t *fault_role,
             const axis2_env_t *env);
 
-#define AXIOM_SOAP_FAULT_ROLE_FREE(fault_role , env) \
-        axiom_soap_fault_role_free(fault_role, env)
-
-#define AXIOM_SOAP_FAULT_ROLE_GET_VALUE(fault_role , env) \
-        axiom_soap_fault_role_get_role_value(fault_role, env)
-
-#define AXIOM_SOAP_FAULT_ROLE_GET_BASE_NODE(fault_role, env) \
-        axiom_soap_fault_role_get_base_node(fault_role, env)
-
-#define AXIOM_SOAP_FAULT_ROLE_SET_VALUE(fault_role , env, value) \
-        axiom_soap_fault_role_set_role_value(fault_role, env, value)
     /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h Mon Mar 19 12:13:26 2007
@@ -76,18 +76,6 @@
     axiom_soap_fault_sub_code_get_base_node(axiom_soap_fault_sub_code_t *fault_sub_code,
             const axis2_env_t *env);
 
-#define AXIOM_SOAP_FAULT_SUB_CODE_FREE(fault_sub_code , env) \
-        axiom_soap_fault_sub_code_free(fault_sub_code, env)
-
-#define AXIOM_SOAP_FAULT_SUB_CODE_GET_VALUE(fault_sub_code , env) \
-        axiom_soap_fault_sub_code_get_value(fault_sub_code, env)
-
-#define AXIOM_SOAP_FAULT_SUB_CODE_GET_SUB_CODE(fault_sub_code , env) \
-        axiom_soap_fault_sub_code_get_sub_code(fault_sub_code, env)
-
-#define AXIOM_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(fault_sub_code, env) \
-        axiom_soap_fault_sub_code_get_base_node(fault_sub_code, env)
-
     /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h Mon Mar 19 12:13:26 2007
@@ -80,23 +80,6 @@
     axiom_soap_fault_text_get_text(axiom_soap_fault_text_t *fault_text,
             const axis2_env_t *env);
 
-#define AXIOM_SOAP_FAULT_TEXT_FREE(fault_text , env) \
-        axiom_soap_fault_text_free(fault_text, env)
-
-#define AXIOM_SOAP_FAULT_TEXT_SET_LANG(fault_text , env, lang) \
-        axiom_soap_fault_text_set_lang(fault_text, env, lang)
-
-#define AXIOM_SOAP_FAULT_TEXT_GET_LANG(fault_text , env) \
-        axiom_soap_fault_text_get_lang(fault_text, env)
-
-#define AXIOM_SOAP_FAULT_TEXT_GET_BASE_NODE(fault_text, env) \
-        axiom_soap_fault_text_get_base_node(fault_text, env)
-
-#define AXIOM_SOAP_FAULT_TEXT_SET_TEXT(fault_text, env, value, lang) \
-        axiom_soap_fault_text_set_text(fault_text, env, value, lang)
-
-#define AXIOM_SOAP_FAULT_TEXT_GET_TEXT(fault_text, env) \
-        axiom_soap_fault_text_get_text(fault_text, env)
     /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h Mon Mar 19 12:13:26 2007
@@ -92,17 +92,6 @@
     axiom_soap_fault_value_set_text(axiom_soap_fault_value_t *fault_value,
             const axis2_env_t *env, axis2_char_t *text);
 
-#define AXIOM_SOAP_FAULT_VALUE_FREE(fault_value , env) \
-        axiom_soap_fault_value_free(fault_value, env)
-
-#define AXIOM_SOAP_FAULT_VALUE_GET_BASE_NODE(fault_value, env) \
-        axiom_soap_fault_value_get_base_node(fault_value, env)
-
-#define AXIOM_SOAP_FAULT_VALUE_GET_TEXT(fault_value, env) \
-      axiom_soap_fault_value_get_text(fault_value, env)
-
-#define AXIOM_SOAP_FAULT_VALUE_SET_TEXT(fault_value, env, text) \
-        axiom_soap_fault_value_set_text(fault_value, env, text)
     /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h Mon Mar 19 12:13:26 2007
@@ -163,36 +163,6 @@
             const axis2_env_t *env,
             axis2_qname_t *qname);
 
-#define AXIOM_SOAP_HEADER_FREE(header , env) \
-        axiom_soap_header_free(header, env)
-
-#define AXIOM_SOAP_HEADER_ADD_HEADER_BLOCK(header, env, localname, ns) \
-        axiom_soap_header_add_header_block(header, env, localname, ns)
-
-#define AXIOM_SOAP_HEADER_EXAMINE_HEADER_BLOCKS(header, env, param_role) \
-        axiom_soap_header_examine_header_blocks(header, env, param_role)
-
-#define AXIOM_SOAP_HEADER_EXAMINE_ALL_HEADER_BLOCKS(header, env) \
-        axiom_soap_header_examine_all_header_blocks(header, env)
-
-#define AXIOM_SOAP_HEADER_EXTRACT_HEADER_BLOCKS(header, env, role) \
-        axiom_soap_header_extract_header_blocks(header, env, role)
-
-#define AXIOM_SOAP_HEADER_GET_BASE_NODE(header, env) \
-        axiom_soap_header_get_base_node(header, env)
-
-#define AXIOM_SOAP_HEADER_GET_SOAP_VERSION(header, env) \
-        axiom_soap_header_get_soap_version(header, env)
-
-#define AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(header, env, uri)\
-        axiom_soap_header_get_header_blocks_with_namespace_uri(header, env, uri)
-
-#define AXIOM_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(header, env) \
-        axiom_soap_header_get_all_header_blocks(header, env)
-
-#define AXIOM_SOAP_HEADER_REMOVE_HEADER_BLOCK(header, env, qname) \
-        axiom_soap_header_remove_header_block(header, env, qname)
-
     /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h Mon Mar 19 12:13:26 2007
@@ -116,47 +116,6 @@
     axiom_soap_header_block_get_soap_version(axiom_soap_header_block_t *header_block,
             const axis2_env_t *env);
 
-#define AXIOM_SOAP_HEADER_BLOCK_FREE(header_block , env) \
-        axiom_soap_header_block_free(header_block, env)
-
-#define AXIOM_SOAP_HEADER_BLOCK_GET_ROLE(header_block , env) \
-        axiom_soap_header_block_get_role(header_block, env)
-
-#define AXIOM_SOAP_HEADER_BLOCK_IS_PROCESSED(header_block , env) \
-        axiom_soap_header_block_is_processed(header_block, env)
-
-#define AXIOM_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block , env) \
-        axiom_soap_header_block_set_processed(header_block, env)
-
-#define AXIOM_SOAP_HEADER_BLOCK_GET_MUST_UNDERSTAND(header_block, env) \
-        axiom_soap_header_block_get_must_understand(header_block, env)
-
-#define AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(header_block,\
-             env, must_understand) \
-        axiom_soap_header_block_set_must_understand_with_bool(header_block, \
-             env, must_understand)
-
-#define AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_STRING(header_block,\
-             env, must_understand) \
-        axiom_soap_header_block_set_must_understand_with_string(header_block, \
-             env, must_understand)
-
-#define AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env) \
-        axiom_soap_header_block_get_base_node(header_block, env)
-
-#define AXIOM_SOAP_HEADER_BLOCK_GET_SOAP_VERSION(header_block, env) \
-        axiom_soap_header_block_get_soap_version(header_block, env)
-
-#define AXIOM_SOAP_HEADER_BLOCK_GET_ATTRIBUTE(header_block, env,\
-            attr_name, soap_envelope_namespace_uri)  \
-        axiom_soap_header_block_get_attribute(header_block, env, \
-            attr_name, soap_envelope_namespace_uri)
-
-#define AXIOM_SOAP_HEADER_BLOCK_SET_ATTRIBUTE(header_block, env,\
-            attr_name, attr_value, soap_envelope_namespace_uri)  \
-        axiom_soap_header_block_set_attribute(header_block, env, \
-            attr_name, attr_value, soap_envelope_namespace_uri)
-
     /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c Mon Mar 19 12:13:26 2007
@@ -141,10 +141,10 @@
 
 axis2_hash_t* AXIS2_CALL
 axiom_mime_parser_parse(axiom_mime_parser_t *mime_parser,
-        const axis2_env_t *env,
-        AXIS2_READ_INPUT_CALLBACK callback,
-        void *callback_ctx,
-        axis2_char_t *mime_boundary)
+    const axis2_env_t *env,
+    AXIS2_READ_INPUT_CALLBACK callback,
+    void *callback_ctx,
+    axis2_char_t *mime_boundary)
 {
     axiom_mime_parser_impl_t *mime_parser_impl = NULL;
     axis2_char_t *buffer = NULL;
@@ -332,7 +332,9 @@
                     pos = memchr(old_pos, AXIOM_MIME_BOUNDARY_BYTE,
                         (mime_binary_len - (old_pos - mime_binary)));
                     if (!pos)
+		    {
                         break;
+		    }
                     else
                     {
                         old_pos = pos + 1;
@@ -352,7 +354,9 @@
                     mime_binary_len = pos - mime_binary;
                 }
                 else
+		{
                     pos = NULL;
+		}
             }
 
             if (!pos)

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_body.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_body.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_body.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_body.h Mon Mar 19 12:13:26 2007
@@ -40,16 +40,18 @@
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_body_set_base_node(axiom_soap_body_t *body,
-                              const axis2_env_t *env,
-                              axiom_node_t *om_node);  
+    const axis2_env_t *env,
+    axiom_node_t *om_node);  
+
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_body_set_builder(axiom_soap_body_t *body,
-                            const axis2_env_t *env,
-                            struct axiom_soap_builder *builder);
+    const axis2_env_t *env,
+    struct axiom_soap_builder *builder);
+
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_body_set_fault(axiom_soap_body_t *body,
-                          const axis2_env_t *env,
-                          struct axiom_soap_fault *soap_fault);
+    const axis2_env_t *env,
+    struct axiom_soap_fault *soap_fault);
                           
 AXIS2_EXTERN axiom_soap_body_t * AXIS2_CALL
 axiom_soap_body_create(const axis2_env_t *env);     

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_envelope.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_envelope.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_envelope.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_envelope.h Mon Mar 19 12:13:26 2007
@@ -42,27 +42,28 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_envelope_set_base_node(axiom_soap_envelope_t *envelope,
-                                  const axis2_env_t *env,
-                                  axiom_node_t *om_node);  
+    const axis2_env_t *env,
+    axiom_node_t *om_node);  
   
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_envelope_set_body(axiom_soap_envelope_t *envelope,
-                             const axis2_env_t *env, 
-                             struct axiom_soap_body *body);
+    const axis2_env_t *env, 
+    struct axiom_soap_body *body);
+
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_envelope_set_header(axiom_soap_envelope_t *envelope,
-                               const axis2_env_t *env, 
-                               struct axiom_soap_header *header);
+    const axis2_env_t *env, 
+    struct axiom_soap_header *header);
     
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_envelope_set_builder(axiom_soap_envelope_t *envelope,
-                                const axis2_env_t *env,
-                                struct axiom_soap_builder *soap_builder); 
+    const axis2_env_t *env,
+    struct axiom_soap_builder *soap_builder); 
                                 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_envelope_set_soap_version_internal(axiom_soap_envelope_t *envelope,
-                                              const axis2_env_t *env,
-                                              int soap_version);                                
+    const axis2_env_t *env,
+    int soap_version);                                
 
 AXIS2_EXTERN axiom_soap_envelope_t* AXIS2_CALL
 axiom_soap_envelope_create_null(const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault.h Mon Mar 19 12:13:26 2007
@@ -41,42 +41,47 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_set_code(axiom_soap_fault_t *fault,
-                          const axis2_env_t *env,
-                          struct axiom_soap_fault_code *code);
+    const axis2_env_t *env,
+    struct axiom_soap_fault_code *code);
+
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_set_reason(axiom_soap_fault_t *fault,
-                            const axis2_env_t *env,
-                            struct axiom_soap_fault_reason *reason);
+    const axis2_env_t *env,
+    struct axiom_soap_fault_reason *reason);
+
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_set_node(axiom_soap_fault_t *fault,
-                          const axis2_env_t *env,
-                          struct axiom_soap_fault_node *node);
+    const axis2_env_t *env,
+    struct axiom_soap_fault_node *node);
+
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_set_role(axiom_soap_fault_t *fault,
-                          const axis2_env_t *env,
-                          struct axiom_soap_fault_role *role);
+    const axis2_env_t *env,
+    struct axiom_soap_fault_role *role);
+
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_set_detail(axiom_soap_fault_t *fault,
-                            const axis2_env_t *env,
-                            struct axiom_soap_fault_detail *detail);
+    const axis2_env_t *env,
+    struct axiom_soap_fault_detail *detail);
+
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_set_base_node(axiom_soap_fault_t *fault,
-                               const axis2_env_t *env,
-                               axiom_node_t *node);
+    const axis2_env_t *env,
+    axiom_node_t *node);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_set_builder(axiom_soap_fault_t *fault,
-                             const axis2_env_t *env,
-                             struct axiom_soap_builder *builder);
+    const axis2_env_t *env,
+    struct axiom_soap_builder *builder);
     
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_fault_set_soap_version(axiom_soap_fault_t *fault,
-                                  const axis2_env_t *env,
-                                  int soap_version);
+    const axis2_env_t *env,
+    int soap_version);
                                   
 AXIS2_EXTERN int AXIS2_CALL
 axiom_soap_fault_get_soap_version(axiom_soap_fault_t *fault,
-                                  const axis2_env_t *env);
+    const axis2_env_t *env);
     
     
 AXIS2_EXTERN axiom_soap_fault_t * AXIS2_CALL

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_code.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_code.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_code.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_code.h Mon Mar 19 12:13:26 2007
@@ -41,29 +41,32 @@
 
 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,
-                                struct axiom_soap_fault_value *fault_val);
+    const axis2_env_t *env,
+    struct axiom_soap_fault_value *fault_val);
+
 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,
-                                  struct axiom_soap_fault_sub_code *fault_subcode);
+    const axis2_env_t *env,
+    struct axiom_soap_fault_sub_code *fault_subcode);
+
 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_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_fault_code_set_builder(axiom_soap_fault_code_t *fault_code,
-                                  const axis2_env_t *env,
-                                  struct axiom_soap_builder *soap_builder);
+    const axis2_env_t *env,
+    struct axiom_soap_builder *soap_builder);
                                   
 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);
                                        
 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_EXTERN axiom_soap_fault_code_t * AXIS2_CALL

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_detail.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_detail.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_detail.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_detail.h Mon Mar 19 12:13:26 2007
@@ -42,9 +42,9 @@
     
 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);
+    (axiom_soap_fault_detail_t *fault_detail,
+    const axis2_env_t *env,
+    axiom_node_t *node);
     
 AXIS2_EXTERN axiom_soap_fault_detail_t * AXIS2_CALL
 axiom_soap_fault_detail_create(const axis2_env_t *env);    

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_node.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_node.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_node.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_node.h Mon Mar 19 12:13:26 2007
@@ -41,9 +41,9 @@
 
 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);
+    (axiom_soap_fault_node_t *fault_node,
+    const axis2_env_t *env,
+    axiom_node_t *node);
 
 AXIS2_EXTERN axiom_soap_fault_node_t * AXIS2_CALL
 axiom_soap_fault_node_create(const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_reason.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_reason.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_reason.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_reason.h Mon Mar 19 12:13:26 2007
@@ -41,30 +41,31 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_reason_set_builder(axiom_soap_fault_reason_t *fault_reason,
-                                    const axis2_env_t *env,
-                                    struct axiom_soap_builder *builder);    
+    const axis2_env_t *env,
+    struct axiom_soap_builder *builder);    
     
     
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_reason_set_base_node
-                                (axiom_soap_fault_reason_t *fault_reason,
-                                 const axis2_env_t *env,
-                                 axiom_node_t *node);   
+    (axiom_soap_fault_reason_t *fault_reason,
+    const axis2_env_t *env,
+    axiom_node_t *node);   
     
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_reason_set_soap_fault_text
-                                (axiom_soap_fault_reason_t *fault_reason,
-                                 const axis2_env_t *env,
-                                 struct axiom_soap_fault_text *soap_text);
+    (axiom_soap_fault_reason_t *fault_reason,
+    const axis2_env_t *env,
+    struct axiom_soap_fault_text *soap_text);
                                  
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_fault_reason_set_soap_version(axiom_soap_fault_reason_t *fault_reason,
-                                         const axis2_env_t *env,
-                                         int soap_version);
+    const axis2_env_t *env,
+    int soap_version);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_fault_reason_get_soap_version(axiom_soap_fault_reason_t *fault_reason,
-                                         const axis2_env_t *env);                                         
+    const axis2_env_t *env);                                         
+
 AXIS2_EXTERN axiom_soap_fault_reason_t * AXIS2_CALL
 axiom_soap_fault_reason_create(const axis2_env_t *env);
 

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_role.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_role.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_role.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_role.h Mon Mar 19 12:13:26 2007
@@ -41,9 +41,10 @@
 
 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);
+    (axiom_soap_fault_role_t *fault_role,
+    const axis2_env_t *env,
+    axiom_node_t *node);
+
     
 AXIS2_EXTERN axiom_soap_fault_role_t * AXIS2_CALL
 axiom_soap_fault_role_create(const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_sub_code.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_sub_code.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_sub_code.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_sub_code.h Mon Mar 19 12:13:26 2007
@@ -41,37 +41,39 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_fault_sub_code_set_sub_code(
-                              axiom_soap_fault_sub_code_t *fault_sub_code,
-                              const axis2_env_t *env,
-                              axiom_soap_fault_sub_code_t *sub_code);    
+    axiom_soap_fault_sub_code_t *fault_sub_code,
+    const axis2_env_t *env,
+    axiom_soap_fault_sub_code_t *sub_code);    
+
     
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_fault_sub_code_set_value
-                             (axiom_soap_fault_sub_code_t *fault_sub_code,
-                              const axis2_env_t *env,
-                              struct axiom_soap_fault_value *fault_sub_code_val);
+    (axiom_soap_fault_sub_code_t *fault_sub_code,
+    const axis2_env_t *env,
+    struct axiom_soap_fault_value *fault_sub_code_val);
+
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_sub_code_set_base_node
-                             (axiom_soap_fault_sub_code_t *fault_sub_code,
-                              const axis2_env_t *env,
-                              axiom_node_t *node);
+    (axiom_soap_fault_sub_code_t *fault_sub_code,
+    const axis2_env_t *env,
+    axiom_node_t *node);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_fault_sub_code_set_builder(
-                                axiom_soap_fault_sub_code_t *fault_sub_code,
-                                const axis2_env_t *env,
-                                struct axiom_soap_builder *builder);
+    axiom_soap_fault_sub_code_t *fault_sub_code,
+    const axis2_env_t *env,
+    struct axiom_soap_builder *builder);
                                 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_soap_fault_sub_code_set_soap_version(
-                axiom_soap_fault_sub_code_t *fault_sub_code,
-                const axis2_env_t *env,
-                int soap_version);
+    axiom_soap_fault_sub_code_t *fault_sub_code,
+    const axis2_env_t *env,
+    int soap_version);
                 
 AXIS2_EXTERN int AXIS2_CALL
 axiom_soap_fault_sub_code_get_soap_version
-                (axiom_soap_fault_sub_code_t *fault_sub_code,
-                 const axis2_env_t *env);
+    (axiom_soap_fault_sub_code_t *fault_sub_code,
+    const axis2_env_t *env);
                 
                                     
 AXIS2_EXTERN axiom_soap_fault_sub_code_t * AXIS2_CALL

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_text.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_text.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_text.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_text.h Mon Mar 19 12:13:26 2007
@@ -41,8 +41,8 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_fault_text_set_base_node(axiom_soap_fault_text_t *fault_text,
-                                      const axis2_env_t *env,
-                                      axiom_node_t *node);
+    const axis2_env_t *env,
+    axiom_node_t *node);
 
 AXIS2_EXTERN axiom_soap_fault_text_t * AXIS2_CALL
 axiom_soap_fault_text_create(const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_value.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_value.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_value.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_fault_value.h Mon Mar 19 12:13:26 2007
@@ -41,8 +41,8 @@
 
 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_EXTERN axiom_soap_fault_value_t * AXIS2_CALL
 axiom_soap_fault_value_create(const axis2_env_t *env);    

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_header.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_header.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_header.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_header.h Mon Mar 19 12:13:26 2007
@@ -41,21 +41,22 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_header_set_base_node(axiom_soap_header_t *header,
-                                const axis2_env_t *env,
-                                axiom_node_t *node);
+    const axis2_env_t *env,
+    axiom_node_t *node);
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_header_set_soap_version(axiom_soap_header_t *header,
-                                   const axis2_env_t *env,
-                                   int soap_version);                                                                                                                                                                                                       
+    const axis2_env_t *env,
+    int soap_version);                                                                                                                                                                                                       
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_header_set_header_block(axiom_soap_header_t *header,
-                                   const axis2_env_t *env,
-                                   struct axiom_soap_header_block *header_block);
+    const axis2_env_t *env,
+    struct axiom_soap_header_block *header_block);
+
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_header_set_builder(axiom_soap_header_t *header,
-                              const axis2_env_t *env,
-                              struct axiom_soap_builder *builder); 
+    const axis2_env_t *env,
+    struct axiom_soap_builder *builder); 
     
     
 AXIS2_EXTERN axiom_soap_header_t * AXIS2_CALL

Modified: webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_header_block.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_header_block.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_header_block.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/_axiom_soap_header_block.h Mon Mar 19 12:13:26 2007
@@ -40,15 +40,15 @@
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_header_block_set_soap_version  
-                        (axiom_soap_header_block_t *header_block,
-                         const axis2_env_t *env,
-                         int soap_version);     
+    (axiom_soap_header_block_t *header_block,
+    const axis2_env_t *env,
+    int soap_version);     
     
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 axiom_soap_header_block_set_base_node
-                        (axiom_soap_header_block_t *header_block,
-                         const axis2_env_t *env,
-                         axiom_node_t *node);
+    (axiom_soap_header_block_t *header_block,
+    const axis2_env_t *env,
+    axiom_node_t *node);
     
 AXIS2_EXTERN axiom_soap_header_block_t * AXIS2_CALL
 axiom_soap_header_block_create(const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/axiom/src/soap/axiom_soap11_builder_helper.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/axiom_soap11_builder_helper.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/axiom_soap11_builder_helper.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/axiom_soap11_builder_helper.h Mon Mar 19 12:13:26 2007
@@ -45,26 +45,19 @@
       */
     AXIS2_EXTERN axiom_soap11_builder_helper_t* AXIS2_CALL
     axiom_soap11_builder_helper_create(const axis2_env_t *env,
-            axiom_soap_builder_t *soap_builder,
-            axiom_stax_builder_t *om_builder);
+        axiom_soap_builder_t *soap_builder,
+        axiom_stax_builder_t *om_builder);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap11_builder_helper_free(axiom_soap11_builder_helper_t *builder_helper,
-            const axis2_env_t *env);
+        const axis2_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_soap11_builder_helper_handle_event(axiom_soap11_builder_helper_t *builder_helper,
-            const axis2_env_t *env,
-            axiom_node_t *om_element_node,
-            int element_level);
+        const axis2_env_t *env,
+        axiom_node_t *om_element_node,
+        int element_level);
 
-#define AXIOM_SOAP11_BUILDER_HELPER_FREE(builder_helper, env) \
-        axiom_soap11_builder_helper_free(builder_helper, env)
-
-#define AXIOM_SOAP11_BUILDER_HELPER_HANDLE_EVENT(builder_helper, \
-            env,  om_element_node, element_level) \
-        axiom_soap11_builder_helper_handle_event(builder_helper, \
-            env,  om_element_node,  element_level)
 
     /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/src/soap/axiom_soap12_builder_helper.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/axiom_soap12_builder_helper.h?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/axiom_soap12_builder_helper.h (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/axiom_soap12_builder_helper.h Mon Mar 19 12:13:26 2007
@@ -44,25 +44,17 @@
       */
     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);
+        axiom_soap_builder_t *soap_builder);
     
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     axiom_soap12_builder_helper_free(axiom_soap12_builder_helper_t *builder_helper,
-            const axis2_env_t *env);
+        const axis2_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL 
     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);
-
-#define AXIOM_SOAP12_BUILDER_HELPER_FREE(builder_helper, env) \
-        axiom_soap12_builder_helper_free(builder_helper, env)
-
-#define AXIOM_SOAP12_BUILDER_HELPER_HANDLE_EVENT(builder_helper, \
-            env,  om_element_node,  element_level) \
-        axiom_soap12_builder_helper_handle_event(builder_helper, \
-            env,  om_element_node,  element_level)
+        const axis2_env_t *env,
+        axiom_node_t *om_element_node,
+        int element_level);
 
     /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c Mon Mar 19 12:13:26 2007
@@ -111,20 +111,20 @@
         return AXIS2_FAILURE;
     }
 
-    soap_envelope = AXIOM_SOAP_BUILDER_GET_SOAP_ENVELOPE(builder_helper->soap_builder, env);
+    soap_envelope = axiom_soap_builder_get_soap_envelope(builder_helper->soap_builder, env);
 
     if (!soap_envelope)
     {
         return AXIS2_FAILURE;
     }
 
-    soap_body = AXIOM_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 = AXIOM_SOAP_BODY_GET_FAULT(soap_body, env);
+    soap_fault = axiom_soap_body_get_fault(soap_body, env);
     if (!soap_fault)
     {
         return AXIS2_FAILURE;
@@ -144,7 +144,7 @@
 
             if (builder_helper->fault_string_present)
             {
-                AXIOM_SOAP_BUILDER_SET_BOOL_PROCESSING_MANDATORY_FAULT_ELEMENTS(
+                axiom_soap_builder_set_bool_processing_mandatory_fault_elements(
                     builder_helper->soap_builder, env, AXIS2_FALSE);
             }
 
@@ -164,7 +164,7 @@
             if (!fault_value)
                 return AXIS2_FAILURE;
 
-            fault_value_node = AXIOM_SOAP_FAULT_VALUE_GET_BASE_NODE(fault_value, env);
+            fault_value_node = axiom_soap_fault_value_get_base_node(fault_value, env);
             if (!fault_value_node)
                 return AXIS2_FAILURE;
 
@@ -196,7 +196,7 @@
             int status = AXIS2_SUCCESS;
             if (builder_helper->fault_code_present)
             {
-                AXIOM_SOAP_BUILDER_SET_BOOL_PROCESSING_MANDATORY_FAULT_ELEMENTS(
+                axiom_soap_builder_set_bool_processing_mandatory_fault_elements(
                     builder_helper->soap_builder, env, AXIS2_FALSE);
             }
 
@@ -214,7 +214,7 @@
             if (!fault_text)
                 return AXIS2_FAILURE;
 
-            fault_text_node = AXIOM_SOAP_FAULT_TEXT_GET_BASE_NODE(fault_text, env);
+            fault_text_node = axiom_soap_fault_text_get_base_node(fault_text, env);
             if (!fault_text_node)
                 return AXIS2_FAILURE;
 
@@ -249,7 +249,7 @@
             axiom_soap_fault_set_role(soap_fault, env, fault_role);
             /*
             Role element may not have a namespace associated, hence commented, else it segfaults here - Samisa
-            status = AXIOM_SOAP_BUILDER_PROCESS_NAMESPACE_DATA(
+            status = axiom_soap_builder_process_namespace_data(
                 builder_helper->soap_builder, env, om_element_node, AXIS2_TRUE);
             if(status == AXIS2_FAILURE)
                     return AXIS2_FAILURE;*/

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?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c Mon Mar 19 12:13:26 2007
@@ -136,15 +136,15 @@
     if (!ele_localname)
         return AXIS2_FAILURE;
 
-    soap_envelope = AXIOM_SOAP_BUILDER_GET_SOAP_ENVELOPE(builder_helper->soap_builder, env);
+    soap_envelope = axiom_soap_builder_get_soap_envelope(builder_helper->soap_builder, env);
     if (!soap_envelope)
         return AXIS2_FAILURE;
 
-    soap_body = AXIOM_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 = AXIOM_SOAP_BODY_GET_FAULT(soap_body, env);
+    soap_fault = axiom_soap_body_get_fault(soap_body, env);
     if (!soap_fault)
         return AXIS2_FAILURE;
 
@@ -398,7 +398,7 @@
 
                     axiom_soap_fault_value_set_base_node(soap_fault_value, env, om_ele_node);
 
-                    parent_fcode = AXIOM_SOAP_FAULT_GET_CODE(soap_fault, env);
+                    parent_fcode = axiom_soap_fault_get_code(soap_fault, env);
                     if (!parent_fcode)
                         return AXIS2_FAILURE;
 
@@ -433,7 +433,7 @@
                         axiom_soap_fault_sub_code_set_base_node(fault_subcode, env, om_ele_node);
 
 
-                        fault_code = AXIOM_SOAP_FAULT_GET_CODE(soap_fault, env);
+                        fault_code = axiom_soap_fault_get_code(soap_fault, env);
                         if (!fault_code)
                             return AXIS2_FAILURE;
 
@@ -478,17 +478,17 @@
 
                 axiom_soap_fault_text_set_base_node(soap_fault_text, env, om_ele_node);
 
-                fault_reason = AXIOM_SOAP_FAULT_GET_REASON(soap_fault, env);
+                fault_reason = axiom_soap_fault_get_reason(soap_fault, env);
                 if (!fault_reason)
                     return AXIS2_FAILURE;
 
-                AXIOM_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->reason_processing = AXIS2_FALSE;
 
-                AXIOM_SOAP_BUILDER_SET_BOOL_PROCESSING_MANDATORY_FAULT_ELEMENTS(builder_helper->soap_builder, env, AXIS2_FALSE);
+                axiom_soap_builder_set_bool_processing_mandatory_fault_elements(builder_helper->soap_builder, env, AXIS2_FALSE);
 
             }
             else
@@ -500,7 +500,7 @@
         }
         else if (axis2_strcmp(parent_localname, AXIOM_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME) == 0)
         {
-            AXIOM_SOAP_BUILDER_SET_PROCESSING_DETAIL_ELEMENTS(builder_helper->soap_builder, env, AXIS2_TRUE);
+            axiom_soap_builder_set_processing_detail_elements(builder_helper->soap_builder, env, AXIS2_TRUE);
 
             if (!(builder_helper->detail_element_names))
             {
@@ -552,7 +552,7 @@
                     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);
+                    code = axiom_soap_fault_get_code(soap_fault, env);
 
                     if (!code)
                     {
@@ -560,7 +560,7 @@
                         return AXIS2_FAILURE;
                     }
 
-                    sub_code = AXIOM_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");
@@ -595,13 +595,13 @@
 
                         axiom_soap_fault_sub_code_set_base_node(subcode, env, om_ele_node);
 
-                        fault_code = AXIOM_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 = AXIOM_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");
@@ -636,7 +636,7 @@
                 return AXIS2_FAILURE;
             }
         }
-        else if (AXIOM_SOAP_BUILDER_IS_PROCESSING_DETAIL_ELEMENTS(builder_helper->soap_builder, env))
+        else if (axiom_soap_builder_is_processing_detail_elements(builder_helper->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?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_body.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_body.c Mon Mar 19 12:13:26 2007
@@ -79,10 +79,10 @@
     }
 
     /*get parent node from SOAP envelope */
-    parent_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(envelope, env);
+    parent_node = axiom_soap_envelope_get_base_node(envelope, env);
     if (!parent_node)
     {
-        AXIOM_SOAP_BODY_FREE(soap_body, env);
+        axiom_soap_body_free(soap_body, env);
         return NULL;
     }
     parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
@@ -90,7 +90,7 @@
 
     if (!parent_ele)
     {
-        AXIOM_SOAP_BODY_FREE(soap_body, env);
+        axiom_soap_body_free(soap_body, env);
         return NULL;
     }
 
@@ -119,7 +119,7 @@
 
     if (soap_body->soap_fault)
     {
-        AXIOM_SOAP_FAULT_FREE(soap_body->soap_fault, env);
+        axiom_soap_fault_free(soap_body->soap_fault, env);
         soap_body->soap_fault = NULL;
     }
     AXIS2_FREE(env->allocator, soap_body);
@@ -144,7 +144,7 @@
         {
             while (!(soap_body->soap_fault) && !(AXIOM_NODE_IS_COMPLETE(soap_body->om_ele_node, env)))
             {
-                status = AXIOM_SOAP_BUILDER_NEXT(soap_body->soap_builder, env);
+                status = axiom_soap_builder_next(soap_body->soap_builder, env);
                 if (status == AXIS2_FAILURE)
                     return AXIS2_FALSE;
             }
@@ -180,7 +180,7 @@
         while (!(soap_body->soap_fault) && !(AXIOM_NODE_IS_COMPLETE(soap_body->om_ele_node, env)))
         {
             int status = AXIS2_SUCCESS;
-            status = AXIOM_SOAP_BUILDER_NEXT(soap_body->soap_builder, env);
+            status = axiom_soap_builder_next(soap_body->soap_builder, env);
             if (status == AXIS2_FAILURE)
                 return NULL;
         }
@@ -239,7 +239,7 @@
     {
         while (AXIOM_NODE_IS_COMPLETE(soap_body->om_ele_node, env) != AXIS2_TRUE)
         {
-            status = AXIOM_SOAP_BUILDER_NEXT(soap_body->soap_builder, env);
+            status = axiom_soap_builder_next(soap_body->soap_builder, env);
             if (status == AXIS2_FAILURE)
                 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?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c Mon Mar 19 12:13:26 2007
@@ -160,12 +160,12 @@
     {
         if (soap_builder->soap_version == AXIOM_SOAP11 && soap_builder->builder_helper)
         {
-            AXIOM_SOAP11_BUILDER_HELPER_FREE((axiom_soap11_builder_helper_t *)(soap_builder->builder_helper), env);
+            axiom_soap11_builder_helper_free((axiom_soap11_builder_helper_t *)(soap_builder->builder_helper), env);
             soap_builder->builder_helper = NULL;
         }
         else if (soap_builder->soap_version == AXIOM_SOAP12 && soap_builder->builder_helper)
         {
-            AXIOM_SOAP12_BUILDER_HELPER_FREE((axiom_soap12_builder_helper_t *)(soap_builder->builder_helper), env);
+            axiom_soap12_builder_helper_free((axiom_soap12_builder_helper_t *)(soap_builder->builder_helper), env);
             soap_builder->builder_helper = NULL;
         }
     }
@@ -305,7 +305,7 @@
     AXIS2_ENV_CHECK(env, NULL);
     if (soap_builder->soap_envelope)
     {
-        return AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(soap_builder->soap_envelope, env);
+        return axiom_soap_envelope_get_base_node(soap_builder->soap_envelope, env);
     }
     else
         return NULL;
@@ -551,7 +551,7 @@
         axiom_soap_header_block_t *header_block = NULL;
         axiom_soap_header_t *soap_header = NULL;
 
-        soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_builder->soap_envelope, env);
+        soap_header = axiom_soap_envelope_get_header(soap_builder->soap_envelope, env);
         if (!soap_header)
             return AXIS2_FAILURE;
 
@@ -575,11 +575,11 @@
         axiom_soap_fault_t *soap_fault = NULL;
         axiom_namespace_t *env_ns = NULL;
 
-        env_ns = AXIOM_SOAP_ENVELOPE_GET_NAMESPACE(soap_builder->soap_envelope, env);
+        env_ns = axiom_soap_envelope_get_namespace(soap_builder->soap_envelope, env);
         if (!env_ns)
             return AXIS2_FAILURE;
 
-        soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_builder->soap_envelope, env);
+        soap_body = axiom_soap_envelope_get_body(soap_builder->soap_envelope, env);
 
         if (!soap_body)
             return AXIS2_FAILURE;
@@ -618,14 +618,14 @@
     {
         if (soap_builder->soap_version == AXIOM_SOAP11)
         {
-            status = AXIOM_SOAP11_BUILDER_HELPER_HANDLE_EVENT(
+            status = axiom_soap11_builder_helper_handle_event(
                         ((axiom_soap11_builder_helper_t*)(soap_builder->builder_helper)),
                         env,  om_element_node , element_level);
 
         }
         else if (soap_builder->soap_version == AXIOM_SOAP12)
         {
-            status = AXIOM_SOAP12_BUILDER_HELPER_HANDLE_EVENT(
+            status = axiom_soap12_builder_helper_handle_event(
                         ((axiom_soap12_builder_helper_t *)(soap_builder->builder_helper)),
                         env,  om_element_node , element_level);
         }
@@ -702,7 +702,7 @@
         return AXIS2_FAILURE;
     }
 
-    envelope_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(soap_builder->soap_envelope, env);
+    envelope_node = axiom_soap_envelope_get_base_node(soap_builder->soap_envelope, env);
 
     if (!envelope_node)
         return AXIS2_FAILURE;
@@ -769,11 +769,11 @@
     if (!soap_builder->soap_envelope)
         return AXIS2_FAILURE;
 
-    soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_builder->soap_envelope, env);
+    soap_header = axiom_soap_envelope_get_header(soap_builder->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)
         {
             while (!AXIOM_NODE_IS_COMPLETE(om_node, env))



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org