Author: dushshantha
Date: Fri Mar 16 01:36:50 2007
New Revision: 518888

URL: http://svn.apache.org/viewvc?view=rev&rev=518888
Log:
removed few macro references

Modified:
    webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c
    webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c
    webservices/sandesha/trunk/c/samples/rm_echo_1_0/echo_util.c
    webservices/sandesha/trunk/c/samples/rm_echo_1_1/echo_util.c
    webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/echo_util.c
    webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/echo_util.c
    webservices/sandesha/trunk/c/samples/rm_mtom_1_0/mtom_util.c
    webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c
    webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c
    webservices/sandesha/trunk/c/samples/rm_report/report_util.c
    webservices/sandesha/trunk/c/src/client/client.c
    webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
    webservices/sandesha/trunk/c/src/util/fault_mgr.c
    webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
    webservices/sandesha/trunk/c/src/wsrm/accept.c
    webservices/sandesha/trunk/c/src/wsrm/ack_final.c
    webservices/sandesha/trunk/c/src/wsrm/ack_none.c
    webservices/sandesha/trunk/c/src/wsrm/ack_range.c
    webservices/sandesha/trunk/c/src/wsrm/ack_requested.c
    webservices/sandesha/trunk/c/src/wsrm/acks_to.c
    webservices/sandesha/trunk/c/src/wsrm/address.c
    webservices/sandesha/trunk/c/src/wsrm/create_seq.c
    webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
    webservices/sandesha/trunk/c/src/wsrm/expires.c
    webservices/sandesha/trunk/c/src/wsrm/fault_code.c
    webservices/sandesha/trunk/c/src/wsrm/identifier.c
    webservices/sandesha/trunk/c/src/wsrm/last_msg.c
    webservices/sandesha/trunk/c/src/wsrm/make_connection.c
    webservices/sandesha/trunk/c/src/wsrm/msg_number.c
    webservices/sandesha/trunk/c/src/wsrm/msg_pending.c
    webservices/sandesha/trunk/c/src/wsrm/nack.c
    webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
    webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
    webservices/sandesha/trunk/c/src/wsrm/seq_fault.c
    webservices/sandesha/trunk/c/src/wsrm/seq_offer.c
    webservices/sandesha/trunk/c/src/wsrm/sequence.c

