axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From din...@apache.org
Subject svn commit: r520049 [3/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...
Date Mon, 19 Mar 2007 19:13:29 GMT
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Mon Mar 19 12:13:26 2007
@@ -534,12 +534,12 @@
 
         if (envelope)
         {
-            axiom_soap_body_t *body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env);
-            if (body)
-            {
+            /*axiom_soap_body_t *body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env); */
+            /* if (body) */
+            /*{ */
                /*  axiom_soap_fault_t *fault = AXIOM_SOAP_BODY_GET_FAULT(body, env); */
                 /* TODO: fault processing method */
-            }
+            /*} */
         }
         else
         {
@@ -675,11 +675,11 @@
     if (!soap_envelope)
         return AXIS2_FAILURE;
 
-    soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env);
+    soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
     if (!soap_header)
         return AXIS2_SUCCESS;
 
-    header_block_ht = AXIOM_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(soap_header, env);
+    header_block_ht = axiom_soap_header_get_all_header_blocks(soap_header, env);
     if (!header_block_ht)
         return AXIS2_SUCCESS;
 
@@ -695,8 +695,8 @@
 
         if (header_block)
         {
-            if (AXIOM_SOAP_HEADER_BLOCK_IS_PROCESSED(header_block , env) ||
-                    !AXIOM_SOAP_HEADER_BLOCK_GET_MUST_UNDERSTAND(header_block, env))
+            if (axiom_soap_header_block_is_processed(header_block , env) ||
+                    !axiom_soap_header_block_get_must_understand(header_block, env))
             {
                 continue;
             }
@@ -706,7 +706,7 @@
                need to fix this to allow the engine/service to be in one or more
                additional roles and then to check that any headers targeted for
                that role too have been dealt with. */
-            role = AXIOM_SOAP_HEADER_BLOCK_GET_ROLE(header_block, env);
+            role = axiom_soap_header_block_get_role(header_block, env);
 
             if ( axis2_msg_ctx_get_is_soap_11(msg_ctx, env) != AXIS2_TRUE)
             {

Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Mon Mar 19 12:13:26 2007
@@ -94,10 +94,10 @@
     soap_envelope =  axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
     if (soap_envelope)
     {
-        axiom_soap_body_t *soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+        axiom_soap_body_t *soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
         if (soap_body)
         {
-            axiom_node_t *body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+            axiom_node_t *body_node = axiom_soap_body_get_base_node(soap_body, env);
             if (body_node)
             {
                 axiom_node_t *body_first_child_node =
@@ -176,10 +176,10 @@
     soap_envelope =  axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
     if (soap_envelope)
     {
-        axiom_soap_body_t *soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+        axiom_soap_body_t *soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
         if (soap_body)
         {
-            axiom_node_t *body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+            axiom_node_t *body_node = axiom_soap_body_get_base_node(soap_body, env);
             if (body_node)
             {
                 axiom_node_t *body_first_child_node =

Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Mon Mar 19 12:13:26 2007
@@ -90,7 +90,6 @@
     msg_recv->scope = axis2_strdup ("app*", env);
     msg_recv->derived = NULL;
     msg_recv->receive = axis2_msg_recv_receive_impl;
-
     return msg_recv;
 }
 
@@ -328,13 +327,13 @@
                     out_msg_ctx, env);
         if (soap_envelope)
         {
-            axiom_soap_body_t *body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope,
+            axiom_soap_body_t *body = axiom_soap_envelope_get_body(soap_envelope,
                     env);
             if (body)
             {
                 /* in case of a SOAP fault, we got to return failure so that
                    transport gets to know that it should send 500 */
-                if (AXIOM_SOAP_BODY_HAS_FAULT(body, env))
+                if (axiom_soap_body_has_fault(body, env))
                 {
                     status = AXIS2_FAILURE;
                      axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env,

Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Mon Mar 19
12:13:26 2007
@@ -127,8 +127,8 @@
             axiom_soap_body_t *body = NULL;
 
             envelope =  axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
-            body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env);
-            om_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
+            body = axiom_soap_envelope_get_body(envelope, env);
+            om_node = axiom_soap_body_get_base_node(body, env);
             om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
             om_node = AXIOM_NODE_GET_FIRST_ELEMENT(om_node, env);
          }
@@ -140,8 +140,8 @@
             axiom_element_t *op_element = NULL;
 
             envelope =  axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
-            body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env);
-            op_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
+            body = axiom_soap_envelope_get_body(envelope, env);
+            op_node = axiom_soap_body_get_base_node(body, env);
             op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
             if (op_element)
             {
@@ -288,7 +288,7 @@
         return AXIS2_FAILURE;
     }
 
-    out_node = AXIOM_SOAP_BODY_GET_BASE_NODE(out_body, env);
+    out_node = axiom_soap_body_get_base_node(out_body, env);
     if (!out_node)
     {
         return AXIS2_FAILURE;
@@ -319,7 +319,7 @@
 		if (fault_node)
 		{
 			fault_detail = axiom_soap_fault_detail_create_with_parent (env, soap_fault);
-			AXIOM_SOAP_FAULT_DETAIL_ADD_DETAIL_ENTRY (fault_detail, env, fault_node);
+			axiom_soap_fault_detail_add_detail_entry (fault_detail, env, fault_node);
 		}
     }
 
@@ -336,7 +336,7 @@
     else
     {
         /* we should free the memory as the envelope is not used, one way case */
-        AXIOM_SOAP_ENVELOPE_FREE(default_envelope, env);
+        axiom_soap_envelope_free(default_envelope, env);
         default_envelope = NULL;
     }
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Mon Mar 19
12:13:26 2007
@@ -271,7 +271,7 @@
 	axiom_node_t *body_node = NULL;
 	axiom_soap_body_t *soap_body = NULL;
 	axis2_bool_t is_soap = AXIS2_TRUE;
-	soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(out, env);
+	soap_body = axiom_soap_envelope_get_body(out, env);
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -298,7 +298,7 @@
 							AXIS2_ERROR_GET_MESSAGE(env->error));
             return AXIS2_FAILURE;
         }
-        body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+        body_node = axiom_soap_body_get_base_node(soap_body, env);
         if (! body_node)
         {
             return AXIS2_FAILURE;
@@ -388,7 +388,7 @@
 
 			axiom_output_set_do_optimize(sender_impl->om_output, env,
 										 doing_mtom); 
-			AXIOM_SOAP_ENVELOPE_SERIALIZE(out, env, sender_impl->om_output,
+			axiom_soap_envelope_serialize(out, env, sender_impl->om_output,
 										  AXIS2_FALSE);
 		}
 		else
@@ -1126,8 +1126,8 @@
     {
         return NULL;
     }
-    body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(
-		AXIOM_SOAP_ENVELOPE_GET_BODY(soap_env, env), env);
+    body_node = axiom_soap_body_get_base_node(
+		axiom_soap_envelope_get_body(soap_env, env), env);
     data_node = AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
     if (! data_node)
     {

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Mon
Mar 19 12:13:26 2007
@@ -329,7 +329,7 @@
             if (AXIS2_TRUE ==  axis2_msg_ctx_get_doing_rest(msg_ctx, env))
             {
                 axiom_node_t *body_node = NULL;
-                axiom_soap_body_t *soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(
+                axiom_soap_body_t *soap_body = axiom_soap_envelope_get_body(
                             soap_data_out, env);
 
                 if (! soap_body)
@@ -344,7 +344,7 @@
                     xml_writer = NULL;
                     return AXIS2_FAILURE;
                 }
-                body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+                body_node = axiom_soap_body_get_base_node(soap_body, env);
                 if (! body_node)
                 {
                     axiom_output_free(om_output, env);
@@ -369,7 +369,7 @@
             {
                 axiom_output_set_do_optimize(om_output, env,
                         do_mtom);
-                AXIOM_SOAP_ENVELOPE_SERIALIZE(soap_data_out, env, om_output,
+                axiom_soap_envelope_serialize(soap_data_out, env, om_output,
                         AXIS2_FALSE);
                 if (do_mtom)
                 {

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c Mon
Mar 19 12:13:26 2007
@@ -150,7 +150,7 @@
 
 			axiom_output_set_do_optimize(om_output, env,
 										 doing_mtom); 
-			AXIOM_SOAP_ENVELOPE_SERIALIZE(out, env, om_output,
+			axiom_soap_envelope_serialize(out, env, om_output,
 										  AXIS2_FALSE);
 			if (AXIS2_TRUE ==  axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
 			{

Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Mon
Mar 19 12:13:26 2007
@@ -346,14 +346,14 @@
             return AXIS2_FAILURE;
         }
 
-        soap_envelope = AXIOM_SOAP_BUILDER_GET_SOAP_ENVELOPE(soap_builder,
+        soap_envelope = axiom_soap_builder_get_soap_envelope(soap_builder,
                 env);
-        if (! soap_envelope)
+        if (!soap_envelope)
         {
             axiom_stax_builder_free(om_builder, env);
             om_builder = NULL;
             xml_reader = NULL;
-            AXIOM_SOAP_BUILDER_FREE(soap_builder, env);
+            axiom_soap_builder_free(soap_builder, env);
             soap_builder = NULL;
             return AXIS2_FAILURE;
         }
@@ -374,11 +374,11 @@
                 xml_reader = NULL;
                 return AXIS2_FAILURE;
             }
-            soap_envelope = AXIOM_SOAP_BUILDER_GET_SOAP_ENVELOPE(
+            soap_envelope = axiom_soap_builder_get_soap_envelope(
                         soap_builder, env);
             if (! soap_envelope)
-            {
-                AXIOM_SOAP_BUILDER_FREE(soap_builder, env);
+            {  
+              axiom_soap_builder_free(soap_builder, env);
                 om_builder = NULL;
                 xml_reader = NULL;
                 soap_builder = NULL;
@@ -411,10 +411,10 @@
             axiom_node_t *root_node = NULL;
             soap_envelope = axiom_soap_envelope_create_default_soap_envelope
                     (env, AXIOM_SOAP11);
-            def_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+            def_body = axiom_soap_envelope_get_body(soap_envelope, env);
             om_doc = axiom_stax_builder_get_document(om_builder, env);
             root_node = axiom_document_build_all(om_doc, env);
-            AXIOM_SOAP_BODY_ADD_CHILD(def_body, env, root_node);
+            axiom_soap_body_add_child(def_body, env, root_node);
              axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE);
         }
     }
@@ -422,7 +422,7 @@
 
     if (binary_data_map)
     {
-        AXIOM_SOAP_BUILDER_SET_MIME_BODY_PARTS(soap_builder, env,
+        axiom_soap_builder_set_mime_body_parts(soap_builder, env,
                 binary_data_map);
     }
 
@@ -434,7 +434,7 @@
      *{
      *   AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CHARSET_MISMATCH, 
      *               AXIS2_FAILURE);
-     *   AXIOM_SOAP_ENVELOPE_FREE(envelope, env);
+     *   axiom_soap_envelope_free(envelope, env);
      *   envelope = NULL;
      *   AXIOM_XML_READER_FREE(xml_reader, env);
      *   xml_reader = NULL;
@@ -442,7 +442,7 @@
      *   om_builder = NULL;
      *   if( soap_builder)
      *   {
-     *       AXIOM_SOAP_BUILDER_FREE(soap_builder, env);
+     *       axiom_soap_builder_free(soap_builder, env);
      *       soap_builder = NULL;
      *   }
      *   return AXIS2_FAILURE;
@@ -456,13 +456,13 @@
     if (!soap_envelope)
         return AXIS2_FAILURE;
 
-    soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope,
+    soap_body = axiom_soap_envelope_get_body(soap_envelope,
             env);
 
     if (! soap_body)
         return AXIS2_FAILURE;
 
-    if (AXIS2_TRUE == AXIOM_SOAP_BODY_HAS_FAULT(soap_body, env))
+    if (AXIS2_TRUE == axiom_soap_body_has_fault(soap_body, env))
     {
         status =  axis2_engine_receive_fault(engine, env, msg_ctx);
     }
@@ -1191,11 +1191,11 @@
             return NULL;
         }
 
-        soap_envelope = AXIOM_SOAP_BUILDER_GET_SOAP_ENVELOPE(soap_builder, env);
+        soap_envelope = axiom_soap_builder_get_soap_envelope(soap_builder, env);
 
         if (binary_data_map)
         {
-            AXIOM_SOAP_BUILDER_SET_MIME_BODY_PARTS(soap_builder, env,
+            axiom_soap_builder_set_mime_body_parts(soap_builder, env,
                     binary_data_map);
         }
 
@@ -1203,11 +1203,11 @@
         {
             /* hack to get around MTOM problem */
             axiom_soap_body_t *soap_body =
-                AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+                axiom_soap_envelope_get_body(soap_envelope, env);
 
             if (soap_body)
             {
-                AXIOM_SOAP_BODY_HAS_FAULT(soap_body, env);
+                axiom_soap_body_has_fault(soap_body, env);
             }
         }
 
@@ -1238,10 +1238,10 @@
         }
         soap_envelope = axiom_soap_envelope_create_default_soap_envelope
                 (env, AXIOM_SOAP11);
-        def_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+        def_body = axiom_soap_envelope_get_body(soap_envelope, env);
         om_doc = axiom_stax_builder_get_document(om_builder, env);
         root_node = axiom_document_build_all(om_doc, env);
-        AXIOM_SOAP_BODY_ADD_CHILD(def_body, env, root_node);
+        axiom_soap_body_add_child(def_body, env, root_node);
 
         return soap_envelope;
     }
@@ -1332,7 +1332,7 @@
         body_child = axiom_element_create_with_qname(env, NULL,
                 axis2_op_get_qname( axis2_msg_ctx_get_op(msg_ctx, env),
                         env), &body_child_node);
-        AXIOM_SOAP_BODY_ADD_CHILD(soap_body, env, body_child_node);
+        axiom_soap_body_add_child(soap_body, env, body_child_node);
         if (param_map)
         {
             axis2_hash_index_t *hi = NULL;
@@ -1366,7 +1366,7 @@
 
         body_child = axiom_element_create_with_qname(env, NULL, bfc_qname,
                 &body_child_node);
-        AXIOM_SOAP_BODY_ADD_CHILD(soap_body, env, body_child_node);
+        axiom_soap_body_add_child(soap_body, env, body_child_node);
         if (0 == axis2_strcmp(method, AXIS2_HTTP_HEADER_GET) ||
                 0 == axis2_strcmp(method, AXIS2_HTTP_HEADER_POST))
         {
@@ -1448,7 +1448,7 @@
 
     soap_env = axiom_soap_envelope_create_default_soap_envelope(env,
             AXIOM_SOAP11);
-    soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_env, env);
+    soap_body = axiom_soap_envelope_get_body(soap_env, env);
     if (! soap_body)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SOAP_ENVELOPE_OR_SOAP_BODY_NULL,
@@ -1459,7 +1459,7 @@
     body_child = axiom_element_create_with_qname(env, NULL,
             axis2_op_get_qname( axis2_msg_ctx_get_op(msg_ctx, env),
                     env), &body_child_node);
-    AXIOM_SOAP_BODY_ADD_CHILD(soap_body, env, body_child_node);
+    axiom_soap_body_add_child(soap_body, env, body_child_node);
     if (param_map)
     {
         axis2_hash_index_t *hi = NULL;

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Mon Mar 19 12:13:26 2007
@@ -133,7 +133,7 @@
 
     if (soap_envelope)
     {
-        soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env);
+        soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
         if (soap_header)
         {
             axis2_array_list_t *addr_headers = NULL;
@@ -141,7 +141,7 @@
             axis2_char_t *addr_ns_str = NULL;
             axis2_msg_info_headers_t *msg_info_headers =  axis2_msg_ctx_get_msg_info_headers(msg_ctx,
env);
 
-            addr_headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(soap_header,
env, AXIS2_WSA_NAMESPACE_SUBMISSION);
+            addr_headers = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header,
env, AXIS2_WSA_NAMESPACE_SUBMISSION);
             if (addr_headers)
             {
                 addr_ns_str = axis2_strdup(AXIS2_WSA_NAMESPACE_SUBMISSION, env);
@@ -153,7 +153,7 @@
             }
             else
             {
-                addr_headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(soap_header,
env, AXIS2_WSA_NAMESPACE);
+                addr_headers = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header,
env, AXIS2_WSA_NAMESPACE);
                 if (addr_headers)
                 {
                     addr_ns_str = axis2_strdup(AXIS2_WSA_NAMESPACE, env);
@@ -203,7 +203,7 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
+    node = axiom_soap_header_get_base_node(soap_header, env);
     if (node && AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
     {
         axis2_qname_t *qname = NULL;
@@ -304,7 +304,7 @@
     if (!msg_info_headers)
         return AXIS2_FAILURE;
 
-    header_block_ht = AXIOM_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(soap_header, env);
+    header_block_ht = axiom_soap_header_get_all_header_blocks(soap_header, env);
     if (!header_block_ht)
         return AXIS2_FAILURE;
 
@@ -322,11 +322,11 @@
         axis2_hash_this(hash_index, NULL, NULL, &hb);
 
         header_block = (axiom_soap_header_block_t *)hb;
-        header_block_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
+        header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
         header_block_ele  = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node,
env);
         ele_localname = axiom_element_get_localname(header_block_ele, env);
 
-        role = AXIOM_SOAP_HEADER_BLOCK_GET_ROLE(header_block, env);
+        role = axiom_soap_header_block_get_role(header_block, env);
         if (role && axis2_strcmp(role, AXIOM_SOAP12_SOAP_ROLE_NONE) == 0)
         {
             /* Role is none, no need of processing */
@@ -349,7 +349,7 @@
             axis2_msg_info_headers_set_to(msg_info_headers, env, epr);
 
             axis2_addr_in_extract_to_epr_ref_params(env, epr, soap_header, addr_ns_str);
-            AXIOM_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env);
+            axiom_soap_header_block_set_processed(header_block, env);
             to_found = AXIS2_TRUE;
         }
         else if (axis2_strcmp(ele_localname, AXIS2_WSA_FROM) == 0)
@@ -365,7 +365,7 @@
                 axis2_msg_info_headers_set_from(msg_info_headers, env, epr);
             }
             axis2_addr_in_extract_epr_information(env, header_block, epr, addr_ns_str);
-            AXIOM_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env);
+            axiom_soap_header_block_set_processed(header_block, env);
         }
         else if (axis2_strcmp(ele_localname, AXIS2_WSA_REPLY_TO) == 0)
         {
@@ -386,7 +386,7 @@
                 axis2_msg_info_headers_set_reply_to(msg_info_headers, env, epr);
             }
             axis2_addr_in_extract_epr_information(env, header_block, epr, addr_ns_str);
-            AXIOM_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env);
+            axiom_soap_header_block_set_processed(header_block, env);
             reply_to_found = AXIS2_TRUE;
         }
         else if (axis2_strcmp(ele_localname, AXIS2_WSA_FAULT_TO) == 0)
@@ -409,7 +409,7 @@
                 axis2_msg_info_headers_set_fault_to(msg_info_headers, env, epr);
             }
             axis2_addr_in_extract_epr_information(env, header_block, epr, addr_ns_str);
-            AXIOM_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env);
+            axiom_soap_header_block_set_processed(header_block, env);
             fault_to_found = AXIS2_TRUE;
         }
         else if (axis2_strcmp(ele_localname, AXIS2_WSA_MESSAGE_ID) == 0)
@@ -427,7 +427,7 @@
 
             text = axiom_element_get_text(header_block_ele, env, header_block_node);
             axis2_msg_info_headers_set_message_id(msg_info_headers, env, text);
-            AXIOM_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env);
+            axiom_soap_header_block_set_processed(header_block, env);
             msg_id_found = AXIS2_TRUE;
         }
         else if (axis2_strcmp(ele_localname, AXIS2_WSA_ACTION) == 0)
@@ -445,7 +445,7 @@
 
             text = axiom_element_get_text(header_block_ele, env, header_block_node);
             axis2_msg_info_headers_set_action(msg_info_headers, env, text);
-            AXIOM_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env);
+            axiom_soap_header_block_set_processed(header_block, env);
             action_found = AXIS2_TRUE;
         }
         else if (axis2_strcmp(ele_localname, AXIS2_WSA_RELATES_TO) == 0)
@@ -482,7 +482,7 @@
             address = axiom_element_get_text(header_block_ele, env, header_block_node);
             relates_to = axis2_relates_to_create(env, address, relationship_type_value);
             axis2_msg_info_headers_set_relates_to(msg_info_headers, env, relates_to);
-            AXIOM_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env);
+            axiom_soap_header_block_set_processed(header_block, env);
 
             axis2_qname_free(rqn, env);
         }
@@ -515,7 +515,7 @@
     AXIS2_PARAM_CHECK(env->error, endpoint_ref, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, addr_ns_str, AXIS2_FAILURE);
 
-    header_block_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(soap_header_block, env);
+    header_block_node = axiom_soap_header_block_get_base_node(soap_header_block, env);
     header_block_ele  = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node,
env);
 
 
@@ -579,7 +579,7 @@
     AXIS2_PARAM_CHECK(env->error, soap_header, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg_info_headers, AXIS2_FAILURE);
 
