axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dushshan...@apache.org
Subject svn commit: r518887 [1/5] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/om/ axiom/src/soap/ axiom/src/util/ axiom/test/om/ axiom/test/soap/ modules/core/deployment/ modules/core/engine/ modules/core/receivers/ modules/core/transport/http/se...
Date Fri, 16 Mar 2007 08:31:06 GMT
Author: dushshantha
Date: Fri Mar 16 01:30:59 2007
New Revision: 518887

URL: http://svn.apache.org/viewvc?view=rev&rev=518887
Log:
removed macros and corrected indentation.

Modified:
    webservices/axis2/trunk/c/axiom/include/axiom_element.h
    webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h
    webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
    webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
    webservices/axis2/trunk/c/axiom/src/om/om_element.c
    webservices/axis2/trunk/c/axiom/src/om/om_node.c
    webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
    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/util/om_util.c
    webservices/axis2/trunk/c/axiom/test/om/test_om.c
    webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
    webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
    webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
    webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.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/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/rampart/samples/client/sec_echo/echo.c
    webservices/axis2/trunk/c/rampart/samples/server/sec_echo/echo.c
    webservices/axis2/trunk/c/rampart/samples/server/sec_echo/echo_skeleton.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_binary_security_token.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_c14n_method.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_cipher_value.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_data_reference.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_method.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_value.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_ds_reference.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_embedded.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encrypted_data.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encryption_method.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_key_identifier.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_key_name.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_method.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_value.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_transform.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_certificate.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_issuer_name.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_serial_number.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/algorithmsuite_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/layout_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/qname_matcher.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_elements_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/token_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss10_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss11_builder.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.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_processor.c
    webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c
    webservices/axis2/trunk/c/rampart/src/util/username_token.c
    webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
    webservices/axis2/trunk/c/samples/client/dynamic_client/test.c
    webservices/axis2/trunk/c/samples/client/echo/echo.c
    webservices/axis2/trunk/c/samples/client/google/google_client.c
    webservices/axis2/trunk/c/samples/client/math/math_client.c
    webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
    webservices/axis2/trunk/c/samples/client/notify/notify_client.c
    webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c
    webservices/axis2/trunk/c/samples/codegen/client/calc_xml_inout/test_Calcultor.c
    webservices/axis2/trunk/c/samples/codegen/server/calc_xml_inout/axis2_Calculator.c
    webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c
    webservices/axis2/trunk/c/samples/server/echo/echo.c
    webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c
    webservices/axis2/trunk/c/samples/server/math/math_skeleton.c
    webservices/axis2/trunk/c/samples/server/mtom/mtom.c
    webservices/axis2/trunk/c/samples/server/mtom/mtom_skeleton.c
    webservices/axis2/trunk/c/samples/server/notify/notify_skeleton.c
    webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c
    webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c
    webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c
    webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c
    webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.c
    webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c
    webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c
    webservices/axis2/trunk/c/savan/samples/server/publisher/publisher.c
    webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c
    webservices/axis2/trunk/c/savan/src/client/savan_client.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
    webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c
    webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c
    webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c
    webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/test_calculator.c
    webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/test_svc.c
    webservices/axis2/trunk/c/tools/codegen/samples/server/calculator/axis2_skel_calculator.c
    webservices/axis2/trunk/c/tools/codegen/samples/server/calculator/axis2_svc_skel_calculator.c
    webservices/axis2/trunk/c/tools/codegen/samples/server/interop_test_svc/axis2_skel_interop_test_port_type_doc_service.c
    webservices/axis2/trunk/c/tools/codegen/samples/server/interop_test_svc/axis2_svc_skel_interop_test_port_type_doc_service.c
    webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
    webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
    webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
    webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
    webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
    webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_deserializer.c
    webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c

Modified: webservices/axis2/trunk/c/axiom/include/axiom_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_element.h?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_element.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_element.h Fri Mar 16 01:30:59 2007
@@ -485,120 +485,6 @@
             const axis2_env_t *env,
             axis2_char_t *attr_name);
 
-    /** finds given namespace with respect to given node */
-#define AXIOM_ELEMENT_FIND_NAMESPACE(om_element,env,om_node, uri, prefix) \
-        axiom_element_find_namespace (om_element, env,om_node, uri, prefix)
-
-    /** declares given namespace with respect to the given node */
-#define AXIOM_ELEMENT_DECLARE_NAMESPACE(om_element, env , om_node, ns) \
-        axiom_element_declare_namespace (om_element, env, om_node, ns)
-
-    /** finds namespace with given qname */
-#define AXIOM_ELEMENT_FIND_NAMESPACE_WITH_QNAME (om_element, env, om_node, qname) \
-        axiom_element_find_namespace_with_qname (om_element, environment, om_node, qname)
-
-    /** adds given attribute to given element */
-#define AXIOM_ELEMENT_ADD_ATTRIBUTE(om_element, env, attribute, element_node) \
-        axiom_element_add_attribute(om_element , env, attribute, element_node)
-
-    /** gets (finds) given attribute in given element */
-#define AXIOM_ELEMENT_GET_ATTRIBUTE(om_element, env, qname) \
-        axiom_element_get_attribute(om_element, env, qname)
-
-    /** free an om element */
-#define AXIOM_ELEMENT_FREE(om_element, env) \
-        axiom_element_free(om_element, env)
-
-    /** serialize the start part of given element */
-#define AXIOM_ELEMENT_SERIALIZE_START_PART(om_element, env, om_output, ele_node) \
-        axiom_element_serialize_start_part(om_element, env, om_output, ele_node)
-
-    /** serialize the end part of given element */
-#define AXIOM_ELEMENT_SERIALIZE_END_PART(om_element, env, om_output) \
-        axiom_element_serialize_end_part(om_element, env, om_output)
-    /** get localname */
-#define AXIOM_ELEMENT_GET_LOCALNAME(om_element, env)\
-        axiom_element_get_localname(om_element,env)
-    /** get namespace of this element */
-#define AXIOM_ELEMENT_GET_NAMESPACE(om_element, env, ele_node) \
-        axiom_element_get_namespace(om_element, env, ele_node)
-    /** set localname */
-#define AXIOM_ELEMENT_SET_LOCALNAME(om_element, env, localname) \
-        axiom_element_set_localname(om_element, env, localname)
-    /** set namespace */
-#define AXIOM_ELEMENT_SET_NAMESPACE(om_element, env, ns , node) \
-        axiom_element_set_namespace(om_element, env, ns, node)
-
-#define AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(om_element, env, uri, prefix) \
-        axiom_element_find_declared_namespace(om_element, env, uri, prefix)
-
-#define AXIOM_ELEMENT_GET_QNAME(om_element, env, ele_node) \
-        axiom_element_get_qname(om_element, env, ele_node)
-
-#define AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(om_element, env) \
-        axiom_element_get_all_attributes(om_element, env)
-
-#define AXIOM_ELEMENT_GET_NAMESPACES(om_element, env) \
-        axiom_element_get_namespaces(om_element, env)
-
-#define AXIOM_ELEMENT_GET_CHILDREN(om_element, env, element_node) \
-        axiom_element_get_children(om_element, env, element_node)
-
-#define AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(om_element, env, \
-            element_qname, element_node) \
-        axiom_element_get_children_with_qname(om_element,\
-            env, element_qname, element_node)
-
-#define AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,\
-            element_qname, element_node , child_node) \
-        axiom_element_get_first_child_with_qname(om_element, env, \
-            element_qname, element_node, child_node)
-
-#define AXIOM_ELEMENT_REMOVE_ATTRIBUTE(om_element, env, om_attribute) \
-        axiom_element_remove_attribute(om_element, env, om_attribute)
-
-#define AXIOM_ELEMENT_GET_FIRST_ELEMENT(om_element, env, element_node, first_node) \
-        axiom_element_get_first_element(om_element, env, element_node, first_node)
-
-#define AXIOM_ELEMENT_GET_TEXT(om_element, env, element_node) \
-        axiom_element_get_text(om_element, env, element_node)
-
-#define AXIOM_ELEMENT_SET_TEXT(om_element, env, text, element_node) \
-        axiom_element_set_text(om_element, env, text, element_node)
-
-#define AXIOM_ELEMENT_TO_STRING(om_element, env, element_node) \
-        axiom_element_to_string(om_element, env, element_node)
-
-#define AXIOM_ELEMENT_GET_CHILD_ELEMENTS(om_element, env, element_node) \
-        axiom_element_get_child_elements(om_element, env, element_node)
-
-#define AXIOM_ELEMENT_BUILD(om_element, env, element_node) \
-        axiom_element_build(om_element, env, element_node)
-
-#define AXIOM_ELEMENT_GET_DEFAULT_NAMESPACE(om_element, env, element_node) \
-        axiom_element_get_default_namespace(om_element, env, element_node)
-
-#define AXIOM_ELEMENT_DECLARE_DEFAULT_NAMESPACE(om_element, env, uri) \
-        axiom_element_declare_default_namespace(om_element, env, uri)
-
-#define AXIOM_ELEMENT_FIND_NAMESPACE_URI(om_element, env, prefix, element_node) \
-        axiom_element_find_namespace_uri(om_element, env, prefix, element_node)
-
-#define AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(om_element, env, qname) \
-        axiom_element_get_attribute_value(om_element, env, qname)
-
-#define AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_element, env, attr_name) \
-        axiom_element_get_attribute_value_by_name(om_element, env, attr_name)
-
-
-#define AXIOM_ELEMENT_SET_NAMESPACE_WITH_NO_FIND_IN_CURRENT_SCOPE(om_element, env, om_ns) \
-        axiom_element_set_namespace_with_no_find_in_current_scope(om_element, env, om_ns)
-
-#define AXIOM_ELEMENT_EXTRACT_ATTRIBUTES(om_element, env, ele_node) \
-        axiom_element_extract_attributes(om_element, env, ele_node)
-
-
-
     /** @} */
 
 