Modified: webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c 
(original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc.c Fri 
Mar 16 01:36:50 2007
@@ -72,7 +72,7 @@
 
     element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
     qname = axis2_qname_create(env, "Text", ns, NULL);
-    text_parent_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(element, 
env, 
+    text_parent_element = axiom_element_get_first_child_with_qname(element, 
env, 
             qname, node, &text_parent_node);
     AXIS2_QNAME_FREE(qname, env);
     if (!text_parent_node) /* 'text' node */
@@ -124,11 +124,11 @@
     
     text_om_ele = axiom_element_create(env, echo_om_node, "text", NULL, 
&text_om_node);
 
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, text, text_om_node);
+    axiom_element_set_text(text_om_ele, env, text, text_om_node);
 
     echo_om_ele = axiom_element_create(env, NULL, "echoStringResponse", ns1, 
&echo_om_node);
     text_om_ele = axiom_element_create(env, echo_om_node, "EchoStringReturn", 
ns1, &text_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, text, text_om_node);
+    axiom_element_set_text(text_om_ele, env, text, text_om_node);
 
     
     return echo_om_node;
@@ -174,7 +174,7 @@
 
     element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
     qname = axis2_qname_create(env, "Text", ns, NULL);
-    text_parent_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(element, 
env, 
+    text_parent_element = axiom_element_get_first_child_with_qname(element, 
env, 
             qname, node, &text_parent_node);
     AXIS2_QNAME_FREE(qname, env);
     if (!text_parent_node) /* 'text' node */
@@ -302,7 +302,7 @@
 
     mtom_om_ele = axiom_element_create(env, NULL, "response", ns1, 
&mtom_om_node);
 
-    AXIOM_ELEMENT_SET_TEXT(mtom_om_ele, env, "Image Saved", mtom_om_node);
+    axiom_element_set_text(mtom_om_ele, env, "Image Saved", mtom_om_node);
 
     return mtom_om_node;
 }

Modified: 
webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c 
(original)
+++ webservices/sandesha/trunk/c/samples/RMSampleService/rm_sample_svc_skel.c 
Fri Mar 16 01:36:50 2007
@@ -139,7 +139,7 @@
     axiom_element_t *error_ele = NULL;
     error_ele = axiom_element_create(env, node, "EchoServiceError", NULL, 
         &error_node);
-    AXIOM_ELEMENT_SET_TEXT(error_ele, env, "Echo service failed ", 
+    axiom_element_set_text(error_ele, env, "Echo service failed ", 
         text_node);
     return error_node;
 }

Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_0/echo_util.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_0/echo_util.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_0/echo_util.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_0/echo_util.c Fri Mar 16 
01:36:50 2007
@@ -39,8 +39,8 @@
     echo_om_ele = axiom_element_create(env, NULL, "echoString", ns1, 
&echo_om_node);
     text_om_ele = axiom_element_create(env, echo_om_node, "Text", ns1, 
&text_om_node);
     seq_om_ele = axiom_element_create(env, echo_om_node, "Sequence", ns1, 
&seq_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, text, text_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, seq, seq_om_node);
+    axiom_element_set_text(text_om_ele, env, text, text_om_node);
+    axiom_element_set_text(text_om_ele, env, seq, seq_om_node);
     
     om_str = AXIOM_NODE_TO_STRING(echo_om_node, env);
     if (om_str)

Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_1/echo_util.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_1/echo_util.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_1/echo_util.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_1/echo_util.c Fri Mar 16 
01:36:50 2007
@@ -39,8 +39,8 @@
     echo_om_ele = axiom_element_create(env, NULL, "echoString", ns1, 
&echo_om_node);
     text_om_ele = axiom_element_create(env, echo_om_node, "Text", ns1, 
&text_om_node);
     seq_om_ele = axiom_element_create(env, echo_om_node, "Sequence", ns1, 
&seq_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, text, text_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, seq, seq_om_node);
+    axiom_element_set_text(text_om_ele, env, text, text_om_node);
+    axiom_element_set_text(text_om_ele, env, seq, seq_om_node);
     
     om_str = AXIOM_NODE_TO_STRING(echo_om_node, env);
     if (om_str)

Modified: webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/echo_util.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/echo_util.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/echo_util.c 
(original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/echo_util.c Fri Mar 
16 01:36:50 2007
@@ -39,8 +39,8 @@
     echo_om_ele = axiom_element_create(env, NULL, "echoString", ns1, 
&echo_om_node);
     text_om_ele = axiom_element_create(env, echo_om_node, "Text", ns1, 
&text_om_node);
     seq_om_ele = axiom_element_create(env, echo_om_node, "Sequence", ns1, 
&seq_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, text, text_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, seq, seq_om_node);
+    axiom_element_set_text(text_om_ele, env, text, text_om_node);
+    axiom_element_set_text(text_om_ele, env, seq, seq_om_node);
     
     om_str = AXIOM_NODE_TO_STRING(echo_om_node, env);
     if (om_str)

Modified: webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/echo_util.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/echo_util.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/echo_util.c 
(original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/echo_util.c Fri Mar 
16 01:36:50 2007
@@ -39,8 +39,8 @@
     echo_om_ele = axiom_element_create(env, NULL, "echoString", ns1, 
&echo_om_node);
     text_om_ele = axiom_element_create(env, echo_om_node, "Text", ns1, 
&text_om_node);
     seq_om_ele = axiom_element_create(env, echo_om_node, "Sequence", ns1, 
&seq_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, text, text_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, seq, seq_om_node);
+    axiom_element_set_text(text_om_ele, env, text, text_om_node);
+    axiom_element_set_text(text_om_ele, env, seq, seq_om_node);
     
     om_str = AXIOM_NODE_TO_STRING(echo_om_node, env);
     if (om_str)

Modified: webservices/sandesha/trunk/c/samples/rm_mtom_1_0/mtom_util.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_mtom_1_0/mtom_util.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_mtom_1_0/mtom_util.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_mtom_1_0/mtom_util.c Fri Mar 16 
01:36:50 2007
@@ -42,7 +42,7 @@
 
     file_om_ele = axiom_element_create(env, mtom_om_node, "fileName", ns1, 
             &file_om_node);
-    AXIOM_ELEMENT_SET_TEXT(file_om_ele, env, to_save_name, file_om_node);
+    axiom_element_set_text(file_om_ele, env, to_save_name, file_om_node);
 
     image_om_ele = axiom_element_create(env, mtom_om_node, "image", ns1, 
             &image_om_node);

Modified: webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_ping_1_0/rm_ping_1_0.c Fri Mar 16 
01:36:50 2007
@@ -189,7 +189,7 @@
     ns1 = axiom_namespace_create (env, "http://tempuri.org/";, "ns1");
     ping_om_ele = axiom_element_create(env, NULL, "ping", ns1, &ping_om_node);
     text_om_ele = axiom_element_create(env, ping_om_node, "Text", ns1, 
&text_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, text, text_om_node);
+    axiom_element_set_text(text_om_ele, env, text, text_om_node);
     
     buffer = AXIOM_NODE_TO_STRING(ping_om_node, env);
     printf("\nSending OM node in XML : %s \n",  buffer); 

Modified: webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c Fri Mar 16 
01:36:50 2007
@@ -206,9 +206,9 @@
     text_om_ele = axiom_element_create(env, ping_om_node, "Text", ns1, 
&text_om_node);
     if(seq_key)
         seq_om_ele = axiom_element_create(env, ping_om_node, "Sequence", ns1, 
&seq_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, text, text_om_node);
+    axiom_element_set_text(text_om_ele, env, text, text_om_node);
     if(seq_key)
-        AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, seq_key, seq_om_node);
+        axiom_element_set_text(text_om_ele, env, seq_key, seq_om_node);
     
     buffer = AXIOM_NODE_TO_STRING(ping_om_node, env);
     printf("\nSending OM node in XML : %s \n",  buffer); 

Modified: webservices/sandesha/trunk/c/samples/rm_report/report_util.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_report/report_util.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_report/report_util.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_report/report_util.c Fri Mar 16 
01:36:50 2007
@@ -39,8 +39,8 @@
     echo_om_ele = axiom_element_create(env, NULL, "echoString", ns1, 
&echo_om_node);
     text_om_ele = axiom_element_create(env, echo_om_node, "Text", ns1, 
&text_om_node);
     seq_om_ele = axiom_element_create(env, echo_om_node, "Sequence", ns1, 
&seq_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, text, text_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, seq, seq_om_node);
+    axiom_element_set_text(text_om_ele, env, text, text_om_node);
+    axiom_element_set_text(text_om_ele, env, seq, seq_om_node);
     
     om_str = AXIOM_NODE_TO_STRING(echo_om_node, env);
     if (om_str)

Modified: webservices/sandesha/trunk/c/src/client/client.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Fri Mar 16 01:36:50 2007
@@ -684,7 +684,7 @@
     element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_TERMINATE_SEQ, 
             rm_namespc_value, NULL);
-    terminate_body_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(element, 
+    terminate_body_element = axiom_element_get_first_child_with_qname(element, 
         env, qname, node, &terminate_body_node);
     old_action = AXIS2_STRDUP(AXIS2_OPTIONS_GET_ACTION(options, env), env);
     action = sandesha2_spec_specific_consts_get_terminate_seq_action(env, 
@@ -792,7 +792,7 @@
     element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CLOSE_SEQ, 
             rm_namespc_value, NULL);
-    close_body_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(element, 
env, 
+    close_body_element = axiom_element_get_first_child_with_qname(element, 
env, 
             qname, node, &close_body_node);
     old_action = (axis2_char_t*)AXIS2_OPTIONS_GET_ACTION(options, env);
     action = sandesha2_spec_specific_consts_get_close_seq_action(env, 
@@ -1153,7 +1153,7 @@
     element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_ACK_REQUESTED, 
             rm_ns_value, NULL);
-    ack_requested_header_block = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+    ack_requested_header_block = axiom_element_get_first_child_with_qname(
             element, env, qname, node, &ack_requested_header_block_node);
     old_action = (axis2_char_t*)AXIS2_OPTIONS_GET_ACTION(options, env);
     action = sandesha2_spec_specific_consts_get_ack_req_action(env, 

Modified: 
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c 
(original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Fri 
Mar 16 01:36:50 2007
@@ -350,7 +350,7 @@
                         env);
                 body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
                 body_element = AXIOM_NODE_GET_DATA_ELEMENT(body_node, env);
-                children_iterator = AXIOM_ELEMENT_GET_CHILDREN(body_element, 
env, 
+                children_iterator = axiom_element_get_children(body_element, 
env, 
                         body_node);
                 if(!axiom_children_iterator_has_next(children_iterator, env))
                     empty_body = AXIS2_TRUE;

Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Fri Mar 16 01:36:50 2007
@@ -328,7 +328,7 @@
         sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t 
*)seq_ack, env, dummy_node);
         qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_ACK, 
                         NULL, NULL);
-        detail_ele = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(dummy_ele, env,
+        detail_ele = axiom_element_get_first_child_with_qname(dummy_ele, env,
                         qname, dummy_node, &detail_node);
         sandesha2_fault_data_set_detail(fault_data, env, detail_node);
         sandesha2_fault_data_set_reason(fault_data, env, reason);

Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Fri Mar 16 01:36:50 
2007
@@ -86,7 +86,7 @@
     {
         return AXIS2_FAILURE;
     }
-    body_rm_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(body_element,
+    body_rm_element = axiom_element_get_first_child_with_qname(body_element,
                             env, qname, body_node, &body_rm_node);
     if(body_rm_element)
     {
@@ -896,13 +896,13 @@
     
         qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ,
                         SANDESHA2_SPEC_2005_02_NS_URI, NULL);
-        seq_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(header_element, 
+        seq_element = axiom_element_get_first_child_with_qname(header_element, 
                         env, qname, header_node, &seq_node);
         if(!seq_element)
         {
             qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ,
                         SANDESHA2_SPEC_2006_08_NS_URI, NULL);
-            seq_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+            seq_element = axiom_element_get_first_child_with_qname(
                         header_element, env, qname, header_node, &seq_node);
         }
     }

Modified: webservices/sandesha/trunk/c/src/wsrm/accept.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/accept.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/accept.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/accept.c Fri Mar 16 01:36:50 2007
@@ -184,7 +184,7 @@
                         AXIS2_FAILURE);
         return NULL;
     }
-    accept_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    accept_part = axiom_element_get_first_child_with_qname(om_element, env,
                         accept_qname, om_node, &child_om_node); 
     if(NULL == accept_part || NULL == child_om_node)
     {

Modified: webservices/sandesha/trunk/c/src/wsrm/ack_final.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_final.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_final.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_final.c Fri Mar 16 01:36:50 2007
@@ -166,7 +166,7 @@
                         AXIS2_FAILURE); 
         return NULL;
     }