-    header_block_ht = AXIOM_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(soap_header, env);
+    header_block_ht = axiom_soap_header_get_all_header_blocks(soap_header, env);
     if (!header_block_ht)
         return AXIS2_FAILURE;
     wsa_qname = axis2_qname_create(env, AXIS2_WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
@@ -596,7 +596,7 @@
         axis2_hash_this(hash_index, NULL, NULL, &hb);
 
         header_block = (axiom_soap_header_block_t *)hb;
-        header_block_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
+        header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
 
         if (header_block_node &&
                 (AXIOM_NODE_GET_NODE_TYPE(header_block_node, env) == AXIOM_ELEMENT))
@@ -637,7 +637,7 @@
     AXIS2_PARAM_CHECK(env->error, soap_header, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, addr_ns_str, AXIS2_FAILURE);
 
-    header_blocks_ht = AXIOM_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(soap_header, env);
+    header_blocks_ht = axiom_soap_header_get_all_header_blocks(soap_header, env);
     if (!header_blocks_ht)
         return AXIS2_FAILURE;
 
@@ -659,7 +659,7 @@
         if (hb)
         {
             header_block = (axiom_soap_header_block_t*)hb;
-            header_block_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
+            header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
             header_block_ele = (axiom_element_t*)
                     AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
             is_ref_param_attr  = axiom_element_get_attribute(header_block_ele, env, is_ref_qn);

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Mon Mar 19 12:13:26 2007
@@ -206,7 +206,7 @@
         axiom_namespace_free(addressing_namespace, env);
         return AXIS2_SUCCESS; /* can happen in case of one way services/clients */
     }
-    soap_header  = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env);
+    soap_header  = axiom_soap_envelope_get_header(soap_envelope, env);
 
     if (!soap_header)
     {
@@ -228,7 +228,7 @@
         axiom_node_t *relates_to_header_node = NULL;
         axiom_element_t *relates_to_header_ele = NULL;
 
-        soap_header_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
+        soap_header_node = axiom_soap_header_get_base_node(soap_header, env);
         soap_header_ele =
             (axiom_element_t *)
             AXIOM_NODE_GET_DATA_ELEMENT(soap_header_node, env);
@@ -239,12 +239,12 @@
 
         if (soap_envelope && epr)
         {
-            axiom_soap_body_t *body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+            axiom_soap_body_t *body = axiom_soap_envelope_get_body(soap_envelope, env);
             if (body)
             {
                 /* in case of a SOAP fault, we got to send the response to
                    the adress specified by FaultTo */
-                if (AXIOM_SOAP_BODY_HAS_FAULT(body, env))
+                if (axiom_soap_body_has_fault(body, env))
                 {
                     axis2_endpoint_ref_t *fault_epr = axis2_msg_info_headers_get_fault_to(msg_info_headers,
env);
                     if (fault_epr)
@@ -272,11 +272,11 @@
                 axiom_soap_header_block_t *to_header_block = NULL;
 
                 to_header_block  =
-                    AXIOM_SOAP_HEADER_ADD_HEADER_BLOCK(soap_header, env,
+                    axiom_soap_header_add_header_block(soap_header, env,
                             AXIS2_WSA_TO,
                             addressing_namespace);
                 to_header_block_node =
-                    AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(to_header_block, env);
+                    axiom_soap_header_block_get_base_node(to_header_block, env);
                 if (to_header_block_node)
                 {
                     axiom_element_t *to_header_block_element = NULL;
@@ -495,10 +495,10 @@
             axiom_namespace_create(env, addr_ns,
                     AXIS2_WSA_DEFAULT_PREFIX);
         header_block =
-            AXIOM_SOAP_HEADER_ADD_HEADER_BLOCK(soap_header, env, type,
+            axiom_soap_header_add_header_block(soap_header, env, type,
                     addr_ns_obj);
         header_block_node =
-            AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
+            axiom_soap_header_block_get_base_node(header_block, env);
         header_block_ele =
             (axiom_element_t *)
             AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
@@ -541,12 +541,12 @@
     AXIS2_PARAM_CHECK(env->error, type, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, soap_header, AXIS2_FAILURE);
 
-    header_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
+    header_node = axiom_soap_header_get_base_node(soap_header, env);
 
     addr_ns_obj = axiom_namespace_create(env,
             addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
     header_block =
-        AXIOM_SOAP_HEADER_ADD_HEADER_BLOCK(soap_header, env, type,
+        axiom_soap_header_add_header_block(soap_header, env, type,
                 addr_ns_obj);
 
     if (addr_ns_obj)
@@ -562,7 +562,7 @@
         axiom_element_t *hb_ele = NULL;
         axiom_node_t *address_node = NULL;
         axiom_element_t *address_ele = NULL;
-        hb_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
+        hb_node = axiom_soap_header_block_get_base_node(header_block, env);
         hb_ele = (axiom_element_t *)
                 AXIOM_NODE_GET_DATA_ELEMENT(hb_node, env);
 
@@ -586,7 +586,7 @@
     }
 
     header_block_node =
-        AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
+        axiom_soap_header_block_get_base_node(header_block, env);
     axis2_addr_out_handler_add_to_header(env, endpoint_ref,
             &header_block_node, addr_ns);
 

Modified: webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c Mon Mar 19 12:13:26 2007
@@ -78,8 +78,8 @@
     
     if (soap_envelope)
     {
-        AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env); /* hack to ensure soab buider state
is in sync */
-        ret_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(soap_envelope, env);
+        axiom_soap_envelope_get_body(soap_envelope, env); /* hack to ensure soab buider state
is in sync */
+        ret_node = axiom_soap_envelope_get_base_node(soap_envelope, env);
 
         if(ret_node)
         {

Modified: webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c Mon Mar 19 12:13:26 2007
@@ -78,7 +78,7 @@
     
     if (soap_envelope)
     {
-        ret_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(soap_envelope, env);
+        ret_node = axiom_soap_envelope_get_base_node(soap_envelope, env);
 
         if(ret_node)
         {

Modified: webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c (original)
+++ webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c Mon Mar 19 12:13:26
2007
@@ -101,7 +101,7 @@
        return AXIS2_FAILURE;
     }        
         
-    soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env);
+    soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
     if (!soap_header)
     {
         AXIS2_LOG_INFO(env->log, "[rampart][rampart_out_handler] No SOAP header found.
ERROR");
@@ -176,7 +176,7 @@
     if (soap_envelope)
     {
 
-        soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env);
+        soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
         if (soap_header)
         {
             AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "SOAP header found");

Modified: webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c (original)
+++ webservices/axis2/trunk/c/rampart/src/handlers/rampart_out_handler.c Mon Mar 19 12:13:26
2007
@@ -89,7 +89,7 @@
     }
 
     /*We are checking for the soap header element*/
-    soap_header  = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env);
+    soap_header  = axiom_soap_envelope_get_header(soap_envelope, env);
 
     if (!soap_header)
     {
@@ -101,7 +101,7 @@
     /*if the soap header is available then add the security header*/
     if (soap_header)
     {
-        soap_header_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
+        soap_header_node = axiom_soap_header_get_base_node(soap_header, env);
         if(!soap_header_node)
         {
             AXIS2_LOG_INFO(env->log, "[rampart][rampart_out_handler] Cannot Create the
header node");

Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_context.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_context.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_context.c Mon Mar 19 12:13:26 2007
@@ -799,7 +799,7 @@
     axiom_soap_header_t *soap_header = NULL;
     axiom_node_t *header_node = NULL;
 
-    soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope,env);
+    soap_header = axiom_soap_envelope_get_header(soap_envelope,env);
     if(!soap_header)
         return AXIS2_FAILURE;
 
@@ -818,7 +818,7 @@
     {
         axis2_array_list_t *soap_header_blocks = NULL;
         int i = 0;
-        soap_header_blocks = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(soap_header,env,namespace);
+        soap_header_blocks = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header,env,namespace);
         if(!soap_header_blocks)
             return AXIS2_FAILURE;
 
@@ -829,7 +829,7 @@
             header_block = (axiom_soap_header_block_t *)axis2_array_list_get(soap_header_blocks,env,i);
             if(header_block)
             {
-                node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block,env);
+                node = axiom_soap_header_block_get_base_node(header_block,env);
                 if(node)
                 {    
                     axis2_array_list_add(nodes_to_encrypt_or_sign,env,node);
@@ -847,7 +847,7 @@
     else
     {
         axiom_node_t *ret_node = NULL;
-        header_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header,env);
+        header_node = axiom_soap_header_get_base_node(soap_header,env);
         if(header_node)
         {
             ret_node = oxs_axiom_get_node_by_local_name(env,header_node,local_name);
@@ -1166,8 +1166,8 @@
             else
                 AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] No Encrypted parts
specified. Using the body.");
 
-            body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
-            body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
+            body = axiom_soap_envelope_get_body(soap_envelope, env);
+            body_node = axiom_soap_body_get_base_node(body, env);
             body_child_node = axiom_node_get_first_element(body_node, env);
             axis2_array_list_add(nodes_to_sign_or_encrypt, env, body_child_node);
             return AXIS2_SUCCESS;
@@ -1204,8 +1204,8 @@
             axiom_node_t *body_child_node = NULL;
 
             AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] Including the body.");
-            body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
-            body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
+            body = axiom_soap_envelope_get_body(soap_envelope, env);
+            body_node = axiom_soap_body_get_base_node(body, env);
             body_child_node = axiom_node_get_first_element(body_node, env);
             axis2_array_list_add(nodes_to_sign_or_encrypt, env, body_child_node);
             return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c Mon Mar 19 12:13:26
2007
@@ -237,12 +237,12 @@
     axiom_element_t *header_block_ele = NULL;
     axiom_node_t *header_block_node = NULL;
 
-    sec_headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(soap_header, env,
RAMPART_WSSE_XMLNS);
+    sec_headers = axiom_soap_header_get_header_blocks_with_namespace_uri(soap_header, env,
RAMPART_WSSE_XMLNS);
     if (sec_headers)
     {
         sec_ns_str = axis2_strdup(RAMPART_WSSE_XMLNS, env);
 
-        header_block_ht = AXIOM_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(soap_header, env);
+        header_block_ht = axiom_soap_header_get_all_header_blocks(soap_header, env);
         if (!header_block_ht)
             return AXIS2_FAILURE;
 
@@ -257,7 +257,7 @@
 
             axis2_hash_this(hash_index, NULL, NULL, &hb);
             header_block = (axiom_soap_header_block_t *)hb;
-            header_block_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
+            header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
             header_block_ele  = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node,
env);
             ele_localname = axiom_element_get_localname(header_block_ele, env);
 

Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c Mon Mar 19 12:13:26
2007
@@ -76,8 +76,8 @@
     axiom_node_t *enc_key_node = NULL;
 
     AXIS2_ENV_CHECK(env,AXIS2_FAILURE);    
-    soap_header  = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env);
-    soap_header_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
+    soap_header  = axiom_soap_envelope_get_header(soap_envelope, env);
+    soap_header_node = axiom_soap_header_get_base_node(soap_header, env);
     soap_header_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
                             soap_header_node, env);
 
@@ -85,7 +85,7 @@
     sec_ns_obj =  axiom_namespace_create(env, RAMPART_WSSE_XMLNS,
                 RAMPART_WSSE);
 
-    sec_header_block = AXIOM_SOAP_HEADER_ADD_HEADER_BLOCK(soap_header,
+    sec_header_block = axiom_soap_header_add_header_block(soap_header,
                 env, RAMPART_SECURITY, sec_ns_obj);
 
     if(!sec_header_block)
@@ -94,10 +94,10 @@
         return AXIS2_SUCCESS;
     }
 
-    AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(sec_header_block,
+    axiom_soap_header_block_set_must_understand_with_bool(sec_header_block,
                 env, AXIS2_TRUE);
 
-    sec_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(sec_header_block, env);
+    sec_node = axiom_soap_header_block_get_base_node(sec_header_block, env);
     sec_ele = (axiom_element_t *)
                     AXIOM_NODE_GET_DATA_ELEMENT(sec_node, env);
         

Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c Mon Mar 19 12:13:26
2007
@@ -357,7 +357,7 @@
 
         /*This need to be done in order to build the soap body.Do not remove.*/
 
-        soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
+        soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
 
         /*Get the i-th element and decrypt it */
         id = (axis2_char_t*)axis2_array_list_get(reference_list, env, i);
@@ -365,7 +365,7 @@
 
         /*Need to remove # sign from the ID*/
         id2 = axis2_string_substring_starting_at(id, 1);
-        envelope_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(soap_envelope, env);
+        envelope_node = axiom_soap_envelope_get_base_node(soap_envelope, env);
 
         /*Search for the node by its ID*/
         enc_data_node = oxs_axiom_get_node_by_id(env, envelope_node, OXS_ATTR_ID, id2);

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c Mon Mar 19 12:13:26
2007
@@ -169,7 +169,7 @@
     }
     else
     {
-        ret_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(soap_envelope, env);
+        ret_node = axiom_soap_envelope_get_base_node(soap_envelope, env);
 
         if (!ret_node)
         {

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c Mon Mar
19 12:13:26 2007
@@ -183,7 +183,7 @@
     }
     else
     {
-        ret_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(soap_envelope, env);
+        ret_node = axiom_soap_envelope_get_base_node(soap_envelope, env);
 
         if (!ret_node)
         {

Modified: webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c (original)
+++ webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c Mon Mar 19 12:13:26 2007
@@ -372,7 +372,7 @@
         return NULL;
     }
     
-    body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env);
+    body = axiom_soap_envelope_get_body(envelope, env);
     if (!body)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to extract the "
@@ -381,7 +381,7 @@
     }
     
     /* Get Body element from body node */
-    body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
+    body_node = axiom_soap_body_get_base_node(body, env);
     body_elem = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(body_node, env);
     
     /* Get Subscribe element from Body */

Modified: webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c (original)
+++ webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c Mon Mar 19 12:13:26
2007
@@ -475,7 +475,7 @@
         return NULL;
     }
 
-    *body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
+    *body_node = axiom_soap_body_get_base_node(body, env);
     if (!(*body_node))
     {
         return NULL;

Modified: webservices/axis2/trunk/c/savan/src/util/savan_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/util/savan_util.c?view=diff&rev=520049&r1=520048&r2=520049
==============================================================================
--- webservices/axis2/trunk/c/savan/src/util/savan_util.c (original)
+++ webservices/axis2/trunk/c/savan/src/util/savan_util.c Mon Mar 19 12:13:26 2007
@@ -98,7 +98,7 @@
         return NULL;
     }
     
-    header = AXIOM_SOAP_ENVELOPE_GET_HEADER(envelope, env);
+    header = axiom_soap_envelope_get_header(envelope, env);
     if (!header)
     {
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to extract the "
@@ -107,7 +107,7 @@
     }
     
     /* Get header element from header node */
-    header_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(header, env);
+    header_node = axiom_soap_header_get_base_node(header, env);
     header_elem = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_node, env);
     
     /* Get Identifier element from header */



---------------------------------------------------------------------
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