Modified: webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h (original)
+++ webservices/axis2/trunk/c/axiom/src/om/axiom_node_internal.h Fri Mar 16 01:30:59 2007
@@ -73,8 +73,6 @@
  * @return status of the op, AXIS2_SUCCESS on success
  *     AXIS2_FAILURE on error
  */
-
-
 AXIS2_EXTERN axis2_status_t AXIS2_CALL  
 axiom_node_set_previous_sibling(axiom_node_t *om_node,
     const axis2_env_t *env,

Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c Fri Mar 16 01:30:59 2007
@@ -138,7 +138,7 @@
 
             if (om_element &&
                 axiom_children_qname_iterator_qname_matches(env,
-                AXIOM_ELEMENT_GET_QNAME(om_element, env, iterator->current_child),
+                axiom_element_get_qname(om_element, env, iterator->current_child),
                 iterator->given_qname))
             {
                 iterator->matching_node_found = AXIS2_TRUE;

Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c Fri Mar 16 01:30:59 2007
@@ -207,7 +207,7 @@
             axiom_element_t *om_ele = NULL;
             om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
                         iterator_impl->current_child, env);
-            om_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(om_ele, env,
+            om_attr = axiom_element_get_attribute(om_ele, env,
                     iterator_impl->attr_qname);
             break;
             if (om_attr &&

Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Fri Mar 16 01:30:59 2007
@@ -49,12 +49,12 @@
 
 };
 
-AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+AXIS2_EXTERN axiom_element_t *AXIS2_CALL
 axiom_element_create(const axis2_env_t *env,
-        axiom_node_t *parent,
-        const axis2_char_t *localname,
-        axiom_namespace_t *ns,
-        axiom_node_t **node)
+    axiom_node_t *parent,
+    const axis2_char_t *localname,
+    axiom_namespace_t *ns,
+    axiom_node_t **node)
 {
     axiom_element_t *element;
     AXIS2_ENV_CHECK(env, NULL);
@@ -72,7 +72,7 @@
         return NULL;
     }
     element = (axiom_element_t *) AXIS2_MALLOC(env->allocator,
-            sizeof(axiom_element_t));
+        sizeof(axiom_element_t));
 
     if (!element)
     {
@@ -102,7 +102,6 @@
     if (parent)
     {
         AXIOM_NODE_ADD_CHILD(parent, env, (*node));
-
     }
     axiom_node_set_complete((*node), env, AXIS2_FALSE);
     axiom_node_set_node_type((*node), env, AXIOM_ELEMENT);
@@ -117,12 +116,14 @@
         prefix = axiom_namespace_get_prefix(ns, env);
 
         element->ns = axiom_element_find_namespace(element,
-                env, *node, uri, prefix);
+            env, *node, uri, prefix);
         if (!(element->ns))
         {
             if (axiom_element_declare_namespace(element,
-                    env, *node, ns) == AXIS2_SUCCESS)
+                env, *node, ns) == AXIS2_SUCCESS)
+            {
                 element->ns = ns;
+            }
         }
         if (prefix && AXIS2_STRCMP(prefix, "") == 0)
         {
@@ -133,11 +134,11 @@
     return element;
 }
 
-AXIS2_EXTERN axiom_element_t * AXIS2_CALL
+AXIS2_EXTERN axiom_element_t *AXIS2_CALL
 axiom_element_create_with_qname(const axis2_env_t *env,
-        axiom_node_t *parent,
-        const axis2_qname_t *qname,
-        axiom_node_t ** node)
+    axiom_node_t *parent,
+    const axis2_qname_t *qname,
+    axiom_node_t ** node)
 {
     axiom_element_t *element = NULL;
     axis2_char_t *localpart = NULL;
@@ -156,7 +157,9 @@
     }
     element = axiom_element_create(env, parent, localpart, NULL, node);
     if (!element)
+    {
         return NULL;
+    }
 
     if (*node)
     {
@@ -169,9 +172,11 @@
         temp_nsuri = AXIS2_QNAME_GET_URI(qname, env);
         temp_prefix = AXIS2_QNAME_GET_PREFIX(qname, env);
         if (!om_element)
+        {
             return NULL;
+        }
 
-        if ((NULL == temp_nsuri) || (AXIS2_STRCMP(temp_nsuri, "") == 0))
+        if ((!temp_nsuri) || (AXIS2_STRCMP(temp_nsuri, "") == 0))
         {
             /** no namespace uri is available in given qname
                 no need to bother about it 
@@ -180,7 +185,7 @@
         }
 
         om_element->ns = axiom_element_find_namespace(om_element, env,
-                (*node), temp_nsuri, temp_prefix);
+            (*node), temp_nsuri, temp_prefix);
 
         if (!(element->ns))
         {
@@ -194,7 +199,7 @@
             else
             {
                 axiom_namespace_free(ns, env);
-                AXIOM_ELEMENT_FREE(om_element, env);
+                axiom_element_free(om_element, env);
                 AXIS2_FREE(env->allocator, *node);
                 return NULL;
             }
@@ -203,12 +208,12 @@
     return element;
 }
 
-AXIS2_EXTERN axiom_namespace_t * AXIS2_CALL
+AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_find_namespace(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t * element_node,
-        const axis2_char_t * uri,
-        const axis2_char_t * prefix)
+    const axis2_env_t *env,
+    axiom_node_t * element_node,
+    const axis2_char_t * uri,
+    const axis2_char_t * prefix)
 {
     axiom_node_t *parent = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -216,11 +221,11 @@
     if (!element_node || !om_element)
     {
         AXIS2_ERROR_SET(env->error,
-                AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
+            AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
         return NULL;
     }
     if (!AXIOM_NODE_GET_DATA_ELEMENT(element_node, env) ||
-            AXIOM_NODE_GET_NODE_TYPE(element_node, env) != AXIOM_ELEMENT)
+        AXIOM_NODE_GET_NODE_TYPE(element_node, env) != AXIOM_ELEMENT)
     {
         /* wrong element type or null node */
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -238,7 +243,7 @@
             axis2_hash_index_t *hashindex;
 
             default_ns = axiom_element_get_default_namespace(om_element ,
-                    env, element_node);
+                env, element_node);
             if (default_ns && NULL != uri)
             {
                 axis2_char_t *default_uri = NULL;
@@ -251,7 +256,7 @@
             }
             /** prefix is null , so iterate the namespaces hash to find the namespace */
             for (hashindex = axis2_hash_first(om_element->namespaces, env);
-                    hashindex; hashindex = axis2_hash_next(env, hashindex))
+                hashindex; hashindex = axis2_hash_next(env, hashindex))
             {
                 axis2_hash_this(hashindex, NULL, NULL, &ns);
                 if (ns)
@@ -278,11 +283,11 @@
         {
             /** prefix is not null get namespace directly if exist */
             ns = axis2_hash_get(om_element->namespaces, prefix,
-                    AXIS2_HASH_KEY_STRING);
+                AXIS2_HASH_KEY_STRING);
             if (ns)
             {
                 axiom_namespace_t *found_ns  = NULL;
-                axis2_char_t *found_uri         = NULL;
+                axis2_char_t *found_uri = NULL;
                 found_ns = (axiom_namespace_t*)ns;
 
                 found_uri = axiom_namespace_get_uri(found_ns, env);
@@ -298,6 +303,7 @@
             }
         }
     }
+
     /** could not find the namespace in current element scope
         look in the parent */
 
@@ -312,7 +318,7 @@
             if (om_element)
             {   /** parent exist, parent is om element so find in parent*/
                 return axiom_element_find_namespace(om_element, env,
-                        parent, uri, prefix);
+                    parent, uri, prefix);
             }
         }
     }