-    final_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    final_part = axiom_element_get_first_child_with_qname(om_element, env,
                         final_qname, om_node, &final_part_node);  
     if(NULL == final_part)
     {

Modified: webservices/sandesha/trunk/c/src/wsrm/ack_none.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_none.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_none.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_none.c Fri Mar 16 01:36:50 2007
@@ -165,7 +165,7 @@
                         AXIS2_FAILURE);
         return NULL;
     }
-    none_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    none_part = axiom_element_get_first_child_with_qname(om_element, env,
                         none_qname, om_node, &none_node);
     if(NULL == none_part)
     {

Modified: webservices/sandesha/trunk/c/src/wsrm/ack_range.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_range.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_range.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_range.c Fri Mar 16 01:36:50 2007
@@ -205,13 +205,13 @@
                         AXIS2_FAILURE);
         return NULL;
     }
-    /*lower_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(om_element, env,
+    /*lower_str = axiom_element_get_attribute_value(om_element, env,
                         low_qname);
-    upper_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(om_element, env,
+    upper_str = axiom_element_get_attribute_value(om_element, env,
                         upper_qname);*/
-    lower_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_element, env,
+    lower_str = axiom_element_get_attribute_value_by_name(om_element, env,
                         SANDESHA2_WSRM_COMMON_LOWER);