@@ -321,8 +327,8 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_declare_namespace_assume_param_ownership(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_namespace_t *ns)
+    const axis2_env_t *env,
+    axiom_namespace_t *ns)
 {
     axis2_char_t *prefix = NULL;
     axis2_char_t *uri    = NULL;
@@ -332,8 +338,7 @@
     if (!ns || !om_element)
     {
         AXIS2_ERROR_SET(env->error,
-                AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
-
+            AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
 
@@ -344,12 +349,14 @@
     {
         om_element->namespaces = axis2_hash_make(env);
         if (!(om_element->namespaces))
+        {
             return AXIS2_FAILURE;
+        }
     }
     if (prefix)
     {
         axis2_hash_set(om_element->namespaces,
-                prefix, AXIS2_HASH_KEY_STRING, ns);
+            prefix, AXIS2_HASH_KEY_STRING, ns);
     }
     else
     {
@@ -359,7 +366,7 @@
         om_element->next_ns_prefix_number++;
         sprintf(key, "axis2ns%d", om_element->next_ns_prefix_number);
         axis2_hash_set(om_element->namespaces, key,
-                AXIS2_HASH_KEY_STRING,  ns);
+            AXIS2_HASH_KEY_STRING, ns);
     }
     axiom_namespace_increment_ref(ns, env);
 
@@ -368,9 +375,9 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_declare_namespace(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t *node,
-        axiom_namespace_t *ns)
+    const axis2_env_t *env,
+    axiom_node_t *node,
+    axiom_namespace_t *ns)
 {
     axiom_namespace_t *declared_ns = NULL;
     axis2_char_t *prefix = NULL;
@@ -381,8 +388,7 @@
     if (!node || !ns || !om_element)
     {
         AXIS2_ERROR_SET(env->error,
-                AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
-
+            AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
 
@@ -390,12 +396,13 @@
     prefix = axiom_namespace_get_prefix(ns, env);
 
     declared_ns = axiom_element_find_namespace(om_element,
-            env, node, uri, prefix);
+        env, node, uri, prefix);
 
     if (declared_ns)
     {
         if (axiom_namespace_equals(ns, env, declared_ns) == AXIS2_TRUE)
-        {/*Namespace already declared, so return */
+        {
+            /*Namespace already declared, so return */
             return AXIS2_SUCCESS;
         }
     }
@@ -404,12 +411,14 @@
     {
         om_element->namespaces = axis2_hash_make(env);
         if (!(om_element->namespaces))
+        {
             return AXIS2_FAILURE;
+        }
     }
     if (prefix)
     {
         axis2_hash_set(om_element->namespaces,
-                prefix, AXIS2_HASH_KEY_STRING, ns);
+            prefix, AXIS2_HASH_KEY_STRING, ns);
     }
     else
     {
@@ -419,25 +428,24 @@
         om_element->next_ns_prefix_number++;
         sprintf(key, "axis2ns%d", om_element->next_ns_prefix_number);
         axis2_hash_set(om_element->namespaces, key,
-                AXIS2_HASH_KEY_STRING,  ns);
+            AXIS2_HASH_KEY_STRING,  ns);
     }
     axiom_namespace_increment_ref(ns, env);
 
     return AXIS2_SUCCESS;
 }
 
-AXIS2_EXTERN axiom_namespace_t * AXIS2_CALL
+AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_find_declared_namespace(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        const axis2_char_t * uri,
-        const axis2_char_t * prefix)
+    const axis2_env_t *env,
+    const axis2_char_t * uri,
+    const axis2_char_t * prefix)
 {
     axis2_hash_index_t *hash_index = NULL;
     void *ns = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, uri, NULL);
 
-
     if (!(om_element->namespaces))
     {
         return NULL;
@@ -446,7 +454,7 @@
     {
         /** prefix null iterate the namespace hash for matching uri */
         for (hash_index = axis2_hash_first(om_element->namespaces, env);
-                hash_index; hash_index = axis2_hash_next(env, hash_index))
+            hash_index; hash_index = axis2_hash_next(env, hash_index))
         {
             axis2_hash_this(hash_index, NULL, NULL, &ns);
             if (ns)
@@ -486,12 +494,11 @@
     return NULL;
 }
 
-
-AXIS2_EXTERN axiom_namespace_t * AXIS2_CALL
+AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_find_namespace_with_qname(axiom_element_t *element,
-        const axis2_env_t *env,
-        axiom_node_t *node,
-        axis2_qname_t *qname)
+    const axis2_env_t *env,
+    axiom_node_t *node,
+    axis2_qname_t *qname)
 {
     AXIS2_ENV_CHECK(env, NULL);
     if (!element || !node || !qname)
@@ -503,8 +510,8 @@
     if (AXIS2_QNAME_GET_URI(qname, env))
     {
         return axiom_element_find_namespace(element, env, node,
-                AXIS2_QNAME_GET_URI(qname, env),
-                AXIS2_QNAME_GET_PREFIX(qname, env));
+            AXIS2_QNAME_GET_URI(qname, env),
+            AXIS2_QNAME_GET_PREFIX(qname, env));
     }
     else
     {
@@ -514,9 +521,9 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_add_attribute(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_attribute_t *attribute,
-        axiom_node_t *element_node)
+    const axis2_env_t *env,
+    axiom_attribute_t *attribute,
+    axiom_node_t *element_node)
 {
 
     axis2_qname_t *qname = NULL;
@@ -530,18 +537,19 @@
 
     if (om_namespace)
     {
-        temp_ns = AXIOM_ELEMENT_FIND_NAMESPACE
-                (om_element, env,
-                        element_node,
-                        axiom_namespace_get_uri(om_namespace, env),
-                        axiom_namespace_get_prefix(om_namespace, env));
+        temp_ns = axiom_element_find_namespace(om_element, env,
+            element_node,
+            axiom_namespace_get_uri(om_namespace, env),
+            axiom_namespace_get_prefix(om_namespace, env));
         if (!temp_ns)
         {
             axis2_status_t status = AXIS2_SUCCESS;
-            status = AXIOM_ELEMENT_DECLARE_NAMESPACE(om_element, env,
-                    element_node, om_namespace);
+            status = axiom_element_declare_namespace(om_element, env,
+                element_node, om_namespace);
             if (status == AXIS2_FAILURE)
+            {
                 return AXIS2_FAILURE;
+            }
         }
     }
 
@@ -549,7 +557,9 @@
     {
         om_element->attributes = axis2_hash_make(env);
         if (!(om_element->attributes))
+        {
             return AXIS2_FAILURE;
+        }
     }
 
     qname = axiom_attribute_get_qname(attribute, env);
@@ -557,17 +567,17 @@
     {
         axis2_char_t *name = AXIS2_QNAME_TO_STRING(qname, env);
         axis2_hash_set(om_element->attributes,
-                name, AXIS2_HASH_KEY_STRING,
-                attribute);
+            name, AXIS2_HASH_KEY_STRING,
+            attribute);
     }
     axiom_attribute_increment_ref(attribute, env);
     return ((qname) ? AXIS2_SUCCESS : AXIS2_FAILURE);
 }
 
-AXIS2_EXTERN axiom_attribute_t * AXIS2_CALL
+AXIS2_EXTERN axiom_attribute_t *AXIS2_CALL
 axiom_element_get_attribute(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axis2_qname_t *qname)
+    const axis2_env_t *env,
+    axis2_qname_t *qname)
 {
     axis2_char_t *name = NULL;
     axiom_attribute_t *attr = NULL;
@@ -578,24 +588,26 @@
 
     if ((om_element->attributes) && name)
     {
-        attr = (axiom_attribute_t*)(axis2_hash_get(om_element->attributes, name, AXIS2_HASH_KEY_STRING));
+        attr = (axiom_attribute_t*)(axis2_hash_get(om_element->attributes,
+            name, AXIS2_HASH_KEY_STRING));
     }
     return attr;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_free(axiom_element_t *om_element,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     axis2_status_t status = AXIS2_SUCCESS;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if (!om_element)
+    {
         return AXIS2_FAILURE;
+    }
 
     if (om_element->localname)
     {
         AXIS2_FREE(env->allocator, om_element->localname);
-        om_element->localname = NULL;
     }
     if (om_element->ns)
     {
@@ -607,7 +619,7 @@
         void *val = NULL;
 
         for (hi = axis2_hash_first(om_element->attributes, env); hi;
-                hi = axis2_hash_next(env, hi))
+            hi = axis2_hash_next(env, hi))
         {
             axis2_hash_this(hi, NULL, NULL, &val);
 
@@ -615,10 +627,8 @@
             {
                 axiom_attribute_free((axiom_attribute_t *)val, env);
             }
-            val = NULL;
         }
         axis2_hash_free(om_element->attributes, env);
-        om_element->attributes = NULL;
     }
 
     if (om_element->namespaces)
@@ -626,44 +636,36 @@
         axis2_hash_index_t *hi;
         void *val = NULL;
         for (hi = axis2_hash_first(om_element->namespaces, env); hi;
-                hi = axis2_hash_next(env, hi))
+            hi = axis2_hash_next(env, hi))
         {
             axis2_hash_this(hi, NULL, NULL, &val);
             if (val)
             {
                 axiom_namespace_free((axiom_namespace_t *)val, env);
-                val = NULL;
             }
         }
         axis2_hash_free(om_element->namespaces, env);
-        om_element->namespaces = NULL;
     }
     if (om_element->qname)
     {
         AXIS2_QNAME_FREE(om_element->qname, env);
-        om_element->qname = NULL;
     }
     if (om_element->children_iter)
     {
         axiom_children_iterator_free(om_element->children_iter, env);
-        om_element->children_iter = NULL;
     }
     if (om_element->child_ele_iter)
     {
         AXIOM_CHILD_ELEMENT_ITERATOR_FREE(om_element->child_ele_iter, env);
-        om_element->child_ele_iter = NULL;
     }
     if (om_element->children_qname_iter)
     {
         axiom_children_qname_iterator_free(om_element->children_qname_iter, env);
-        om_element->children_qname_iter = NULL;
     }
     if (om_element->text_value)
     {
         AXIS2_FREE(env->allocator, om_element->text_value);
-        om_element->text_value = NULL;
     }
-
     AXIS2_FREE(env->allocator, om_element);
 
     return status;
@@ -671,9 +673,9 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_serialize_start_part(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_output_t *om_output,
-        axiom_node_t *ele_node)
+    const axis2_env_t *env,
+    axiom_output_t *om_output,
+    axiom_node_t *ele_node)
 {
     int status = AXIS2_SUCCESS;
 
@@ -688,38 +690,38 @@
         uri = axiom_namespace_get_uri(om_element->ns, env);
         prefix = axiom_namespace_get_prefix(om_element->ns, env);
 
-        if ((uri) && (NULL != prefix) && (AXIS2_STRCMP(prefix, "") != 0))
+        if ((uri) && (prefix) && (AXIS2_STRCMP(prefix, "") != 0))
         {
             status = axiom_output_write(om_output, env,
-                    AXIOM_ELEMENT, 3, om_element->localname,
-                    uri, prefix);
-
+                AXIOM_ELEMENT, 3, om_element->localname,
+                uri, prefix);
         }
         else if (uri)
         {
             status = axiom_output_write(om_output, env,
-                    AXIOM_ELEMENT, 2, om_element->localname, uri);
+                AXIOM_ELEMENT, 2, om_element->localname, uri);
         }
     }
     else
     {
         status = axiom_output_write(om_output, env,
-                AXIOM_ELEMENT, 1, om_element->localname);
-
+            AXIOM_ELEMENT, 1, om_element->localname);
     }
     if (om_element->attributes)
     {
         axis2_hash_index_t *hi;
         void *val;
         for (hi = axis2_hash_first(om_element->attributes, env); hi;
-                hi = axis2_hash_next(env, hi))
+            hi = axis2_hash_next(env, hi))
         {
             axis2_hash_this(hi, NULL, NULL, &val);
 
             if (val)
+            {
                 status =
                     axiom_attribute_serialize((axiom_attribute_t *)val,
-                            env, om_output);
+                        env, om_output);
+            }
             else
             {
                 status = AXIS2_FAILURE;
@@ -733,28 +735,30 @@
         axis2_hash_index_t *hi;
         void *val;
         for (hi = axis2_hash_first(om_element->namespaces, env); hi;
-                hi = axis2_hash_next(env, hi))
+            hi = axis2_hash_next(env, hi))
         {
             axis2_hash_this(hi, NULL, NULL, &val);
 
             if (val)
+            {
                 status =
                     axiom_namespace_serialize((axiom_namespace_t *)val,
-                            env, om_output);
+                        env, om_output);
+            }
             else
             {
                 status = AXIS2_FAILURE;
             }
         }
     }
-    
+
     return status;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_serialize_end_part(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_output_t * om_output)
+    const axis2_env_t *env,
+    axiom_output_t * om_output)
 {
     int status = AXIS2_SUCCESS;
     AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
@@ -765,16 +769,15 @@
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axiom_element_get_localname(axiom_element_t *om_element,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
     return om_element->localname;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_set_localname(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        const axis2_char_t *localname)
+    const axis2_env_t *env,
+    const axis2_char_t *localname)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
@@ -793,8 +796,8 @@
 
 AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_get_namespace(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t *ele_node)
+    const axis2_env_t *env,
+    axiom_node_t *ele_node)
 
 {
     axiom_namespace_t *ns = NULL;
@@ -806,9 +809,9 @@
     }
     else
     {   /* TODO need to change get_namespace and get_qname methods so
-                                            that default namespace is handled properly */
+            that default namespace is handled properly */
         ns = axiom_element_get_default_namespace(
-                    om_element, env, ele_node);
+            om_element, env, ele_node);
 
     }
     return ns;
@@ -816,22 +819,24 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_set_namespace(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_namespace_t *ns,
-        axiom_node_t *node)
+    const axis2_env_t *env,
+    axiom_namespace_t *ns,
+    axiom_node_t *node)
 {
     axiom_namespace_t *om_ns = NULL;
     axis2_status_t status = AXIS2_SUCCESS;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, ns , AXIS2_FAILURE);
     om_ns = axiom_element_find_namespace(om_element, env, node,
-            axiom_namespace_get_uri(ns, env),
-            axiom_namespace_get_prefix(ns , env));
+        axiom_namespace_get_uri(ns, env),
+        axiom_namespace_get_prefix(ns , env));
     if (!om_ns)
     {
         status = axiom_element_declare_namespace(om_element, env, node, ns);
         if (status == AXIS2_FAILURE)
+        {
             return AXIS2_FAILURE;
+        }
         om_element->ns = ns;
     }
     else
@@ -843,36 +848,32 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_set_namespace_assume_param_ownership(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_namespace_t *ns)
+    const axis2_env_t *env,
+    axiom_namespace_t *ns)
 {
     om_element->ns = ns;
     return AXIS2_SUCCESS;
 }
 
-
-AXIS2_EXTERN axis2_hash_t * AXIS2_CALL
+AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axiom_element_get_all_attributes(axiom_element_t *om_element,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
 
-    AXIS2_ENV_CHECK(env, NULL);
     return om_element->attributes;
 }
 
-AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
-axiom_element_get_namespaces
-(axiom_element_t *om_element,
-        const axis2_env_t *env)
+AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
+axiom_element_get_namespaces(axiom_element_t *om_element,
+    const axis2_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
     return om_element->namespaces;
 }
 
-AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
+AXIS2_EXTERN axis2_qname_t *AXIS2_CALL
 axiom_element_get_qname(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t *ele_node)
+    const axis2_env_t *env,
+    axiom_node_t *ele_node)
 {
     axiom_namespace_t *ns =  NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -883,41 +884,39 @@
     }
     else
     {
-        ns = AXIOM_ELEMENT_GET_NAMESPACE(om_element, env, ele_node);
+        ns = axiom_element_get_namespace(om_element, env, ele_node);
         if (ns)
         {
             if (axiom_namespace_get_prefix(ns, env))
             {
                 om_element->qname = axis2_qname_create(env ,
-                        om_element->localname,
-                        axiom_namespace_get_uri(ns, env),
-                        axiom_namespace_get_prefix(ns, env));
+                    om_element->localname,
+                    axiom_namespace_get_uri(ns, env),
+                    axiom_namespace_get_prefix(ns, env));
             }
             else
             {
                 om_element->qname = axis2_qname_create(env,
-                        om_element->localname,
-                        axiom_namespace_get_uri(ns, env),
-                        NULL);
+                    om_element->localname,
+                    axiom_namespace_get_uri(ns, env),
+                    NULL);
             }
-
         }
         else
         {
             om_element->qname = axis2_qname_create(env,
-                    om_element->localname,
-                    NULL,  NULL);
+                om_element->localname,
+                NULL,  NULL);
         }
     }
     return om_element->qname;
 }
 
-AXIS2_EXTERN axiom_children_iterator_t* AXIS2_CALL
+AXIS2_EXTERN axiom_children_iterator_t *AXIS2_CALL
 axiom_element_get_children(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t *element_node)
+    const axis2_env_t *env,
+    axiom_node_t *element_node)
 {
-    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, element_node, NULL);
     if (om_element->children_iter)
     {
@@ -926,19 +925,18 @@
     else
     {
         om_element->children_iter = axiom_children_iterator_create(env,
-                AXIOM_NODE_GET_FIRST_CHILD(element_node, env));
+            AXIOM_NODE_GET_FIRST_CHILD(element_node, env));
         return om_element->children_iter;
     }
     return NULL;
 }
 