-    upper_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_element, env,
+    upper_str = axiom_element_get_attribute_value_by_name(om_element, env,
                         SANDESHA2_WSRM_COMMON_UPPER);
     
     if(!lower_str || !upper_str)
@@ -279,8 +279,8 @@
     {
         return NULL;
     }
-    AXIOM_ELEMENT_ADD_ATTRIBUTE(ar_element, env, lower_attr, ar_node);
-    AXIOM_ELEMENT_ADD_ATTRIBUTE(ar_element, env, upper_attr, ar_node);
+    axiom_element_add_attribute(ar_element, env, lower_attr, ar_node);
+    axiom_element_add_attribute(ar_element, env, upper_attr, ar_node);
 
     return (axiom_node_t*)om_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/ack_requested.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_requested.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_requested.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_requested.c Fri Mar 16 01:36:50 
2007
@@ -208,7 +208,7 @@
     {
         return NULL;
     }
-    msg_num_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(requested_part, 
env, 
+    msg_num_part = axiom_element_get_first_child_with_qname(requested_part, 
env, 
         msg_num_qname, requested_node, &msg_num_node);
     if(msg_num_part)
     {

Modified: webservices/sandesha/trunk/c/src/wsrm/acks_to.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/acks_to.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/acks_to.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/acks_to.c Fri Mar 16 01:36:50 2007
@@ -177,7 +177,7 @@
     {
         return NULL;
     }
-    acks_to_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    acks_to_part = axiom_element_get_first_child_with_qname(om_element, env,
                         acks_to_qname, om_node, &acks_to_node);
     if(NULL == acks_to_part)
     {

Modified: webservices/sandesha/trunk/c/src/wsrm/address.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/address.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/address.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/address.c Fri Mar 16 01:36:50 2007
@@ -168,7 +168,7 @@
     {
         return NULL;
     } 
-    addr_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env, 
+    addr_part = axiom_element_get_first_child_with_qname(om_element, env, 
             addr_qname, om_node, &addr_node);
     if(!addr_part)
     {
@@ -176,7 +176,7 @@
             AXIS2_FAILURE);
         return NULL;
     }
-    str_address = AXIOM_ELEMENT_GET_TEXT(addr_part, env, addr_node);
+    str_address = axiom_element_get_text(addr_part, env, addr_node);
     if(!str_address || 0 == AXIS2_STRLEN(str_address))
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_EMPTY_OM_ELEMENT,
@@ -226,7 +226,7 @@
     {
         return NULL;
     }
-    AXIOM_ELEMENT_SET_TEXT(addr_element, env, 
+    axiom_element_set_text(addr_element, env, 
             axis2_endpoint_ref_get_address(address_impl->epr, env), 
             addr_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, addr_node);

Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq.c Fri Mar 16 01:36:50 2007
@@ -235,7 +235,7 @@
     {
         return NULL;
     }
-    offer_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(seq_part, env, 
+    offer_part = axiom_element_get_first_child_with_qname(seq_part, env, 
         offer_qname, seq_node, &offer_node);
     if(offer_part)
     {
@@ -257,7 +257,7 @@
     {
         return NULL;
     }
-    expires_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(seq_part, env, 
+    expires_part = axiom_element_get_first_child_with_qname(seq_part, env, 
         expires_qname, seq_node, &expires_node);
     if(expires_part)
     {

Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c Fri Mar 16 01:36:50 
2007
@@ -230,7 +230,7 @@
     {
         return NULL;
     }
-    exp_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(csr_part, env, 
+    exp_part = axiom_element_get_first_child_with_qname(csr_part, env, 
         exp_qname, csr_node, &exp_node);
     if(exp_part)
     {
@@ -252,7 +252,7 @@
     {
         return NULL;
     } 
-    acc_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(csr_part, env, 
+    acc_part = axiom_element_get_first_child_with_qname(csr_part, env, 
         acc_qname, csr_node, &acc_node);
     if(acc_part)
     {

Modified: webservices/sandesha/trunk/c/src/wsrm/expires.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/expires.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/expires.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/expires.c Fri Mar 16 01:36:50 2007
@@ -186,7 +186,7 @@
                         AXIS2_FAILURE);
         return NULL;
     }
-    exp_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    exp_part = axiom_element_get_first_child_with_qname(om_element, env,
                         exp_qname, om_node, &exp_node);
     if(NULL == exp_part)
     {
@@ -194,7 +194,7 @@
                         AXIS2_FAILURE);
         return NULL;
     }
-    text = AXIOM_ELEMENT_GET_TEXT(exp_part, env, exp_node);
+    text = axiom_element_get_text(exp_part, env, exp_node);
     if(NULL == text)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_EMPTY_OM_ELEMENT, 
@@ -244,7 +244,7 @@
     {
         return NULL;
     }
-    AXIOM_ELEMENT_SET_TEXT(exp_element, env, expires_impl->duration, 
+    axiom_element_set_text(exp_element, env, expires_impl->duration, 
                         exp_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, exp_node);
     return (axiom_node_t*)om_node;

Modified: webservices/sandesha/trunk/c/src/wsrm/fault_code.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/fault_code.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/fault_code.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/fault_code.c Fri Mar 16 01:36:50 2007
@@ -177,7 +177,7 @@
     {
         return NULL;
     }
-    fault_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    fault_part = axiom_element_get_first_child_with_qname(om_element, env,
                         fault_qname, om_node, &fault_node);
     if(NULL == fault_part)
     {
@@ -185,7 +185,7 @@
                         AXIS2_FAILURE);
         return NULL;
     } 
-    fault_text = AXIOM_ELEMENT_GET_TEXT(fault_part, env, fault_node);
+    fault_text = axiom_element_get_text(fault_part, env, fault_node);
     if(NULL == fault_text)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_EMPTY_OM_ELEMENT, 
@@ -234,7 +234,7 @@
     {
         return NULL;
     }
-    AXIOM_ELEMENT_SET_TEXT(fc_element, env, fault_code_impl->str_fault_code, 
+    axiom_element_set_text(fc_element, env, fault_code_impl->str_fault_code, 
                         fc_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, fc_node);
     return (axiom_node_t*)om_node;

Modified: webservices/sandesha/trunk/c/src/wsrm/identifier.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/identifier.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/identifier.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/identifier.c Fri Mar 16 01:36:50 2007
@@ -187,7 +187,7 @@
     {
         return NULL;
     }
-    ident_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    ident_part = axiom_element_get_first_child_with_qname(om_element, env,
                         ident_qname, om_node, &ident_node);
     if(NULL == ident_part)
     {
@@ -195,7 +195,7 @@
                         AXIS2_FAILURE);
         return NULL;
     }
-    ident_str = AXIOM_ELEMENT_GET_TEXT(ident_part, env, ident_node);
+    ident_str = axiom_element_get_text(ident_part, env, ident_node);
     if(NULL == ident_str)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_EMPTY_OM_ELEMENT,
@@ -244,7 +244,7 @@
     {
         return NULL;
     }
-    AXIOM_ELEMENT_SET_TEXT(id_element, env, identifier_impl->str_id, 
+    axiom_element_set_text(id_element, env, identifier_impl->str_id, 
                         id_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, id_node);
     return (axiom_node_t*)om_node;

Modified: webservices/sandesha/trunk/c/src/wsrm/last_msg.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/last_msg.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/last_msg.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/last_msg.c Fri Mar 16 01:36:50 2007
@@ -170,7 +170,7 @@
     {
         return NULL;
     }
-    lm_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    lm_part = axiom_element_get_first_child_with_qname(om_element, env,
                         lm_qname, om_node, &lm_node);
     if(NULL == lm_part)
     {

Modified: webservices/sandesha/trunk/c/src/wsrm/make_connection.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/make_connection.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/make_connection.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/make_connection.c Fri Mar 16 01:36:50 
2007
@@ -228,9 +228,9 @@
     {
         return NULL;
     }
-    identifier_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, 
env,
+    identifier_element = axiom_element_get_first_child_with_qname(om_element, 
env,
                         identifier_qname, om_node, &identifier_node);
-    address_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    address_element = axiom_element_get_first_child_with_qname(om_element, env,
                         address_qname, om_node, &address_node);
     if(!identifier_element && !address_element)
     {
@@ -416,7 +416,7 @@
         return AXIS2_FAILURE;
     }
     if(body_element)
-        element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(body_element, env,
+        element = axiom_element_get_first_child_with_qname(body_element, env,
             make_conn_qname, body_node, &node);
     /**
      * Detach if already exists

Modified: webservices/sandesha/trunk/c/src/wsrm/msg_number.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/msg_number.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/msg_number.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/msg_number.c Fri Mar 16 01:36:50 2007
@@ -201,7 +201,7 @@
     {
         return NULL;
     }
-    mn_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    mn_part = axiom_element_get_first_child_with_qname(om_element, env,
                         mn_qname, om_node, &mn_node);
     if(NULL == mn_part)
     {
@@ -209,7 +209,7 @@
                         AXIS2_FAILURE);
         return NULL;
     }
-    mn_str = AXIOM_ELEMENT_GET_TEXT(mn_part, env, mn_node);
+    mn_str = axiom_element_get_text(mn_part, env, mn_node);
     if(NULL == mn_str)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_EMPTY_OM_ELEMENT,
@@ -256,7 +256,7 @@
     }
     str_num = AXIS2_MALLOC(env->allocator, 32*sizeof(axis2_char_t));
     sprintf(str_num, "%ld", msg_number_impl->msg_num);
-    AXIOM_ELEMENT_SET_TEXT(mn_element, env, str_num, mn_node);
+    axiom_element_set_text(mn_element, env, str_num, mn_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, mn_node);
     
     return (axiom_node_t*)om_node;

Modified: webservices/sandesha/trunk/c/src/wsrm/msg_pending.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/msg_pending.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/msg_pending.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/msg_pending.c Fri Mar 16 01:36:50 2007
@@ -207,7 +207,7 @@
     {
         return NULL;
     }
-    pending_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(msg_pending_element, env, 
+    pending_attr = axiom_element_get_attribute(msg_pending_element, env, 
         pending_qname);
     if(!pending_attr)
     {
@@ -276,7 +276,7 @@
         attr_value = AXIS2_VALUE_FALSE;
     pending_attr = axiom_attribute_create(env, 
         SANDESHA2_WSRM_COMMON_PENDING, attr_value, NULL);
-    AXIOM_ELEMENT_ADD_ATTRIBUTE(msg_pending_element, env, pending_attr, 
+    axiom_element_add_attribute(msg_pending_element, env, pending_attr, 
         msg_pending_node);
     return header_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/nack.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/nack.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/nack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/nack.c Fri Mar 16 01:36:50 2007
@@ -198,7 +198,7 @@
     {
         return NULL;
     }
-    nack_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    nack_part = axiom_element_get_first_child_with_qname(om_element, env,
                         nack_qname, om_node, &nack_node);
     if(NULL == nack_part)
     {
@@ -206,7 +206,7 @@
                         AXIS2_FAILURE);
         return NULL;
     }
-    nack_text = AXIOM_ELEMENT_GET_TEXT(nack_part, env, nack_node);
+    nack_text = axiom_element_get_text(nack_part, env, nack_node);
     if(NULL == nack_text)
     {
         AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_EMPTY_OM_ELEMENT,
@@ -251,7 +251,7 @@
     }
     str_num = AXIS2_MALLOC(env->allocator, 32*sizeof(axis2_char_t));
     sprintf(str_num, "%ld", nack_impl->nack_num);
-    AXIOM_ELEMENT_SET_TEXT(nack_element, env, str_num, nack_node);
+    axiom_element_set_text(nack_element, env, str_num, nack_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, nack_node);
     
     return (axiom_node_t*)om_node;

Modified: webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/rm_elements.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/rm_elements.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/rm_elements.c Fri Mar 16 01:36:50 2007
@@ -170,7 +170,7 @@
     addr_ns_val = rm_elements->addr_ns_val;
     
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ, rm_ns_val, 
NULL);
-    seq_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(header_element, env,
+    seq_element = axiom_element_get_first_child_with_qname(header_element, env,
                         qname, header_node, &seq_node);
     if(seq_node)
     {
@@ -180,7 +180,7 @@
     }
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_SEQ_ACK, rm_ns_val, 
                         NULL);
-    seq_ack_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(header_element,
+    seq_ack_element = axiom_element_get_first_child_with_qname(header_element,
                         env, qname, header_node, &seq_ack_node);
     if(seq_ack_element)
     {
@@ -190,7 +190,7 @@
     }
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CREATE_SEQ, 
rm_ns_val,
                         NULL);
-    create_seq_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(body_element,
+    create_seq_element = axiom_element_get_first_child_with_qname(body_element,
                         env, qname, body_node, &create_seq_node);
     if(create_seq_node)
     {
@@ -202,7 +202,7 @@
     
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CREATE_SEQ_RESPONSE, 
                         rm_ns_val, NULL);
-    create_seq_res_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+    create_seq_res_element = axiom_element_get_first_child_with_qname(
         body_element, env, qname, body_node, &create_seq_res_node);
     if(create_seq_res_node)
     {
@@ -214,7 +214,7 @@
     
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_TERMINATE_SEQ, 
                         rm_ns_val, NULL);
-    terminate_seq_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+    terminate_seq_element = axiom_element_get_first_child_with_qname(
         body_element, env, qname, body_node, &terminate_seq_node);
     if(terminate_seq_node)
     {
@@ -226,7 +226,7 @@
     
     qname = axis2_qname_create(env, 
SANDESHA2_WSRM_COMMON_TERMINATE_SEQ_RESPONSE, 
         rm_ns_val, NULL);
-    terminate_seq_res_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+    terminate_seq_res_element = axiom_element_get_first_child_with_qname(
         body_element, env, qname, body_node, &terminate_seq_res_node);
     if(terminate_seq_res_node)
     {
@@ -238,7 +238,7 @@
     
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CLOSE_SEQ, 
rm_ns_val, 
         NULL);
-    close_seq_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(body_element, 
+    close_seq_element = axiom_element_get_first_child_with_qname(body_element, 
         env, qname, body_node, &close_seq_node);
     if(close_seq_node)
     {
@@ -249,7 +249,7 @@
     
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_CLOSE_SEQ_RESPONSE, 
                         rm_ns_val, NULL);
-    close_seq_res_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+    close_seq_res_element = axiom_element_get_first_child_with_qname(
         body_element, env, qname, body_node, &close_seq_res_node);
     if(close_seq_res_node)
     {
@@ -260,7 +260,7 @@
     }
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_MAKE_CONNECTION, 
         rm_ns_val, NULL);
-    make_conn_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(body_element, 
+    make_conn_element = axiom_element_get_first_child_with_qname(body_element, 
         env, qname, body_node, &make_conn_node);
     if(make_conn_node)
     {
@@ -271,7 +271,7 @@
     }
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_ACK_REQUESTED, 
                         rm_ns_val, NULL);
-    ack_requested_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+    ack_requested_element = axiom_element_get_first_child_with_qname(
         header_element, env, qname, header_node, &ack_requested_node);
     if(ack_requested_node)
     {
@@ -282,7 +282,7 @@
     }
     qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_MESSAGE_PENDING, 
         rm_ns_val, NULL);
-    msg_pending_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+    msg_pending_element = axiom_element_get_first_child_with_qname(
         header_element, env, qname, header_node, &msg_pending_node);
     if(msg_pending_node)
     {
@@ -687,7 +687,7 @@
         soap_header_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
         soap_header_element = AXIOM_NODE_GET_DATA_ELEMENT(soap_header_node, 
             env);
-        addr_ns = AXIOM_ELEMENT_GET_NAMESPACE(soap_header_element, env, 
+        addr_ns = axiom_element_get_namespace(soap_header_element, env, 
             soap_header_node);
         if(addr_ns)
         {

Modified: webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_ack.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Fri Mar 16 01:36:50 2007
@@ -224,7 +224,7 @@
             AXIS2_FAILURE);
         return NULL;
     }
-    rm_ns = AXIOM_ELEMENT_GET_NAMESPACE(sa_part, env, sa_node);
+    rm_ns = axiom_element_get_namespace(sa_part, env, sa_node);
     prefix = axiom_namespace_get_prefix(rm_ns, env);
     seq_ack_impl->identifier = sandesha2_identifier_create(env, 
                         seq_ack_impl->ns_val);
@@ -240,7 +240,7 @@
     {
         return NULL;
     }
-    ack_iter = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(sa_part, env, 
+    ack_iter = axiom_element_get_children_with_qname(sa_part, env, 
         ack_range_qname, sa_node);
     if(!ack_iter)
     {
@@ -271,7 +271,7 @@
     {
         return NULL;
     }
-    nack_iter = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(sa_part, env, 
nack_qname, 
+    nack_iter = axiom_element_get_children_with_qname(sa_part, env, 
nack_qname, 
         sa_node);
     if(!nack_iter)
     {
@@ -308,7 +308,7 @@
         {
             return NULL;
         }
-        af_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(sa_part, env, 
+        af_part = axiom_element_get_first_child_with_qname(sa_part, env, 
             af_qname, sa_node, &af_node);
         if(af_part)
         {
@@ -330,7 +330,7 @@
 
         an_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_NONE,
             seq_ack_impl->ns_val, NULL);
-        an_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(sa_part, env,
+        an_part = axiom_element_get_first_child_with_qname(sa_part, env,
             an_qname, sa_node, &an_node);
         if(an_part)
         {

Modified: webservices/sandesha/trunk/c/src/wsrm/seq_fault.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_fault.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_fault.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_fault.c Fri Mar 16 01:36:50 2007
@@ -169,7 +169,7 @@
     {
         return NULL;
     }
-    sf_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    sf_part = axiom_element_get_first_child_with_qname(om_element, env,
                         sf_qname, om_node, &sf_node);
     if(NULL == sf_part)
     {
@@ -183,7 +183,7 @@
     {
         return NULL;
     }
-    fc_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    fc_part = axiom_element_get_first_child_with_qname(om_element, env,
                         sf_qname, sf_node, &fc_node);
     if(NULL != fc_part)
     {

Modified: webservices/sandesha/trunk/c/src/wsrm/seq_offer.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_offer.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_offer.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_offer.c Fri Mar 16 01:36:50 2007
@@ -181,7 +181,7 @@
     {
         return NULL;
     }
-    so_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(om_element, env,
+    so_part = axiom_element_get_first_child_with_qname(om_element, env,
                         so_qname, om_node, &so_node);
     if(NULL == so_part)
     {
@@ -203,7 +203,7 @@
     {
         return NULL;
     }
-    exp_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(so_part, env,
+    exp_part = axiom_element_get_first_child_with_qname(so_part, env,
                         exp_qname, so_node, &exp_node); 
     if(NULL != exp_part)
     {

Modified: webservices/sandesha/trunk/c/src/wsrm/sequence.c
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/sequence.c?view=diff&rev=518888&r1=518887&r2=518888
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/sequence.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/sequence.c Fri Mar 16 01:36:50 2007
@@ -235,7 +235,7 @@
     {
         return NULL;
     }
-    lm_part = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(seq_part, env, 
+    lm_part = axiom_element_get_first_child_with_qname(seq_part, env, 
         lm_qname, seq_node, &lm_node);
     if(lm_part)
     {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to