-AXIS2_EXTERN axiom_children_qname_iterator_t* AXIS2_CALL
+AXIS2_EXTERN axiom_children_qname_iterator_t *AXIS2_CALL
 axiom_element_get_children_with_qname(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axis2_qname_t *element_qname,
-        axiom_node_t *element_node)
+    const axis2_env_t *env,
+    axis2_qname_t *element_qname,
+    axiom_node_t *element_node)
 {
-    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, element_node, NULL);
     if (om_element->children_qname_iter)
     {
@@ -946,17 +944,17 @@
         om_element->children_qname_iter = NULL;
     }
     om_element->children_qname_iter =  axiom_children_qname_iterator_create(env,
-            AXIOM_NODE_GET_FIRST_CHILD(element_node, env),
-            element_qname);
+        AXIOM_NODE_GET_FIRST_CHILD(element_node, env),
+        element_qname);
     return om_element->children_qname_iter;
 }
 
-AXIS2_EXTERN axiom_element_t* AXIS2_CALL
+AXIS2_EXTERN axiom_element_t *AXIS2_CALL
 axiom_element_get_first_child_with_qname(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axis2_qname_t *element_qname,
-        axiom_node_t *element_node,
-        axiom_node_t **child_node)
+    const axis2_env_t *env,
+    axis2_qname_t *element_qname,
+    axiom_node_t *element_node,
+    axiom_node_t **child_node)
 {
     axiom_node_t *om_node = NULL;
     axiom_children_qname_iterator_t *children_iterator = NULL;
@@ -965,15 +963,16 @@
     AXIS2_PARAM_CHECK(env->error, element_node, NULL);
 
     children_iterator = axiom_children_qname_iterator_create(env,
-            AXIOM_NODE_GET_FIRST_CHILD(element_node, env),
-            element_qname);
+        AXIOM_NODE_GET_FIRST_CHILD(element_node, env),
+        element_qname);
     if (!children_iterator)
+    {
         return NULL;
+    }
 
     if (axiom_children_qname_iterator_has_next(children_iterator, env))
     {
         om_node = axiom_children_qname_iterator_next(children_iterator, env);
-
     }
     if (om_node && (AXIOM_NODE_GET_NODE_TYPE(om_node, env) == AXIOM_ELEMENT))
     {
@@ -995,8 +994,8 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_remove_attribute(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_attribute_t *om_attribute)
+    const axis2_env_t *env,
+    axiom_attribute_t *om_attribute)
 {
     axis2_qname_t *qname = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1010,18 +1009,18 @@
         if (name)
         {
             axis2_hash_set(om_element->attributes, name,
-                    AXIS2_HASH_KEY_STRING, NULL);
+                AXIS2_HASH_KEY_STRING, NULL);
             return AXIS2_SUCCESS;
         }
     }
     return AXIS2_FAILURE;
 }
 
-AXIS2_EXTERN axiom_element_t* AXIS2_CALL
+AXIS2_EXTERN axiom_element_t *AXIS2_CALL
 axiom_element_get_first_element(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t *element_node,
-        axiom_node_t **first_ele_node)
+    const axis2_env_t *env,
+    axiom_node_t *element_node,
+    axiom_node_t **first_ele_node)
 {
     axiom_node_t *temp_node = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -1046,15 +1045,15 @@
     return NULL;
 }
 
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_element_get_text(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t *element_node)
+    const axis2_env_t *env,
+    axiom_node_t *element_node)
 {
     axis2_char_t *dest = NULL;
-    axis2_char_t* temp_text = NULL;
-    axiom_text_t* text_node = NULL;
-    axiom_node_t* temp_node = NULL;
+    axis2_char_t *temp_text = NULL;
+    axiom_text_t *text_node = NULL;
+    axiom_node_t *temp_node = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, element_node, NULL);
@@ -1084,11 +1083,11 @@
                     dest_len = AXIS2_STRLEN(dest);
                     curr_len = dest_len + AXIS2_STRLEN(temp_text);
                     temp_dest = AXIS2_MALLOC(env->allocator,
-                            (curr_len + 1) * sizeof(axis2_char_t));
+                        (curr_len + 1) * sizeof(axis2_char_t));
 
                     memcpy(temp_dest, dest, dest_len*sizeof(axis2_char_t));
                     memcpy((temp_dest + dest_len * sizeof(axis2_char_t)),
-                            temp_text, curr_len - dest_len);
+                        temp_text, curr_len - dest_len);
 
                     temp_dest[curr_len] = '\0';
 
@@ -1111,13 +1110,13 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_set_text(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        const axis2_char_t *text,
-        axiom_node_t *element_node)
-{
-    axiom_node_t* temp_node = NULL;
-    axiom_text_t* om_text = NULL;
-    axiom_node_t* node_to_free = NULL;
+    const axis2_env_t *env,
+    const axis2_char_t *text,
+    axiom_node_t *element_node)
+{
+    axiom_node_t *temp_node = NULL;
+    axiom_text_t *om_text = NULL;
+    axiom_node_t *node_to_free = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, text, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, element_node, AXIS2_FAILURE);
@@ -1139,10 +1138,10 @@
     return AXIS2_SUCCESS;
 }
 
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_element_to_string(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t *element_node)
+    const axis2_env_t *env,
+    axiom_node_t *element_node)
 {
     int status = AXIS2_SUCCESS;
     axiom_output_t *om_output = NULL;
@@ -1152,13 +1151,17 @@
     AXIS2_PARAM_CHECK(env->error, element_node, NULL);
 
     xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
-            AXIS2_XML_PARSER_TYPE_BUFFER);
+        AXIS2_XML_PARSER_TYPE_BUFFER);
     if (!xml_writer)
+    {
         return NULL;
+    }
 
     om_output = axiom_output_create(env, xml_writer);
     if (!om_output)
+    {
         return NULL;
+    }
 
     status = AXIOM_NODE_SERIALIZE(element_node, env, om_output);
     if (status == AXIS2_SUCCESS)
@@ -1169,16 +1172,16 @@
     return xml;
 }
 
-AXIS2_EXTERN axiom_child_element_iterator_t * AXIS2_CALL
+AXIS2_EXTERN axiom_child_element_iterator_t *AXIS2_CALL
 axiom_element_get_child_elements(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t *element_node)
+    const axis2_env_t *env,
+    axiom_node_t *element_node)
 {
     axiom_node_t *first_node = NULL;
     axiom_element_t *ele = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, element_node, NULL);
-    ele = AXIOM_ELEMENT_GET_FIRST_ELEMENT(om_element, env, element_node, &first_node);
+    ele = axiom_element_get_first_element(om_element, env, element_node, &first_node);
     if (om_element->child_ele_iter)
     {
         return om_element->child_ele_iter;
@@ -1193,34 +1196,40 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_element_build(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t *om_ele_node)
+    const axis2_env_t *env,
+    axiom_node_t *om_ele_node)
 {
     axiom_stax_builder_t *builder = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     AXIS2_PARAM_CHECK(env->error, om_ele_node, AXIS2_FAILURE);
     if (AXIOM_NODE_GET_NODE_TYPE(om_ele_node, env) != AXIOM_ELEMENT)
+    {
         return AXIS2_FAILURE;
+    }
 
     builder = axiom_node_get_builder(om_ele_node, env);
     if (!builder)
+    {
         return AXIS2_FAILURE;
+    }
     while (!AXIOM_NODE_IS_COMPLETE(om_ele_node, env) &&
-            !axiom_stax_builder_is_complete(builder, env))
+        !axiom_stax_builder_is_complete(builder, env))
     {
         void *value  = NULL;
         value = axiom_stax_builder_next(builder, env);
         if (!value)
+        {
             return AXIS2_FAILURE;
+        }
     }
     return AXIS2_SUCCESS;
 }
 
-AXIS2_EXTERN axiom_namespace_t* AXIS2_CALL
+AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_get_default_namespace(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t *element_node)
+    const axis2_env_t *env,
+    axiom_node_t *element_node)
 {
     axiom_node_t *parent_node = NULL;
     axiom_namespace_t *default_ns = NULL;
@@ -1231,7 +1240,7 @@
     if (om_element->namespaces)
     {
         default_ns = axis2_hash_get(om_element->namespaces, "",
-                AXIS2_HASH_KEY_STRING);
+            AXIS2_HASH_KEY_STRING);
         if (default_ns)
         {
             return default_ns;
@@ -1240,11 +1249,11 @@
 
     parent_node = AXIOM_NODE_GET_PARENT(element_node, env);
     if ((parent_node) &&
-            (AXIOM_NODE_GET_NODE_TYPE(parent_node, env) == AXIOM_ELEMENT))
+        (AXIOM_NODE_GET_NODE_TYPE(parent_node, env) == AXIOM_ELEMENT))
     {
         axiom_element_t *parent_ele = NULL;
         parent_ele = (axiom_element_t *)
-                AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+            AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
         if (parent_ele)
         {
             return axiom_element_get_default_namespace(parent_ele, env, parent_node);
@@ -1256,17 +1265,19 @@
 /**
 * declared a default namespace explicitly
 */
-AXIS2_EXTERN axiom_namespace_t* AXIS2_CALL
+AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_declare_default_namespace(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axis2_char_t *uri)
+    const axis2_env_t *env,
+    axis2_char_t *uri)
 {
     axiom_namespace_t *default_ns = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, uri, NULL);
 
     if (AXIS2_STRCMP(uri, "") == 0)
+    {
         return NULL;
+    }
 
     default_ns = axiom_namespace_create(env, uri, "");
     if (!default_ns)
@@ -1283,7 +1294,7 @@
     }
 
     axis2_hash_set(om_element->namespaces, "",
-            AXIS2_HASH_KEY_STRING, default_ns);
+        AXIS2_HASH_KEY_STRING, default_ns);
     axiom_namespace_increment_ref(default_ns, env);
     return default_ns;
 }
@@ -1293,11 +1304,11 @@
 * with the given prefix
 */
 
-AXIS2_EXTERN axiom_namespace_t* AXIS2_CALL
+AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
 axiom_element_find_namespace_uri(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axis2_char_t *prefix,
-        axiom_node_t *element_node)
+    const axis2_env_t *env,
+    axis2_char_t *prefix,
+    axiom_node_t *element_node)
 {
     axiom_node_t *parent_node = NULL;
     axiom_namespace_t *ns = NULL;
@@ -1309,7 +1320,7 @@
     if (om_element->namespaces)
     {
         ns = axis2_hash_get(om_element->namespaces, prefix,
-                AXIS2_HASH_KEY_STRING);
+            AXIS2_HASH_KEY_STRING);
         if (ns)
         {
             return ns;
@@ -1318,11 +1329,11 @@
 
     parent_node = AXIOM_NODE_GET_PARENT(element_node, env);
     if ((parent_node) &&
-            (AXIOM_NODE_GET_NODE_TYPE(parent_node, env) == AXIOM_ELEMENT))
+        (AXIOM_NODE_GET_NODE_TYPE(parent_node, env) == AXIOM_ELEMENT))
     {
         axiom_element_t *parent_ele = NULL;
         parent_ele = (axiom_element_t *)
-                AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
+            AXIOM_NODE_GET_DATA_ELEMENT(parent_node, env);
         if (parent_ele)
         {
             return axiom_element_find_namespace_uri(parent_ele, env, prefix, parent_node);
@@ -1331,10 +1342,10 @@
     return NULL;
 }
 
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axiom_element_get_attribute_value(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axis2_qname_t *qname)
+    const axis2_env_t *env,
+    axis2_qname_t *qname)
 {
     axis2_char_t *name = NULL;
     axiom_attribute_t *attr = NULL;
@@ -1346,7 +1357,7 @@
     if ((om_element->attributes) && (NULL != name))
     {
         attr = (axiom_attribute_t*) axis2_hash_get(om_element->attributes,
-                name, AXIS2_HASH_KEY_STRING);
+            name, AXIS2_HASH_KEY_STRING);
         if (attr)
         {
             return axiom_attribute_get_value(attr, env);
@@ -1367,10 +1378,10 @@
     return AXIS2_SUCCESS;
 }
 
-AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
+AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
 axiom_element_extract_attributes(axiom_element_t *om_element,
-        const axis2_env_t *env,
-        axiom_node_t *ele_node)
+    const axis2_env_t *env,
+    axiom_node_t *ele_node)
 {
     axis2_hash_index_t *hi = NULL;
     axis2_hash_t *ht_cloned = NULL;
@@ -1386,7 +1397,9 @@
 
     AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
     if (!om_element->attributes)
+    {
         return NULL;
+    }
     ht_cloned = axis2_hash_make(env);
     if (!ht_cloned)
     {
@@ -1395,7 +1408,7 @@
     }
 
     for (hi = axis2_hash_first(om_element->attributes, env);
-            hi; hi = axis2_hash_next(env, hi))
+        hi; hi = axis2_hash_next(env, hi))
     {
         void *val = NULL;
         axis2_hash_this(hi, NULL, NULL, &val);
@@ -1425,9 +1438,8 @@
     return ht_cloned;
 }
 
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axiom_element_get_attribute_value_by_name(
-    axiom_element_t *om_element,
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axiom_element_get_attribute_value_by_name(axiom_element_t *om_element,
     const axis2_env_t *env,
     axis2_char_t *attr_name)
 {
@@ -1435,9 +1447,11 @@
 
     AXIS2_PARAM_CHECK(env->error, attr_name, NULL);
     if (!om_element->attributes)
+    {
         return NULL;
+    }
     for (hi = axis2_hash_first(om_element->attributes, env); hi;
-            hi = axis2_hash_next(env, hi))
+         hi = axis2_hash_next(env, hi))
     {
         void *attr = NULL;
         axiom_attribute_t *om_attr = NULL;
@@ -1448,7 +1462,7 @@
             axis2_char_t *this_attr_value;
             axis2_char_t *attr_qn_str = NULL;
             axiom_namespace_t *attr_ns = NULL;
-            axis2_char_t *prefix          = NULL;
+            axis2_char_t *prefix = NULL;
 
             om_attr = (axiom_attribute_t*)attr;
             this_attr_name = axiom_attribute_get_localname(om_attr, env);

Modified: webservices/axis2/trunk/c/axiom/src/om/om_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_node.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_node.c Fri Mar 16 01:30:59 2007
@@ -109,7 +109,7 @@
     {
         if (om_node->data_element)
         {
-            AXIOM_ELEMENT_FREE((axiom_element_t*)(om_node->data_element), env);
+            axiom_element_free((axiom_element_t*)(om_node->data_element), env);
         }
     }
     else if (om_node->node_type == AXIOM_COMMENT)
@@ -355,7 +355,7 @@
     {
         if (om_node->data_element)
         {
-            status = AXIOM_ELEMENT_SERIALIZE_START_PART((axiom_element_t *)(om_node->data_element),
+            status = axiom_element_serialize_start_part((axiom_element_t *)(om_node->data_element),
                 env,
                 om_output,
                 om_node);
@@ -441,7 +441,7 @@
     {
         if (om_node->data_element)
         {
-            status = AXIOM_ELEMENT_SERIALIZE_END_PART((axiom_element_t *)(om_node->data_element),
+            status = axiom_element_serialize_end_part((axiom_element_t *)(om_node->data_element),
                 env, om_output);
         }
         if (status != AXIS2_SUCCESS)

Modified: webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Fri Mar 16 01:30:59 2007
@@ -128,7 +128,7 @@
                 om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(element_node, env);
                 if (om_ele)
                 {
-                    ns = AXIOM_ELEMENT_FIND_NAMESPACE(om_ele ,
+                    ns = axiom_element_find_namespace(om_ele ,
                         env , element_node, uri, prefix);
 
                     /* newly added to handle "xml:*" attributes" (AXIS2_STRCMP(prefix, "xml") == 0) && */
@@ -156,7 +156,7 @@
             temp_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(element_node, env);
             if (temp_ele)
             {
-                status = AXIOM_ELEMENT_ADD_ATTRIBUTE(temp_ele,
+                status = axiom_element_add_attribute(temp_ele,
                     env, attribute, element_node);
             }
         }
@@ -312,7 +312,7 @@
                 return AXIS2_FAILURE;
             }
 
-            status = AXIOM_ELEMENT_DECLARE_NAMESPACE(om_ele, env, node, om_ns);
+            status = axiom_element_declare_namespace(om_ele, env, node, om_ns);
 
             if (!status)
             {

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=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c Fri Mar 16 01:30:59 2007
@@ -105,7 +105,7 @@
 
     om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(om_element_node, env);
 
-    ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+    ele_localname = axiom_element_get_localname(om_ele, env);
     if (!ele_localname)
     {
         return AXIS2_FAILURE;
@@ -158,7 +158,7 @@
 
             axiom_soap_fault_code_set_builder(fault_code, env, builder_helper->soap_builder);
 
-            AXIOM_ELEMENT_SET_LOCALNAME(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME);
+            axiom_element_set_localname(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME);
 
             fault_value = axiom_soap_fault_value_create_with_code(env, fault_code);
             if (!fault_value)
@@ -200,7 +200,7 @@
                     builder_helper->soap_builder, env, AXIS2_FALSE);
             }
 
-            AXIOM_ELEMENT_SET_LOCALNAME(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_REASON_LOCAL_NAME);
+            axiom_element_set_localname(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_REASON_LOCAL_NAME);
 
             fault_reason = axiom_soap_fault_reason_create(env);
             if (!fault_reason)
@@ -242,7 +242,7 @@
             if (!fault_role)
                 return AXIS2_FAILURE;
 
-            AXIOM_ELEMENT_SET_LOCALNAME(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME);
+            axiom_element_set_localname(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME);
 
             axiom_soap_fault_role_set_base_node(fault_role, env, om_element_node);
 
@@ -261,7 +261,7 @@
             if (!fault_detail)
                 return AXIS2_FAILURE;
 
-            AXIOM_ELEMENT_SET_LOCALNAME(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME);
+            axiom_element_set_localname(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME);
 
             axiom_soap_fault_detail_set_base_node(fault_detail, env, om_element_node);
 
@@ -283,7 +283,7 @@
             return AXIS2_FAILURE;
         parent_element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
                     om_element_node, env);
-        parent_localname = AXIOM_ELEMENT_GET_LOCALNAME(parent_element, env);
+        parent_localname = axiom_element_get_localname(parent_element, env);
 
         if (!parent_localname)
             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=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c Fri Mar 16 01:30:59 2007
@@ -132,7 +132,7 @@
     if (!om_ele)
         return AXIS2_FAILURE;
 
-    ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+    ele_localname = axiom_element_get_localname(om_ele, env);
     if (!ele_localname)
         return AXIS2_FAILURE;
 
@@ -378,7 +378,7 @@
         if (!parent_ele)
             return AXIS2_FAILURE;
 
-        parent_localname = AXIOM_ELEMENT_GET_LOCALNAME(parent_ele, env);
+        parent_localname = axiom_element_get_localname(parent_ele, env);
         if (!parent_localname)
             return AXIS2_FAILURE;
 
@@ -531,7 +531,7 @@
         if (!parent_ele)
             return AXIS2_FAILURE;
 
-        parent_localname = AXIOM_ELEMENT_GET_LOCALNAME(parent_ele, env);
+        parent_localname = axiom_element_get_localname(parent_ele, env);
         if (!parent_localname)
             return AXIS2_FAILURE;
 

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=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_body.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_body.c Fri Mar 16 01:30:59 2007
@@ -94,7 +94,7 @@
         return NULL;
     }
 
-    om_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+    om_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
 
     ele = axiom_element_create(env, parent_node,
             AXIOM_SOAP_BODY_LOCAL_NAME, om_ns,
@@ -299,7 +299,7 @@
     body_ele = AXIOM_NODE_GET_DATA_ELEMENT(soap_body->om_ele_node, env);
     if (!body_ele)
         return AXIS2_FAILURE;
-    om_ns = AXIOM_ELEMENT_GET_NAMESPACE(body_ele, env, soap_body->om_ele_node);
+    om_ns = axiom_element_get_namespace(body_ele, env, soap_body->om_ele_node);
     if (!om_ns)
         return AXIS2_FAILURE;
     uri = axiom_namespace_get_uri(om_ns, env);

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=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c Fri Mar 16 01:30:59 2007
@@ -386,7 +386,7 @@
     if (!om_element)
         return AXIS2_FAILURE;
     /* get element localname */
-    ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_element, env);
+    ele_localname = axiom_element_get_localname(om_element, env);
     if (!ele_localname)
         return AXIS2_FAILURE;
 
@@ -394,7 +394,7 @@
     if (AXIS2_STRCMP(ele_localname, AXIS2_XOP_INCLUDE) == 0)
     {
         axiom_namespace_t *ns = NULL;
-        ns = AXIOM_ELEMENT_GET_NAMESPACE(om_element, env, om_element_node);
+        ns = axiom_element_get_namespace(om_element, env, om_element_node);
         if (ns)
         {
             axis2_char_t *uri = axiom_namespace_get_uri(ns, env);
@@ -407,7 +407,7 @@
                     if (qname)
                     {
                         axis2_char_t *id = NULL;
-                        id = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(om_element, env, qname);
+                        id = axiom_element_get_attribute_value(om_element, env, qname);
                         if (id)
                         {
                             axis2_char_t *pos = NULL;
@@ -445,7 +445,7 @@
         /** a parent node exist , so not soap envelope element */
         parent_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(parent, env);
         if (parent_ele)
-            parent_localname = AXIOM_ELEMENT_GET_LOCALNAME(parent_ele, env);
+            parent_localname = axiom_element_get_localname(parent_ele, env);
     }
     if (!parent && is_soap_envelope)
     {
@@ -658,7 +658,7 @@
         om_ele = (axiom_element_t *) AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
         if (om_ele)
         {
-            om_ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, om_node);
+            om_ns = axiom_element_get_namespace(om_ele, env, om_node);
             if (om_ns)
             {
                 ns_uri = axiom_namespace_get_uri(om_ns, env);
@@ -711,7 +711,7 @@
     if (!om_ele)
         return AXIS2_FAILURE;
 
-    om_ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, envelope_node);
+    om_ns = axiom_element_get_namespace(om_ele, env, envelope_node);
     if (!om_ns)
         return AXIS2_FAILURE;
 
@@ -874,7 +874,7 @@
     if (!om_element)
         return AXIS2_FAILURE;
 
-    ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_element, env);
+    ele_localname = axiom_element_get_localname(om_element, env);
     if (!ele_localname)
         return AXIS2_FAILURE;
 
@@ -886,7 +886,7 @@
     if (!parent_ele)
         return AXIS2_FAILURE;
 
-    parent_localname = AXIOM_ELEMENT_GET_LOCALNAME(parent_ele, env);
+    parent_localname = axiom_element_get_localname(parent_ele, env);
     if (!parent_localname)
         return AXIS2_FAILURE;
 

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c Fri Mar 16 01:30:59 2007
@@ -342,7 +342,7 @@
                                     AXIOM_NODE_GET_DATA_ELEMENT(fault_code_om_node, env);
                             if (fault_code_om_ele)
                             {
-                                AXIOM_ELEMENT_SET_LOCALNAME(fault_code_om_ele,
+                                axiom_element_set_localname(fault_code_om_ele,
                                         env, AXIOM_SOAP11_SOAP_FAULT_CODE_LOCAL_NAME);
 
                                 fault_value = AXIOM_SOAP_FAULT_CODE_GET_VALUE(fault_code, env);
@@ -357,10 +357,10 @@
                                                 AXIOM_NODE_GET_DATA_ELEMENT(fault_value_om_node, env);
                                         if (fault_value_om_ele)
                                         {
-                                            text = AXIOM_ELEMENT_GET_TEXT(fault_value_om_ele, env, fault_value_om_node);
+                                            text = axiom_element_get_text(fault_value_om_ele, env, fault_value_om_node);
                                             if (text)
                                             {
-                                                AXIOM_ELEMENT_SET_TEXT(fault_code_om_ele, env, text, fault_code_om_node);
+                                                axiom_element_set_text(fault_code_om_ele, env, text, fault_code_om_node);
                                             }
                                             AXIOM_NODE_FREE_TREE(fault_value_om_node, env);
                                         }
@@ -389,7 +389,7 @@
                             if (fault_reason_om_ele)
                             {
 
-                                AXIOM_ELEMENT_SET_LOCALNAME(fault_reason_om_ele,
+                                axiom_element_set_localname(fault_reason_om_ele,
                                         env, AXIOM_SOAP11_SOAP_FAULT_STRING_LOCAL_NAME);
 
                                 fault_text =
@@ -404,10 +404,10 @@
                                                 AXIOM_NODE_GET_DATA_ELEMENT(fault_text_om_node, env);
                                         if (fault_text_om_ele)
                                         {
-                                            text = AXIOM_ELEMENT_GET_TEXT(fault_text_om_ele, env, fault_text_om_node);
+                                            text = axiom_element_get_text(fault_text_om_ele, env, fault_text_om_node);
                                             if (text)
                                             {
-                                                AXIOM_ELEMENT_SET_TEXT(fault_reason_om_ele,
+                                                axiom_element_set_text(fault_reason_om_ele,
                                                         env, text, fault_reason_om_node);
                                             }
                                         }
@@ -431,7 +431,7 @@
                                     AXIOM_NODE_GET_DATA_ELEMENT(fault_role_om_node, env);
                             if (fault_role_om_ele)
                             {
-                                AXIOM_ELEMENT_SET_LOCALNAME(fault_role_om_ele, env,
+                                axiom_element_set_localname(fault_role_om_ele, env,
                                         AXIOM_SOAP11_SOAP_FAULT_ACTOR_LOCAL_NAME);
                             }
                         }
@@ -449,7 +449,7 @@
                                     AXIOM_NODE_GET_DATA_ELEMENT(fault_detail_om_node, env);
                             if (fault_detail_om_ele)
                             {
-                                AXIOM_ELEMENT_SET_LOCALNAME(fault_detail_om_ele,
+                                axiom_element_set_localname(fault_detail_om_ele,
                                         env, AXIOM_SOAP11_SOAP_FAULT_DETAIL_LOCAL_NAME);
                             }
                         }
@@ -518,7 +518,7 @@
             ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(soap_envelope->om_ele_node, env);
             if (ele)
             {
-                return AXIOM_ELEMENT_GET_NAMESPACE(ele, env, soap_envelope->om_ele_node);
+                return axiom_element_get_namespace(ele, env, soap_envelope->om_ele_node);
             }
         }
     }
@@ -718,7 +718,7 @@
         return AXIS2_FAILURE;
     }
 
-    env_ns = AXIOM_ELEMENT_GET_NAMESPACE(env_ele, env, soap_envelope->om_ele_node);
+    env_ns = axiom_element_get_namespace(env_ele, env, soap_envelope->om_ele_node);
     if (!env_ns)
         return AXIS2_FAILURE;
 

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c Fri Mar 16 01:30:59 2007
@@ -110,7 +110,7 @@
         AXIS2_FREE(env->allocator, soap_fault);
         return NULL;
     }
-    parent_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+    parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
 
     this_ele = axiom_element_create(env,
             parent_node,
@@ -457,12 +457,12 @@
                 AXIOM_SOAP_FAULT_DETAIL_EXCEPTION_ENTRY, NULL, NULL);
         if (qn)
         {
-            exception_ele = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+            exception_ele = axiom_element_get_first_child_with_qname(
                         detail_ele, env,
                         qn, detail_node, &exception_node);
             AXIS2_QNAME_FREE(qn, env);
             if (exception_ele &&
-                    (excep = AXIOM_ELEMENT_GET_TEXT(exception_ele, env, exception_node)))
+                    (excep = axiom_element_get_text(exception_ele, env, exception_node)))
             {
                 return excep;
             }
@@ -502,7 +502,7 @@
         return AXIS2_FAILURE;
     }
     /** set the exception string as a text node of newly created om element */
-    AXIOM_ELEMENT_SET_TEXT(fault_detail_ele,
+    axiom_element_set_text(fault_detail_ele,
             env, exception, fault_detail_entry_node);
     /** now add this om element as a child of soap soap_fault detail om element node */
     return AXIOM_SOAP_FAULT_DETAIL_ADD_DETAIL_ENTRY(detail, env, fault_detail_entry_node);
@@ -584,7 +584,7 @@
     }
     value_ele  = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(value_node, env);
 
-    AXIOM_ELEMENT_SET_TEXT(value_ele, env, code_value, value_node);
+    axiom_element_set_text(value_ele, env, code_value, value_node);
 
     soap_fault_text = axiom_soap_fault_text_create_with_parent(env, soap_fault_reason);
     if (!soap_fault_text)
@@ -602,7 +602,7 @@
     }
     text_ele  = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(text_node, env);
 
-    AXIOM_ELEMENT_SET_TEXT(text_ele, env, reason_text, text_node);
+    axiom_element_set_text(text_ele, env, reason_text, text_node);
 
     return soap_fault;
 }

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_code.c Fri Mar 16 01:30:59 2007
@@ -96,7 +96,7 @@
         axiom_soap_fault_get_soap_version(fault, env);
     if (fault_code->soap_version == AXIOM_SOAP12)
     {
-        parent_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+        parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
     }
     this_ele = axiom_element_create(env,
             parent_node,

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_detail.c Fri Mar 16 01:30:59 2007
@@ -77,7 +77,7 @@
     soap_version = axiom_soap_fault_get_soap_version(fault, env);
     if (soap_version == AXIOM_SOAP12)
     {
-        parent_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+        parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
     }
     this_ele = axiom_element_create(env,
             parent_node,
@@ -135,7 +135,7 @@
     {
         om_ele = (axiom_element_t *)
                 AXIOM_NODE_GET_DATA_ELEMENT(fault_detail->om_ele_node, env);
-        return AXIOM_ELEMENT_GET_CHILDREN(om_ele,  env,
+        return axiom_element_get_children(om_ele,  env,
                 fault_detail->om_ele_node);
     }
     return NULL;

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_node.c Fri Mar 16 01:30:59 2007
@@ -78,7 +78,7 @@
         return NULL;
     }
 
-    parent_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+    parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
 
     this_ele = axiom_element_create(env,
             parent_node,
@@ -126,7 +126,7 @@
 
         if (om_ele)
         {
-            return AXIOM_ELEMENT_SET_TEXT(om_ele, env, uri,
+            return axiom_element_set_text(om_ele, env, uri,
                     fault_node->om_ele_node);
         }
     }
@@ -147,7 +147,7 @@
                     fault_node->om_ele_node, env);
         if (om_ele)
         {
-            return AXIOM_ELEMENT_GET_TEXT(om_ele,
+            return axiom_element_get_text(om_ele,
                     env, fault_node->om_ele_node);
         }
 

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c Fri Mar 16 01:30:59 2007
@@ -92,7 +92,7 @@
         axiom_soap_fault_get_soap_version(fault, env);
     if (fault_reason->soap_version == AXIOM_SOAP12)
     {
-        parent_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+        parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
     }
     this_ele = axiom_element_create(env,
             parent_node,

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_role.c Fri Mar 16 01:30:59 2007
@@ -85,7 +85,7 @@
     soap_version = axiom_soap_fault_get_soap_version(fault, env);
     if (soap_version == AXIOM_SOAP12)
     {
-        parent_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+        parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
     }
     this_ele = axiom_element_create(env,
             parent_node, AXIOM_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME,
@@ -132,7 +132,7 @@
 
     if (role_ele)
     {
-        return AXIOM_ELEMENT_SET_TEXT(role_ele,  env, uri,
+        return axiom_element_set_text(role_ele,  env, uri,
                 fault_role->om_ele_node);
     }
     return AXIS2_FAILURE;
@@ -154,7 +154,7 @@
 
     if (role_ele)
     {
-        return AXIOM_ELEMENT_GET_TEXT(role_ele,  env,
+        return axiom_element_get_text(role_ele,  env,
                 fault_role->om_ele_node);
     }
     return NULL;

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_sub_code.c Fri Mar 16 01:30:59 2007
@@ -93,7 +93,7 @@
 
     if (fault_sub_code->soap_version == AXIOM_SOAP12)
     {
-        parent_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+        parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
     }
 
     this_ele = axiom_element_create(env,

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c Fri Mar 16 01:30:59 2007
@@ -104,7 +104,7 @@
     soap_version = axiom_soap_fault_reason_get_soap_version(parent, env);
     if (soap_version == AXIOM_SOAP12)
     {
-        parent_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+        parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
     }
     this_ele = axiom_element_create(env,
             parent_node, AXIOM_SOAP12_SOAP_FAULT_TEXT_LOCAL_NAME,
@@ -181,7 +181,7 @@
     if (!om_ele)
         return AXIS2_FAILURE;
 
-    status = AXIOM_ELEMENT_ADD_ATTRIBUTE(om_ele, env, fault_text->lang_attribute,
+    status = axiom_element_add_attribute(om_ele, env, fault_text->lang_attribute,
             fault_text->om_ele_node);
 
     if (status == AXIS2_SUCCESS)
@@ -220,7 +220,7 @@
                 AXIOM_SOAP12_SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX);
 
         fault_text->lang_attribute =
-            AXIOM_ELEMENT_GET_ATTRIBUTE(om_ele, env, tmp_qname);
+            axiom_element_get_attribute(om_ele, env, tmp_qname);
         AXIS2_QNAME_FREE(tmp_qname, env);
     }
     if (fault_text->lang_attribute)
@@ -273,7 +273,7 @@
                 AXIOM_NODE_GET_DATA_ELEMENT(fault_text->om_ele_node, env);
         if (text_ele)
         {
-            AXIOM_ELEMENT_SET_TEXT(text_ele, env, value, fault_text->om_ele_node);
+            axiom_element_set_text(text_ele, env, value, fault_text->om_ele_node);
             if (lang)
             {
                 axiom_soap_fault_text_set_lang(fault_text, env, lang);
@@ -298,7 +298,7 @@
                 AXIOM_NODE_GET_DATA_ELEMENT(fault_text->om_ele_node, env);
         if (text_ele)
         {
-            text = AXIOM_ELEMENT_GET_TEXT(text_ele, env,
+            text = axiom_element_get_text(text_ele, env,
                     fault_text->om_ele_node);
             return text;
         }

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c Fri Mar 16 01:30:59 2007
@@ -90,7 +90,7 @@
         axiom_soap_fault_sub_code_get_soap_version(parent, env);
     if (soap_version == AXIOM_SOAP12)
     {
-        parent_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+        parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
     }
 
     this_ele = axiom_element_create(env,
@@ -149,7 +149,7 @@
     soap_version = axiom_soap_fault_code_get_soap_version(parent, env);
     if (soap_version == AXIOM_SOAP12)
     {
-        parent_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+        parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
     }
     this_ele = axiom_element_create(env,
             parent_node, AXIOM_SOAP12_SOAP_FAULT_VALUE_LOCAL_NAME,
@@ -221,7 +221,7 @@
     if (!value_element)
         return NULL;
 
-    return AXIOM_ELEMENT_GET_TEXT(value_element, env, value_node);
+    return axiom_element_get_text(value_element, env, value_node);
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -237,7 +237,7 @@
         axiom_element_t *om_ele = NULL;
         om_ele = (axiom_element_t *)
                 AXIOM_NODE_GET_DATA_ELEMENT(fault_value->om_ele_node, env);
-        return AXIOM_ELEMENT_SET_TEXT(om_ele, env, text, fault_value->om_ele_node);
+        return axiom_element_set_text(om_ele, env, text, fault_value->om_ele_node);
     }
     return AXIS2_FAILURE;
 }



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


Mime
View raw message