axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dushshan...@apache.org
Subject svn commit: r518887 [2/5] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/om/ axiom/src/soap/ axiom/src/util/ axiom/test/om/ axiom/test/soap/ modules/core/deployment/ modules/core/engine/ modules/core/receivers/ modules/core/transport/http/se...
Date Fri, 16 Mar 2007 08:31:06 GMT
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header.c Fri Mar 16 01:30:59 2007
@@ -123,7 +123,7 @@
         AXIOM_NODE_DETACH(body_node, env);
     }
 
-    parent_ns = AXIOM_ELEMENT_GET_NAMESPACE(parent_ele, env, parent_node);
+    parent_ns = axiom_element_get_namespace(parent_ele, env, parent_node);
     this_ele = axiom_element_create(env, parent_node,
             AXIOM_SOAP_HEADER_LOCAL_NAME, parent_ns, &this_node);
     if (!this_ele)
@@ -235,7 +235,7 @@
             uri = axiom_namespace_get_uri(cloned_ns, env);
             prefix = axiom_namespace_get_prefix(cloned_ns, env);
 
-            dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(hb_ele, env, uri, prefix);
+            dec_ns = axiom_element_find_declared_namespace(hb_ele, env, uri, prefix);
             if (!dec_ns)
             {
                 /** this namespace it not in hb_ele list so free it */
@@ -279,7 +279,7 @@
 
     if (om_ele)
     {
-        return AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(om_ele,
+        return axiom_element_get_children_with_qname(om_ele,
                 env, NULL, soap_header->om_ele_node);
     }
     else
@@ -327,7 +327,7 @@
 
     if (header_om_ele)
     {
-        first_ele = AXIOM_ELEMENT_GET_FIRST_ELEMENT(header_om_ele, env,
+        first_ele = axiom_element_get_first_element(header_om_ele, env,
                 soap_header->om_ele_node, &first_node);
         if (first_node)
         {
@@ -482,7 +482,7 @@
                         AXIOM_NODE_GET_DATA_ELEMENT(header_block_om_node, env);
                 if (header_block_om_ele)
                 {
-                    ns = AXIOM_ELEMENT_GET_NAMESPACE(header_block_om_ele, env,
+                    ns = axiom_element_get_namespace(header_block_om_ele, env,
                             header_block_om_node);
                     if (ns)
                     {
@@ -561,7 +561,7 @@
                 axis2_qname_t *element_qname = NULL;
 
                 ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
-                element_qname = AXIOM_ELEMENT_GET_QNAME(ele, env, node);
+                element_qname = axiom_element_get_qname(ele, env, node);
                 if (axiom_soap_header_qname_matches(env, element_qname, qname) == AXIS2_TRUE)
                 {
                     AXIOM_NODE_DETACH(node, env);

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c Fri Mar 16 01:30:59 2007
@@ -299,7 +299,7 @@
         {
             return AXIS2_FAILURE;
         }
-        header_ns = AXIOM_ELEMENT_GET_NAMESPACE(header_ele, env, header_node);
+        header_ns = axiom_element_get_namespace(header_ele, env, header_node);
         if (!header_ns)
             return AXIS2_FAILURE;
         prefix = axiom_namespace_get_prefix(header_ns, env);
@@ -317,7 +317,7 @@
     om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
                 header_block->om_ele_node, env);
 
-    om_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(om_ele, env, qn);
+    om_attr = axiom_element_get_attribute(om_ele, env, qn);
 
     AXIS2_QNAME_FREE(qn, env);
     if (om_attr)
@@ -338,7 +338,7 @@
             return AXIS2_FAILURE;
         }
 
-        return AXIOM_ELEMENT_ADD_ATTRIBUTE(om_ele, env, om_attr,
+        return axiom_element_add_attribute(om_ele, env, om_attr,
                 header_block->om_ele_node);
     }
     return AXIS2_SUCCESS;
@@ -375,7 +375,7 @@
         {
             return NULL;
         }
-        header_ns = AXIOM_ELEMENT_GET_NAMESPACE(header_ele, env, header_node);
+        header_ns = axiom_element_get_namespace(header_ele, env, header_node);
         if (!header_ns)
             return NULL;
         prefix = axiom_namespace_get_prefix(header_ns, env);
@@ -385,7 +385,7 @@
         return NULL;
     om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
                 header_block->om_ele_node, env);
-    om_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(om_ele, env, qn);
+    om_attr = axiom_element_get_attribute(om_ele, env, qn);
     if (om_attr)
         attr_value = axiom_attribute_get_value(om_attr, env);
     AXIS2_QNAME_FREE(qn, env);

Modified: webservices/axis2/trunk/c/axiom/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/om_util.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Fri Mar 16 01:30:59 2007
@@ -47,7 +47,7 @@
 
             child_ele = (axiom_element_t*)
                 AXIOM_NODE_GET_DATA_ELEMENT(child_node, env);
-            ns = AXIOM_ELEMENT_GET_NAMESPACE(child_ele, env, child_node);
+            ns = axiom_element_get_namespace(child_ele, env, child_node);
             if (ns)
             {
                 axis2_char_t *child_uri = NULL;
@@ -88,7 +88,7 @@
 
             sib_ele = (axiom_element_t*)
                 AXIOM_NODE_GET_DATA_ELEMENT(next_sib_node, env);
-            ns = AXIOM_ELEMENT_GET_NAMESPACE(sib_ele, env, next_sib_node);
+            ns = axiom_element_get_namespace(sib_ele, env, next_sib_node);
             if (ns)
             {
                 axis2_char_t *sib_uri = NULL;
@@ -114,7 +114,7 @@
     AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
     AXIS2_PARAM_CHECK(env->error, child_node, NULL);
 
-    return AXIOM_ELEMENT_GET_FIRST_ELEMENT(ele, env, ele_node, child_node);
+    return axiom_element_get_first_element(ele, env, ele_node, child_node);
 }
 
 AXIS2_EXTERN axiom_element_t *AXIS2_CALL
@@ -189,7 +189,7 @@
                 AXIOM_NODE_GET_DATA_ELEMENT(child, env);
             if (om_ele)
             {
-                child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                child_localname = axiom_element_get_localname(om_ele, env);
                 if (child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
                 {
                     *child_node = child;
@@ -210,7 +210,7 @@
                 AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
             if (om_ele)
             {
-                child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                child_localname = axiom_element_get_localname(om_ele, env);
                 if (child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
                 {
                     *child_node = next_sibling;
@@ -251,7 +251,7 @@
                 AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
             if (om_ele)
             {
-                child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                child_localname = axiom_element_get_localname(om_ele, env);
                 if (child_localname &&
                     AXIS2_STRCMP(child_localname, localname) == 0)
                 {
@@ -290,7 +290,7 @@
                 AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
             if (om_ele)
             {
-                ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                ele_localname = axiom_element_get_localname(om_ele, env);
                 if (ele_localname && AXIS2_STRCMP(localname, ele_localname) == 0)
                 {
                     *next_node = next_sibling;
@@ -336,8 +336,8 @@
         om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(child , env);
         if (om_ele)
         {
-            child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
-            ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, child);
+            child_localname = axiom_element_get_localname(om_ele, env);
+            ns = axiom_element_get_namespace(om_ele, env, child);
             if (ns)
             {
                 ns_uri = axiom_namespace_get_uri(ns, env);
@@ -365,8 +365,8 @@
             om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
             if (om_ele)
             {
-                child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
-                ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, next_sibling);
+                child_localname = axiom_element_get_localname(om_ele, env);
+                ns = axiom_element_get_namespace(om_ele, env, next_sibling);
                 if (ns)
                 {
                     ns_uri = axiom_namespace_get_uri(ns, env);
@@ -417,12 +417,12 @@
             om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
             if (om_ele)
             {
-                ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, ele_node);
+                ns = axiom_element_get_namespace(om_ele, env, ele_node);
                 if (ns)
                 {
                     ns_uri = axiom_namespace_get_uri(ns, env);
                 }
-                child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                child_localname = axiom_element_get_localname(om_ele, env);
                 if (child_localname &&
                     (AXIS2_STRCMP(child_localname, localname) == 0) && (ns_uri)
                     && (AXIS2_STRCMP(ns_uri, uri) == 0))
@@ -465,12 +465,12 @@
                 AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
             if (om_ele)
             {
-                ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, next_sibling);
+                ns = axiom_element_get_namespace(om_ele, env, next_sibling);
                 if (ns)
                 {
                     ns_uri = axiom_namespace_get_uri(ns, env);
                 }
-                ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                ele_localname = axiom_element_get_localname(om_ele, env);
                 if (ele_localname &&
                     (AXIS2_STRCMP(localname, ele_localname) == 0) && (ns)
                     && (AXIS2_STRCMP(ns_uri, uri) == 0))
@@ -516,7 +516,7 @@
             if (om_ele)
             {
                 size = axis2_array_list_size(names, env);
-                child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                child_localname = axiom_element_get_localname(om_ele, env);
 
                 for (i = 0; i < size; i++)
                 {
@@ -547,7 +547,7 @@
             if (om_ele)
             {
                 size = axis2_array_list_size(names, env);
-                child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                child_localname = axiom_element_get_localname(om_ele, env);
                 for (i = 0; i < size; i++)
                 {
                     given_localname = (axis2_char_t *)axis2_array_list_get(names, env, i);
@@ -602,7 +602,7 @@
                 for (i = 0; i < size; i++)
                 {
                     given_localname = (axis2_char_t *)axis2_array_list_get(names, env, i);
-                    child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                    child_localname = axiom_element_get_localname(om_ele, env);
                     if (child_localname && (NULL != given_localname) &&
                         (AXIS2_STRCMP(child_localname, given_localname) == 0))
                     {
@@ -651,7 +651,7 @@
                 for (i = 0; i < size; i++)
                 {
                     given_localname = (axis2_char_t *)axis2_array_list_get(names, env, i);
-                    ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                    ele_localname = axiom_element_get_localname(om_ele, env);
                     if ((ele_localname) && (NULL != given_localname) &&
                         (AXIS2_STRCMP(given_localname, ele_localname) == 0))
                     {
@@ -704,10 +704,10 @@
             if (om_ele)
             {
 
-                child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                child_localname = axiom_element_get_localname(om_ele, env);
                 if (child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
                 {
-                    attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
+                    attr_ht = axiom_element_get_all_attributes(om_ele, env);
                     if (attr_ht)
                     {
                         for (hi = axis2_hash_first(attr_ht, env);  hi;
@@ -753,10 +753,10 @@
             om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
             if (om_ele)
             {
-                child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                child_localname = axiom_element_get_localname(om_ele, env);
                 if (child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
                 {
-                    attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
+                    attr_ht = axiom_element_get_all_attributes(om_ele, env);
                     if (attr_ht)
                     {
 
@@ -829,11 +829,11 @@
             om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
             if (om_ele)
             {
-                child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                child_localname = axiom_element_get_localname(om_ele, env);
                 if (child_localname &&
                     AXIS2_STRCMP(child_localname, localname) == 0)
                 {
-                    attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
+                    attr_ht = axiom_element_get_all_attributes(om_ele, env);
                     if (attr_ht)
                     {
                         for (hi = axis2_hash_first(attr_ht, env);  hi;
@@ -905,10 +905,10 @@
                 AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
             if (om_ele)
             {
-                ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+                ele_localname = axiom_element_get_localname(om_ele, env);
                 if (ele_localname && AXIS2_STRCMP(localname, ele_localname) == 0)
                 {
-                    attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
+                    attr_ht = axiom_element_get_all_attributes(om_ele, env);
                     if (attr_ht)
                     {
                         for (hi = axis2_hash_first(attr_ht, env);  hi;
@@ -967,7 +967,7 @@
 
     if (om_ele)
     {
-        return AXIOM_ELEMENT_GET_TEXT(om_ele, env, om_node);
+        return axiom_element_get_text(om_ele, env, om_node);
     }
     return NULL;
 }
@@ -990,7 +990,7 @@
     om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
     if (om_ele)
     {
-        return AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+        return axiom_element_get_localname(om_ele, env);
     }
     return NULL;
 }
@@ -1012,7 +1012,7 @@
         {
             return NULL;
         }
-        om_ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, om_node);
+        om_ns = axiom_element_get_namespace(om_ele, env, om_node);
         if (om_ns)
         {
             return axiom_namespace_get_uri(om_ns, env);
@@ -1031,7 +1031,7 @@
     AXIS2_PARAM_CHECK(env->error, om_node, NULL);
     AXIS2_PARAM_CHECK(env->error, om_ele, NULL);
     first_ele =
-        AXIOM_ELEMENT_GET_FIRST_ELEMENT(om_ele, env, om_node, &first_node);
+        axiom_element_get_first_element(om_ele, env, om_node, &first_node);
     if (first_ele)
     {
         return axiom_child_element_iterator_create(env, first_node);

Modified: webservices/axis2/trunk/c/axiom/test/om/test_om.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/test_om.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Fri Mar 16 01:30:59 2007
@@ -121,9 +121,9 @@
         ele1 = AXIOM_NODE_GET_DATA_ELEMENT(node1, environment);
         if (ele1)
 
-            printf("root localname %s\n", AXIOM_ELEMENT_GET_LOCALNAME(ele1, environment));
+            printf("root localname %s\n", axiom_element_get_localname(ele1, environment));
 
-        ns = AXIOM_ELEMENT_GET_NAMESPACE(ele1, environment, node1);
+        ns = axiom_element_get_namespace(ele1, environment, node1);
 
         if (ns)
         {
@@ -146,9 +146,9 @@
         {
             case AXIOM_ELEMENT:
                 ele2 = (axiom_element_t*) AXIOM_NODE_GET_DATA_ELEMENT(node2, environment);
-                if (ele2 && AXIOM_ELEMENT_GET_LOCALNAME(ele2, environment))
+                if (ele2 && axiom_element_get_localname(ele2, environment))
                 {
-                    printf("\n localname %s\n" , AXIOM_ELEMENT_GET_LOCALNAME(ele2, environment));
+                    printf("\n localname %s\n" , axiom_element_get_localname(ele2, environment));
                 }
 
                 break;
@@ -233,12 +233,12 @@
         axiom_namespace_create(environment, "urn:ISBN:0-395-74341-6",
                 "isbn");
     ele1 = axiom_element_create(environment, NULL, "book", ns1, &node1);
-    AXIOM_ELEMENT_DECLARE_NAMESPACE(ele1, environment, node1, ns2);
+    axiom_element_declare_namespace(ele1, environment, node1, ns2);
 
     ele2 = axiom_element_create(environment, node1, "title", ns1, &node2);
     attr1 = axiom_attribute_create(environment, "title22", NULL, NULL);
 
-    AXIOM_ELEMENT_ADD_ATTRIBUTE(ele2, environment, attr1, node2);
+    axiom_element_add_attribute(ele2, environment, attr1, node2);
 
     text1 = axiom_text_create(environment, node2, "Axis2/C OM HOWTO", &node3);
 
@@ -250,11 +250,11 @@
 
     attr1 = axiom_attribute_create(environment, "title", "Mr", ns1);
 
-    AXIOM_ELEMENT_ADD_ATTRIBUTE(ele4, environment, attr1, node6);
+    axiom_element_add_attribute(ele4, environment, attr1, node6);
 
     attr2 = axiom_attribute_create(environment, "name", "Axitoc Oman", ns1);
 
-    AXIOM_ELEMENT_ADD_ATTRIBUTE(ele4, environment, attr2, node6);
+    axiom_element_add_attribute(ele4, environment, attr2, node6);
 
     data_source = axiom_data_source_create(environment, node1, &node6);
     stream = axiom_data_source_get_stream(data_source, environment);

Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Fri Mar 16 01:30:59 2007
@@ -86,10 +86,10 @@
         if (!om_ele)
             return AXIS2_FAILURE;
 
-        localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
+        localname = axiom_element_get_localname(om_ele, env);
         if (localname)
             printf("\n %s \n", localname);
-        om_ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, om_node);
+        om_ns = axiom_element_get_namespace(om_ele, env, om_node);
 
         if (om_ns)
         {
@@ -304,7 +304,7 @@
 
     hb_ele = AXIOM_NODE_GET_DATA_ELEMENT(hb_node, env);
 
-    AXIOM_ELEMENT_SET_NAMESPACE(hb_ele, env, test_ns, hb_node);
+    axiom_element_set_namespace(hb_ele, env, test_ns, hb_node);
 
     soap_body = axiom_soap_body_create_with_parent(env, soap_envelope);
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Fri Mar 16 01:30:59 2007
@@ -173,7 +173,7 @@
         svcs_element = AXIOM_NODE_GET_DATA_ELEMENT(svcs, env);
         if (svcs_element)
         {
-            root_element_name = AXIOM_ELEMENT_GET_LOCALNAME(svcs_element, env);
+            root_element_name = axiom_element_get_localname(svcs_element, env);
         }
     }
     

Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Fri Mar 16 01:30:59 2007
@@ -170,7 +170,7 @@
     /* processing Paramters */
     /* Processing service level paramters */
     qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
-    itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env, qparamst,
+    itr = axiom_element_get_children_with_qname(conf_element, env, qparamst,
             conf_node);
     AXIS2_QNAME_FREE(qparamst, env);
     AXIS2_DESC_BUILDER_PROCESS_PARAMS(conf_builder->desc_builder, env, itr,
@@ -178,7 +178,7 @@
             axis2_conf_get_param_container(conf_builder->conf, env));
     /* process Message Reciver */
     qmsgrecv = axis2_qname_create(env, AXIS2_MESSAGERECEIVER, NULL, NULL);
-    msg_recvs = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
+    msg_recvs = axiom_element_get_children_with_qname(conf_element, env,
             qmsgrecv, conf_node);
     AXIS2_QNAME_FREE(qmsgrecv, env);
     while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(msg_recvs, env))
@@ -201,7 +201,7 @@
             return AXIS2_FAILURE;
         }
         qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
-        mep_att = AXIOM_ELEMENT_GET_ATTRIBUTE(msg_recv_element, env, qmep);
+        mep_att = axiom_element_get_attribute(msg_recv_element, env, qmep);
         att_value = axiom_attribute_get_value(mep_att, env);
         AXIS2_CONF_ADD_MSG_RECV(conf_builder->conf, env, att_value, msg_recv);
         AXIS2_QNAME_FREE(qmep, env);
@@ -209,7 +209,7 @@
 
     /* processing Dispatching Order */
     qdisporder = axis2_qname_create(env, AXIS2_DISPATCH_ORDER, NULL, NULL);
-    disp_order_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+    disp_order_element = axiom_element_get_first_child_with_qname(
                 conf_element, env, qdisporder, conf_node, &disp_order_node);
     AXIS2_QNAME_FREE(qdisporder, env);
     if (disp_order_element)
@@ -231,7 +231,7 @@
 
     /* Process Module refs */
     qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
-    module_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
+    module_itr = axiom_element_get_children_with_qname(conf_element, env,
             qmodulest, conf_node);
     AXIS2_QNAME_FREE(qmodulest, env);
     status = axis2_conf_builder_process_module_refs(conf_builder, env, module_itr);
@@ -241,21 +241,21 @@
     }
     /* Proccessing Transport Sennders */
     qtransportsender = axis2_qname_create(env, AXIS2_TRANSPORTSENDER, NULL, NULL);
-    trs_senders = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
+    trs_senders = axiom_element_get_children_with_qname(conf_element, env,
             qtransportsender, conf_node);
     AXIS2_QNAME_FREE(qtransportsender, env);
     axis2_conf_builder_process_transport_senders(conf_builder, env, trs_senders);
 
     /* Proccessing Transport Recivers */
     qtransportrecv = axis2_qname_create(env, AXIS2_TRANSPORTRECEIVER, NULL, NULL);
-    trs_recvs = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
+    trs_recvs = axiom_element_get_children_with_qname(conf_element, env,
             qtransportrecv, conf_node);
     AXIS2_QNAME_FREE(qtransportrecv, env);
     axis2_conf_builder_process_transport_recvs(conf_builder, env, trs_recvs);
 
     /* processing Phase orders */
     qphaseorder = axis2_qname_create(env, AXIS2_PHASE_ORDER, NULL, NULL);
-    phase_orders = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
+    phase_orders = axiom_element_get_children_with_qname(conf_element, env,
             qphaseorder, conf_node);
     AXIS2_QNAME_FREE(qphaseorder, env);
     axis2_conf_builder_process_phase_orders(conf_builder, env, phase_orders);
@@ -263,7 +263,7 @@
     /* Processing default module versions */
     qdefmodver = axis2_qname_create(env, AXIS2_DEFAULT_MODULE_VERSION, NULL,
             NULL);
-    def_mod_versions = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element,
+    def_mod_versions = axiom_element_get_children_with_qname(conf_element,
             env, qdefmodver, conf_node);
     AXIS2_QNAME_FREE(qdefmodver, env);
     if (def_mod_versions)
@@ -321,7 +321,7 @@
         }
         module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node, env);
         qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
-        module_ref_att = AXIOM_ELEMENT_GET_ATTRIBUTE(module_ref_element, env,
+        module_ref_att = axiom_element_get_attribute(module_ref_element, env,
                 qref);
         if (qref)
             AXIS2_QNAME_FREE(qref, env);
@@ -364,7 +364,7 @@
     disp_order_element = AXIOM_NODE_GET_DATA_ELEMENT(
                 disp_order_node, env);
     qdisp = axis2_qname_create(env, AXIS2_DISPATCHER, NULL, NULL);
-    disps = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(
+    disps = axiom_element_get_children_with_qname(
                 disp_order_element, env, qdisp, disp_order_node);
     AXIS2_QNAME_FREE(qdisp, env);
     disp_phase = axis2_phase_create(env, AXIS2_PHASE_DISPATCH);
@@ -395,7 +395,7 @@
         disp_node = (axiom_node_t *)
                 axiom_children_qname_iterator_next(disps, env);
         class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
-        disp_att = AXIOM_ELEMENT_GET_ATTRIBUTE(disp_element, env, class_qname);
+        disp_att = axiom_element_get_attribute(disp_element, env, class_qname);
         AXIS2_QNAME_FREE(class_qname, env);
         if (!disp_att)
         {
@@ -494,7 +494,7 @@
         {
             qtype = axis2_qname_create(env, AXIS2_TYPE, NULL, NULL);
 
-            phase_orders_att = AXIOM_ELEMENT_GET_ATTRIBUTE(phase_orders_element,
+            phase_orders_att = axiom_element_get_attribute(phase_orders_element,
                     env, qtype);
             AXIS2_QNAME_FREE(qtype, env);
         }
@@ -561,7 +561,7 @@
     }
     phase_list = axis2_array_list_create(env, 0);
     qphase = axis2_qname_create(env, AXIS2_PHASE, NULL, NULL);
-    phases = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(phase_orders_element, env,
+    phases = axiom_element_get_children_with_qname(phase_orders_element, env,
             qphase, phase_orders_node);
     AXIS2_QNAME_FREE(qphase, env);
     if (!phases)
@@ -589,7 +589,7 @@
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
         if (phase_element)
         {
-            phase_att = AXIOM_ELEMENT_GET_ATTRIBUTE(phase_element, env,
+            phase_att = axiom_element_get_attribute(phase_element, env,
                     qattname);
         }
         if (phase_att)
@@ -647,7 +647,7 @@
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
         if (transport_element)
         {
-            trs_name = AXIOM_ELEMENT_GET_ATTRIBUTE(transport_element, env,
+            trs_name = axiom_element_get_attribute(transport_element, env,
                     qattname);
         }
         AXIS2_QNAME_FREE(qattname, env);
@@ -708,7 +708,7 @@
 
             /* transport impl class */
             qdllname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
-            trs_dll_att = AXIOM_ELEMENT_GET_ATTRIBUTE(transport_element, env,
+            trs_dll_att = axiom_element_get_attribute(transport_element, env,
                     qdllname);
             AXIS2_QNAME_FREE(qdllname, env);
             if (NULL == trs_dll_att)
@@ -760,7 +760,7 @@
             /* Process Parameters */
             /* Processing service level paramters */
             qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
-            itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(transport_element,
+            itr = axiom_element_get_children_with_qname(transport_element,
                     env, qparamst, transport_node);
             AXIS2_QNAME_FREE(qparamst, env);
             status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(conf_builder->desc_builder, env,
@@ -774,7 +774,7 @@
             }
             /* process IN_FLOW */
             qinflowst = axis2_qname_create(env, AXIS2_IN_FLOW_START, NULL, NULL);
-            in_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+            in_flow_element = axiom_element_get_first_child_with_qname(
                         transport_element, env, qinflowst, transport_node, &in_flow_node);
             AXIS2_QNAME_FREE(qinflowst, env);
             if (in_flow_element)
@@ -785,7 +785,7 @@
                 return AXIS2_FAILURE;
             }
             qoutflowst = axis2_qname_create(env, AXIS2_OUT_FLOW_START, NULL, NULL);
-            out_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+            out_flow_element = axiom_element_get_first_child_with_qname(
                         transport_element, env, qoutflowst, transport_node, &out_flow_node);
             AXIS2_QNAME_FREE(qoutflowst, env);
             if (out_flow_element)
@@ -807,7 +807,7 @@
             /* process IN FAULT FLOW */
             qinfaultflowst = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL,
                     NULL);
-            in_fault_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+            in_fault_flow_element = axiom_element_get_first_child_with_qname(
                         transport_element, env, qinfaultflowst, transport_node,
                         &in_fault_flow_node);
             AXIS2_QNAME_FREE(qinfaultflowst, env);
@@ -821,7 +821,7 @@
 
             qoutfaultflowst = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL,
                     NULL);
-            out_fault_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+            out_fault_flow_element = axiom_element_get_first_child_with_qname(
                         transport_element, env, qoutfaultflowst, transport_node,
                         &out_fault_flow_node);
             AXIS2_QNAME_FREE(qoutfaultflowst, env);
@@ -894,7 +894,7 @@
 
         /* getting transport Name */
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-        trs_name = AXIOM_ELEMENT_GET_ATTRIBUTE(transport_element, env,
+        trs_name = axiom_element_get_attribute(transport_element, env,
                 qattname);
         AXIS2_QNAME_FREE(qattname, env);
 
@@ -945,7 +945,7 @@
 
             /* transport impl class */
             class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
-            trs_class_name = AXIOM_ELEMENT_GET_ATTRIBUTE(transport_element, env,
+            trs_class_name = axiom_element_get_attribute(transport_element, env,
                     class_qname);
             AXIS2_QNAME_FREE(class_qname, env);
 
@@ -1001,7 +1001,7 @@
             /* processing Paramters */
             /* Processing service level paramters */
             qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
-            itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(transport_element,
+            itr = axiom_element_get_children_with_qname(transport_element,
                     env, qparamst, transport_node);
             AXIS2_QNAME_FREE(qparamst, env);
             status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(conf_builder->desc_builder, env,
@@ -1015,7 +1015,7 @@
             }
             /* process OUT_FLOW */
             qoutflowst = axis2_qname_create(env, AXIS2_OUT_FLOW_START, NULL, NULL);
-            out_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+            out_flow_element = axiom_element_get_first_child_with_qname(
                         transport_element, env, qoutflowst, transport_node, &out_flow_node);
             AXIS2_QNAME_FREE(qoutflowst, env);
             if (out_flow_element)
@@ -1027,7 +1027,7 @@
             }
 
             qinflowst = axis2_qname_create(env, AXIS2_IN_FLOW_START, NULL, NULL);
-            in_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+            in_flow_element = axiom_element_get_first_child_with_qname(
                         transport_element, env, qinflowst, transport_node, &in_flow_node);
             AXIS2_QNAME_FREE(qinflowst, env);
             if (in_flow_element)
@@ -1049,7 +1049,7 @@
 
             qinfaultflowst = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL,
                     NULL);
-            in_fault_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+            in_fault_flow_element = axiom_element_get_first_child_with_qname(
                         transport_element, env, qinfaultflowst, transport_node,
                         &in_fault_flow_node);
             AXIS2_QNAME_FREE(qinfaultflowst, env);
@@ -1072,7 +1072,7 @@
 
             qoutfaultflowst = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL,
                     NULL);
-            out_fault_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
+            out_fault_flow_element = axiom_element_get_first_child_with_qname(
                         transport_element, env, qoutfaultflowst, transport_node,
                         &out_fault_flow_node);
             if (out_fault_flow_element)
@@ -1125,7 +1125,7 @@
         {
             continue;
         }
-        name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(om_element, env,
+        name = axiom_element_get_attribute_value(om_element, env,
                 attribute_qname);
         AXIS2_QNAME_FREE(attribute_qname, env);
         attribute_qname = NULL;
@@ -1139,7 +1139,7 @@
         {
             continue;
         }
-        default_version = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(om_element, env,
+        default_version = axiom_element_get_attribute_value(om_element, env,
                 attribute_qname);
         AXIS2_QNAME_FREE(attribute_qname, env);
         attribute_qname = NULL;

Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Fri Mar 16 01:30:59 2007
@@ -186,7 +186,7 @@
         document is the container of om model created using builder
     */
     document = axiom_stax_builder_get_document(desc_builder->builder, env);
-
+
     /**
      * In description building we don't want defferred building. So build
      * the whole tree at once
@@ -228,7 +228,7 @@
     }
 
     qchild = axis2_qname_create(env, AXIS2_HANDLERST, NULL, NULL);
-    handlers = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(flow_element, env,
+    handlers = axiom_element_get_children_with_qname(flow_element, env,
             qchild, flow_node);
     if (qchild)
         AXIS2_QNAME_FREE(qchild, env);
@@ -286,7 +286,7 @@
     /* Setting Handler name */
     attr_qname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
     handler_element = AXIOM_NODE_GET_DATA_ELEMENT(handler_node, env);
-    name_attrib = AXIOM_ELEMENT_GET_ATTRIBUTE(handler_element, env,
+    name_attrib = axiom_element_get_attribute(handler_element, env,
             attr_qname);
     if (attr_qname)
     {
@@ -320,7 +320,7 @@
 
     /*Setting Handler Class name */
     class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
-    class_attrib = AXIOM_ELEMENT_GET_ATTRIBUTE(handler_element, env,
+    class_attrib = axiom_element_get_attribute(handler_element, env,
             class_qname);
     if (class_qname)
         AXIS2_QNAME_FREE(class_qname, env);
@@ -346,7 +346,7 @@
     /*processing phase Rules (order) */
 
     order_qname = axis2_qname_create(env, AXIS2_ORDER, NULL, NULL);
-    order_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(handler_element,
+    order_element = axiom_element_get_first_child_with_qname(handler_element,
             env, order_qname, handler_node, &order_node);
     if (order_qname)
         AXIS2_QNAME_FREE(order_qname, env);
@@ -365,7 +365,7 @@
         axis2_qname_t *param_qname = NULL;
         axis2_hash_index_t *index_i = NULL;
 
-        order_itr = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(order_element, env);
+        order_itr = axiom_element_get_all_attributes(order_element, env);
         if (!order_itr)
         {
             axis2_handler_desc_free(handler_desc, env);
@@ -460,7 +460,7 @@
         }
 
         param_qname = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
-        params = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(handler_element,
+        params = axiom_element_get_children_with_qname(handler_element,
                 env, param_qname, handler_node);
         AXIS2_QNAME_FREE(param_qname, env);
         status = axis2_desc_builder_process_params(desc_builder, env, params,
@@ -499,7 +499,7 @@
     AXIS2_PARAM_CHECK(env->error, param_node, AXIS2_FAILURE);
 
     /* Setting attributes */
-    attrs = AXIOM_ELEMENT_EXTRACT_ATTRIBUTES(param_element, env, param_node);
+    attrs = axiom_element_extract_attributes(param_element, env, param_node);
     if (attrs)
     {
         axis2_hash_index_t *i = NULL;
@@ -538,7 +538,7 @@
         AXIS2_PARAM_SET_ATTRIBUTES(param, env, attrs);
     }
 
-    childs = AXIOM_ELEMENT_GET_CHILD_ELEMENTS(param_element, env, param_node);
+    childs = axiom_element_get_child_elements(param_element, env, param_node);
     if (childs)
     {
         axis2_array_list_t *value_list = NULL;
@@ -556,7 +556,7 @@
             node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(childs, env);
             element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
             param = axis2_param_create(env, NULL, NULL);
-            pname = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
+            pname = axiom_element_get_localname(element, env);
             status = AXIS2_PARAM_SET_NAME(param, env, pname);
             if (AXIS2_SUCCESS != status)
             {
@@ -573,7 +573,7 @@
         axis2_char_t *para_test_value = NULL;
         axis2_char_t *temp = NULL;
 
-        temp = AXIOM_ELEMENT_GET_TEXT(
+        temp = axiom_element_get_text(
                     param_element, env, param_node);
         para_test_value = AXIS2_STRDUP(temp, env);
         status = AXIS2_PARAM_SET_VALUE(param, env, para_test_value);
@@ -614,7 +614,7 @@
     op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
     qname = axis2_qname_create(env, AXIS2_ACTION_MAPPING, NULL, NULL);
     if(op_element)
-        action_mappings = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(op_element, env, 
+        action_mappings = axiom_element_get_children_with_qname(op_element, env, 
             qname,op_node);
             
     AXIS2_QNAME_FREE(qname, env);
@@ -641,7 +641,7 @@
         mapping_node = (axiom_node_t *)
                 axiom_children_qname_iterator_next(action_mappings, env);
         mapping_element = AXIOM_NODE_GET_DATA_ELEMENT(mapping_node, env);
-        temp_str = AXIOM_ELEMENT_GET_TEXT(mapping_element, env, 
+        temp_str = axiom_element_get_text(mapping_element, env, 
             mapping_node);
         input_action_string = AXIS2_STRTRIM(env, temp_str, NULL);
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Input action mapping found %s", 
@@ -656,9 +656,9 @@
     }
     axis2_op_set_wsamapping_list(op_desc, env, mapping_list); 
     /*qname = axis2_qname_create(env, AXIS2_OUTPUT_ACTION_MAPPING, NULL, NULL);
-    child_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(mapping_element, 
+    child_element = axiom_element_get_first_child_with_qname(mapping_element, 
         env, qname, mapping_node, &child_node);
-    temp_str = AXIOM_ELEMENT_GET_TEXT(child_element, env, child_node);
+    temp_str = axiom_element_get_text(child_element, env, child_node);
     output_action_string = AXIS2_STRTRIM(env, temp_str, NULL);
     if(child_element && output_action_string)
     {
@@ -717,7 +717,7 @@
 
         /* Setting paramter name */
         att_qname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-        para_name = AXIOM_ELEMENT_GET_ATTRIBUTE(param_element, env,
+        para_name = axiom_element_get_attribute(param_element, env,
                 att_qname);
         AXIS2_QNAME_FREE(att_qname, env);
         if (!para_name)
@@ -738,7 +738,7 @@
 
         /* Setting locking attrib */
         att_locked = axis2_qname_create(env, AXIS2_ATTLOCKED, NULL, NULL);
-        para_locked = AXIOM_ELEMENT_GET_ATTRIBUTE(param_element, env,
+        para_locked = axiom_element_get_attribute(param_element, env,
                 att_locked);
         AXIS2_QNAME_FREE(att_locked, env);
         if (parent)
@@ -836,7 +836,7 @@
         moduleref = (axiom_element_t *)
                 axiom_children_qname_iterator_next(module_refs, env);
         qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
-        module_ref_attrib = AXIOM_ELEMENT_GET_ATTRIBUTE(moduleref, env, qref);
+        module_ref_attrib = axiom_element_get_attribute(moduleref, env, qref);
         AXIS2_QNAME_FREE(qref, env);
         if (module_ref_attrib)
         {
@@ -895,7 +895,7 @@
     AXIS2_PARAM_CHECK(env->error, recv_element, NULL);
 
     class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
-    recv_name = AXIOM_ELEMENT_GET_ATTRIBUTE(recv_element, env, class_qname);
+    recv_name = axiom_element_get_attribute(recv_element, env, class_qname);
     AXIS2_QNAME_FREE(class_qname, env);
     class_name = axiom_attribute_get_value(recv_name, env);
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Fri Mar 16 01:30:59 2007
@@ -144,7 +144,7 @@
     }
     /* Setting Module Name */
     /*qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-    module_name_att = AXIOM_ELEMENT_GET_ATTRIBUTE(module_element, env, 
+    module_name_att = axiom_element_get_attribute(module_element, env, 
         qattname);
     if(qattname)
         AXIS2_QNAME_FREE(qattname, env);
@@ -194,7 +194,7 @@
 
         module_qname = axis2_qname_create(env, module_name, NULL, NULL);
         axis2_module_desc_set_qname(module_builder->module_desc, env, module_qname);
-
+
         if (module_qname)
             AXIS2_QNAME_FREE(module_qname, env);
     }
@@ -202,7 +202,7 @@
     /* Setting Module Dll Name , if it is there */
 
     qdllname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
-    module_dll_att = AXIOM_ELEMENT_GET_ATTRIBUTE(module_element, env, qdllname);
+    module_dll_att = axiom_element_get_attribute(module_element, env, qdllname);
     if (qdllname)
         AXIS2_QNAME_FREE(qdllname, env);
 
@@ -233,13 +233,13 @@
     /* Processing service level paramters */
 
     qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
-    itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(module_element, env,
+    itr = axiom_element_get_children_with_qname(module_element, env,
             qparamst, module_node);
     if (qparamst)
         AXIS2_QNAME_FREE(qparamst, env);
 
     parent = axis2_module_desc_get_parent(module_builder->module_desc, env);
-
+
     if (parent)
         parent_container = axis2_conf_get_param_container(parent, env);
     AXIS2_DESC_BUILDER_PROCESS_PARAMS(module_builder->desc_builder, env,
@@ -248,7 +248,7 @@
 
     /* Process IN_FLOW */
     qinflowst = axis2_qname_create(env, AXIS2_IN_FLOW_START, NULL, NULL);
-    in_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(module_element,
+    in_flow_element = axiom_element_get_first_child_with_qname(module_element,
             env, qinflowst, module_node, &in_flow_node);
     if (qinflowst)
         AXIS2_QNAME_FREE(qinflowst, env);
@@ -262,7 +262,7 @@
                 axis2_module_desc_get_param_container(module_builder->module_desc, env),
                 in_flow_node);
         status = axis2_module_desc_set_in_flow(module_builder->module_desc, env, flow);
-
+
         if (AXIS2_SUCCESS != status)
         {
             if (flow)
@@ -272,7 +272,7 @@
     }
 
     qoutflowst = axis2_qname_create(env, AXIS2_OUT_FLOW_START, NULL, NULL);
-    out_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(module_element,
+    out_flow_element = axiom_element_get_first_child_with_qname(module_element,
             env, qoutflowst, module_node, &out_flow_node);
     if (qoutflowst)
         AXIS2_QNAME_FREE(qoutflowst, env);
@@ -286,7 +286,7 @@
                 axis2_module_desc_get_param_container(module_builder->module_desc, env),
                 out_flow_node);
         status = axis2_module_desc_set_out_flow(module_builder->module_desc, env, flow);
-
+
         if (AXIS2_SUCCESS != status)
         {
             axis2_flow_free(flow, env);
@@ -295,7 +295,7 @@
     }
 
     qinfaultflow = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL, NULL);
-    in_fault_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(module_element,
+    in_fault_flow_element = axiom_element_get_first_child_with_qname(module_element,
             env, qinfaultflow, module_node, &in_fault_flow_node);
     if (qinfaultflow)
         AXIS2_QNAME_FREE(qinfaultflow, env);
@@ -309,7 +309,7 @@
                 axis2_module_desc_get_param_container(module_builder->module_desc, env),
                 in_fault_flow_node);
         status = axis2_module_desc_set_fault_in_flow(module_builder->module_desc, env, flow);
-
+
         if (AXIS2_SUCCESS != status)
         {
             axis2_flow_free(flow, env);
@@ -318,7 +318,7 @@
     }
 
     qoutfaultflow = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL, NULL);
-    out_fault_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(module_element,
+    out_fault_flow_element = axiom_element_get_first_child_with_qname(module_element,
             env, qoutfaultflow, module_node, &out_fault_flow_node);
     if (qoutfaultflow)
         AXIS2_QNAME_FREE(qoutfaultflow, env);
@@ -342,7 +342,7 @@
 
     /* Processing Operations */
     qopst = axis2_qname_create(env, AXIS2_OPERATIONST, NULL, NULL);
-    op_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(module_element, env,
+    op_itr = axiom_element_get_children_with_qname(module_element, env,
             qopst, module_node);
     if (qopst)
         AXIS2_QNAME_FREE(qopst, env);
@@ -400,7 +400,7 @@
         op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
         /* getting operation name */
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-        op_name_att = AXIOM_ELEMENT_GET_ATTRIBUTE(op_element, env, qattname);
+        op_name_att = axiom_element_get_attribute(op_element, env, qattname);
         if (qattname)
             AXIS2_QNAME_FREE(qattname, env);
 
@@ -411,7 +411,7 @@
             return NULL;
         }
         qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
-        op_mep_att = AXIOM_ELEMENT_GET_ATTRIBUTE(op_element, env, qmep);
+        op_mep_att = axiom_element_get_attribute(op_element, env, qmep);
         if (qmep)
             AXIS2_QNAME_FREE(qmep, env);
 
@@ -440,7 +440,7 @@
 
         /* Operation parameters */
         qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
-        params = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(op_element, env,
+        params = axiom_element_get_children_with_qname(op_element, env,
                 qparamst, op_node);
         if (qparamst)
             AXIS2_QNAME_FREE(qparamst, env);
@@ -457,7 +457,7 @@
 
         /* loading the message receivers */
         qmsgrecv = axis2_qname_create(env, AXIS2_MESSAGERECEIVER, NULL, NULL);
-        recv_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(op_element,
+        recv_element = axiom_element_get_first_child_with_qname(op_element,
                 env, qmsgrecv, op_node, &recv_node);
         if (qmsgrecv)
             AXIS2_QNAME_FREE(qmsgrecv, env);
@@ -479,7 +479,7 @@
         }
         /* Process Module Refs */
         qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
-        modules = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(op_element, env,
+        modules = axiom_element_get_children_with_qname(op_element, env,
                 qmodulest, op_node);
         if (qmodulest)
             AXIS2_QNAME_FREE(qmodulest, env);

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Fri Mar 16 01:30:59 2007
@@ -193,7 +193,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
-    itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element, env, qparamst,
+    itr = axiom_element_get_children_with_qname(svc_element, env, qparamst,
             svc_node);
     AXIS2_QNAME_FREE(qparamst, env);
     qparamst = NULL;
@@ -215,7 +215,7 @@
      */
 	 /* -------------------------service description-------------------- */
     qdesc = axis2_qname_create(env, AXIS2_DESCRIPTION, NULL, NULL);
-    desc_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element, env,
+    desc_element = axiom_element_get_first_child_with_qname(svc_element, env,
         qdesc, svc_node, &desc_node);
     AXIS2_QNAME_FREE(qdesc, env) ;
     qdesc = NULL;
@@ -225,9 +225,9 @@
         axiom_node_t *desc_value_node = NULL;
         axis2_char_t *description_text = NULL;
 
-        desc_value_element = AXIOM_ELEMENT_GET_FIRST_ELEMENT(desc_element, 
+        desc_value_element = axiom_element_get_first_element(desc_element, 
             env, desc_node, &desc_value_node);
-		  description_text = AXIOM_ELEMENT_GET_TEXT (desc_element, env, desc_node);
+		  description_text = axiom_element_get_text (desc_element, env, desc_node);
 		  if (description_text)
 			 {
 				  AXIS2_SVC_SET_SVC_DESC (svc_builder->svc, env, description_text);
@@ -236,7 +236,7 @@
 	 /* --------------------services description end -------------------- */
     /* my logic to get set service name */
     qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-    name_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(svc_element, env, qattname);
+    name_attr = axiom_element_get_attribute(svc_element, env, qattname);
     svc_name = axiom_attribute_get_value(name_attr, env);
     AXIS2_SVC_SET_NAME(svc_builder->svc, env, svc_name);
     AXIS2_QNAME_FREE(qattname, env);
@@ -289,7 +289,7 @@
     /* end of my logic */
     /* processing service wide modules which required to engage globally */
     qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
-    module_refs = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element, env,
+    module_refs = axiom_element_get_children_with_qname(svc_element, env,
             qmodulest, svc_node);
     AXIS2_QNAME_FREE(qmodulest, env) ;
     qmodulest = NULL;
@@ -301,7 +301,7 @@
 
     /* process IN_FLOW */
     qinflowst = axis2_qname_create(env, AXIS2_IN_FLOW_START, NULL, NULL);
-    in_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element,
+    in_flow_element = axiom_element_get_first_child_with_qname(svc_element,
             env, qinflowst, svc_node, &in_flow_node);
     AXIS2_QNAME_FREE(qinflowst, env) ;
     qinflowst = NULL;
@@ -320,7 +320,7 @@
     }*/
 
     qoutflowst = axis2_qname_create(env, AXIS2_OUT_FLOW_START, NULL, NULL);
-    out_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element,
+    out_flow_element = axiom_element_get_first_child_with_qname(svc_element,
             env, qoutflowst, svc_node, &out_flow_node);
     AXIS2_QNAME_FREE(qoutflowst, env) ;
     qoutflowst = NULL;
@@ -339,7 +339,7 @@
     }*/
 
     qin_faultflowst = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL, NULL);
-    in_faultflow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element,
+    in_faultflow_element = axiom_element_get_first_child_with_qname(svc_element,
             env, qin_faultflowst, svc_node, &in_faultflow_node);
     AXIS2_QNAME_FREE(qin_faultflowst, env) ;
     qin_faultflowst = NULL;
@@ -360,7 +360,7 @@
     }*/
 
     qout_faultflowst = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL, NULL);
-    out_faultflow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element,
+    out_faultflow_element = axiom_element_get_first_child_with_qname(svc_element,
             env, qoutflowst, svc_node, &out_faultflow_node);
     AXIS2_QNAME_FREE(qout_faultflowst, env) ;
     qout_faultflowst = NULL;
@@ -382,7 +382,7 @@
 
     /* processing operations */
     qopst = axis2_qname_create(env, AXIS2_OPERATIONST, NULL, NULL);
-    operation_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element, env,
+    operation_itr = axiom_element_get_children_with_qname(svc_element, env,
             qopst, svc_node);
     AXIS2_QNAME_FREE(qopst, env) ;
     qopst = NULL;
@@ -422,7 +422,7 @@
     axis2_array_list_free(ops, env);
     /*
     qmodule_config = axis2_qname_create(env, AXIS2_MODULECONFIG, NULL, NULL);
-    module_configs_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element,
+    module_configs_itr = axiom_element_get_children_with_qname(svc_element,
         env, qmodule_config, svc_node);
     AXIS2_QNAME_FREE(qmodule_config, env) ;
     status = axis2_svc_builder_process_svc_module_conf(svc_builder, env, 
@@ -469,7 +469,7 @@
         /* getting operation name */
         op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-        op_name_att = AXIOM_ELEMENT_GET_ATTRIBUTE(op_element, env, qattname);
+        op_name_att = axiom_element_get_attribute(op_element, env, qattname);
         AXIS2_QNAME_FREE(qattname, env);
         qattname = NULL;
         if (NULL == op_name_att)
@@ -480,7 +480,7 @@
         }
         /* set the mep of the operation */
         qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
-        op_mep_att = AXIOM_ELEMENT_GET_ATTRIBUTE(op_element, env, qmep);
+        op_mep_att = axiom_element_get_attribute(op_element, env, qmep);
         AXIS2_QNAME_FREE(qmep, env);
         qmep = NULL;
         if (op_mep_att)
@@ -533,7 +533,7 @@
         qopname = NULL;
         /* operation parameters */
         qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
-        params_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(op_element, env,
+        params_itr = axiom_element_get_children_with_qname(op_element, env,
                 qparamst, op_node);
         AXIS2_QNAME_FREE(qparamst, env);
         qparamst = NULL;
@@ -547,7 +547,7 @@
 
         /* loading the message receivers */
         qmsgrecv = axis2_qname_create(env, AXIS2_MESSAGERECEIVER, NULL, NULL);
-        recv_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(op_element,
+        recv_element = axiom_element_get_first_child_with_qname(op_element,
                 env, qmsgrecv, op_node, &recv_node);
         AXIS2_QNAME_FREE(qmsgrecv, env);
         qmsgrecv = NULL;
@@ -568,7 +568,7 @@
         }
         /* process module refs */
         qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
-        module_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(op_element, env,
+        module_itr = axiom_element_get_children_with_qname(op_element, env,
                 qmodulest, op_node);
         AXIS2_QNAME_FREE(qmodulest, env);
         qmodulest = NULL;
@@ -615,7 +615,7 @@
         module_conf_element = AXIOM_NODE_GET_DATA_ELEMENT(module_conf_node,
                 env);
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-        module_name_att = AXIOM_ELEMENT_GET_ATTRIBUTE(module_conf_element,
+        module_name_att = axiom_element_get_attribute(module_conf_element,
                 env, qattname);
         AXIS2_QNAME_FREE(qattname, env);
         qattname = NULL;
@@ -651,7 +651,7 @@
         module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node,
                 env);
         qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
-        module_ref_att = AXIOM_ELEMENT_GET_ATTRIBUTE(module_ref_element,
+        module_ref_att = axiom_element_get_attribute(module_ref_element,
                 env, qref);
         AXIS2_QNAME_FREE(qref, env);
         if (module_ref_att)

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Fri Mar 16 01:30:59 2007
@@ -114,7 +114,7 @@
     svc_grp_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_grp_builder->svc_grp, env);
     qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
 
-    itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_grp_element, env, qparamst,
+    itr = axiom_element_get_children_with_qname(svc_grp_element, env, qparamst,
             svc_grp_builder->svc_grp);
     
     if (qparamst)
@@ -130,7 +130,7 @@
 
     /* Processing service modules required to be engaged globally */
     qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
-    module_ref_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_grp_element, env,
+    module_ref_itr = axiom_element_get_children_with_qname(svc_grp_element, env,
             qmodulest, svc_grp_builder->svc_grp);
 
     if (qmodulest)
@@ -142,7 +142,7 @@
     axis2_svc_grp_builder_process_module_refs(svc_grp_builder, env, module_ref_itr,
             svc_grp);
     qsvc_element = axis2_qname_create(env, AXIS2_SVC_ELEMENT, NULL, NULL);
-    svc_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_grp_element, env,
+    svc_itr = axiom_element_get_children_with_qname(svc_grp_element, env,
             qsvc_element, svc_grp_builder->svc_grp);
 
     if (qsvc_element)
@@ -163,7 +163,7 @@
                     svc_itr, env);
         svc_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_node, env);
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-        svc_name_att = AXIOM_ELEMENT_GET_ATTRIBUTE(svc_element, env, qattname);
+        svc_name_att = axiom_element_get_attribute(svc_element, env, qattname);
 
         if (qattname)
         {
@@ -238,7 +238,7 @@
                     module_refs, env);
         module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node, env);
         qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
-        module_ref_att = AXIOM_ELEMENT_GET_ATTRIBUTE(module_ref_element, env,
+        module_ref_att = axiom_element_get_attribute(module_ref_element, env,
                 qref);
         if (module_ref_att)
         {

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=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Fri Mar 16 01:30:59 2007
@@ -112,7 +112,7 @@
                         if (element)
                         {
                             axiom_namespace_t *ns =
-                                AXIOM_ELEMENT_GET_NAMESPACE(element, env, body_first_child_node);
+                                axiom_element_get_namespace(element, env, body_first_child_node);
                             if (ns)
                             {
                                 axis2_char_t *uri = axiom_namespace_get_uri(ns, env);
@@ -196,7 +196,7 @@
                         element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(body_first_child_node, env);
                         if (element)
                         {
-                            axis2_char_t *element_name = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
+                            axis2_char_t *element_name = axiom_element_get_localname(element, env);
                             if (element_name)
                             {
                                 AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,

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=518887&r1=518886&r2=518887
==============================================================================
--- 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 Fri Mar 16 01:30:59 2007
@@ -145,7 +145,7 @@
             op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
             if (op_element)
             {
-                local_name = AXIOM_ELEMENT_GET_LOCALNAME(op_element, env);
+                local_name = axiom_element_get_localname(op_element, env);
                 if (local_name)
                 {
                     axis2_array_list_t *function_arr = 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=518887&r1=518886&r2=518887
==============================================================================
--- 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 Fri Mar 16 01:30:59 2007
@@ -1138,7 +1138,7 @@
 
 	data_element = AXIOM_NODE_GET_DATA_ELEMENT(data_node, env);
 
-	iterator = AXIOM_ELEMENT_GET_CHILD_ELEMENTS(data_element, env, data_node);
+	iterator = axiom_element_get_child_elements(data_element, env, data_node);
 
 	if(iterator){
 		while (AXIS2_TRUE == AXIOM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(iterator, env))
@@ -1151,8 +1151,8 @@
 	 
 			node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(iterator, env);
 			element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
-			name = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
-			value = AXIOM_ELEMENT_GET_TEXT(element, env, node);
+			name = axiom_element_get_localname(element, env);
+			value = axiom_element_get_text(element, env, node);
 			if(value){
 				encoded_value = (axis2_char_t *) AXIS2_MALLOC (env->allocator, strlen (value));
 				memset (encoded_value, 0, strlen (value));

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=518887&r1=518886&r2=518887
==============================================================================
--- 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 Fri Mar 16 01:30:59 2007
@@ -1347,7 +1347,7 @@
                 axis2_hash_this(hi, (const void **)&name, NULL, (void **)&value);
                 element = axiom_element_create(env, NULL, (axis2_char_t *)name,
                         NULL, &node);
-                AXIOM_ELEMENT_SET_TEXT(element, env, (axis2_char_t *)value, node);
+                axiom_element_set_text(element, env, (axis2_char_t *)value, node);
                 AXIOM_NODE_ADD_CHILD(body_child_node, env, node);
             }
         }
@@ -1413,7 +1413,7 @@
                         }
                         om_element = axiom_element_create(env, body_child_node,
                                 element_name, NULL, &om_node);
-                        AXIOM_ELEMENT_SET_TEXT(om_element, env, param_val,
+                        axiom_element_set_text(om_element, env, param_val,
                                 om_node);
                     }
                 }
@@ -1474,7 +1474,7 @@
             axis2_hash_this(hi, (const void **)&name, NULL, (void **)&value);
             element = axiom_element_create(env, NULL, (axis2_char_t *)name,
                     NULL, &node);
-            AXIOM_ELEMENT_SET_TEXT(element, env, (axis2_char_t *)value, node);
+            axiom_element_set_text(element, env, (axis2_char_t *)value, node);
             AXIOM_NODE_ADD_CHILD(body_child_node, env, node);
         }
     }

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=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Fri Mar 16 01:30:59 2007
@@ -214,11 +214,11 @@
         {
             axiom_node_t *child_node = NULL;
             axiom_element_t *child_element = NULL;
-            child_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(element, env, qname, node, &child_node);
+            child_element = axiom_element_get_first_child_with_qname(element, env, qname, node, &child_node);
             if (child_element)
             {
                 axis2_conf_ctx_t * conf_ctx = NULL;
-                axis2_char_t *grp_id = AXIOM_ELEMENT_GET_TEXT(child_element, env,
+                axis2_char_t *grp_id = axiom_element_get_text(child_element, env,
                         child_node);
                 conf_ctx =  axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
                 if (conf_ctx && grp_id)
@@ -324,7 +324,7 @@
         header_block = (axiom_soap_header_block_t *)hb;
         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);
+        ele_localname = axiom_element_get_localname(header_block_ele, env);
 
         role = AXIOM_SOAP_HEADER_BLOCK_GET_ROLE(header_block, env);
         if (role && AXIS2_STRCMP(role, AXIOM_SOAP12_SOAP_ROLE_NONE) == 0)
@@ -337,7 +337,7 @@
         {
             /* here the addressing epr overidde what ever already there in the message context */
 
-            epr = axis2_endpoint_ref_create(env, AXIOM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node));
+            epr = axis2_endpoint_ref_create(env, axiom_element_get_text(header_block_ele, env, header_block_node));
             if (to_found == AXIS2_TRUE)
             {
                 /* Duplicate To */
@@ -425,7 +425,7 @@
                 continue;
             }
 
-            text = AXIOM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node);
+            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);
             msg_id_found = AXIS2_TRUE;
@@ -443,7 +443,7 @@
                 continue;
             }
 
-            text = AXIOM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node);
+            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);
             action_found = AXIS2_TRUE;
@@ -467,7 +467,7 @@
             }
             rqn = axis2_qname_create(env, AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE, NULL, NULL);
 
-            relationship_type = AXIOM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, rqn);
+            relationship_type = axiom_element_get_attribute(header_block_ele, env, rqn);
 
             if (!relationship_type)
             {
@@ -479,7 +479,7 @@
                 relationship_type_value = axiom_attribute_get_value(relationship_type, env);
             }
 
-            address = AXIOM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node);
+            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);
@@ -519,7 +519,7 @@
     header_block_ele  = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
 
 
-    child_ele_iter = AXIOM_ELEMENT_GET_CHILD_ELEMENTS(header_block_ele, env, header_block_node);
+    child_ele_iter = axiom_element_get_child_elements(header_block_ele, env, header_block_node);
     if (!child_ele_iter)
         return AXIS2_FAILURE;
     epr_addr_qn = axis2_qname_create(env, EPR_ADDRESS, addr_ns_str, NULL);
@@ -534,17 +534,17 @@
         child_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(child_node, env);
 
 
-        child_qn = AXIOM_ELEMENT_GET_QNAME(child_ele, env, child_node);
+        child_qn = axiom_element_get_qname(child_ele, env, child_node);
         if (axis2_addr_in_check_element(env, epr_addr_qn, child_qn))
         {
             axis2_endpoint_ref_set_address(endpoint_ref, env,
-                    AXIOM_ELEMENT_GET_TEXT(child_ele, env, child_node));
+                    axiom_element_get_text(child_ele, env, child_node));
         }
         else if (axis2_addr_in_check_element(env, epr_ref_qn , child_qn))
         {
             axiom_child_element_iterator_t *ref_param_iter = NULL;
 
-            ref_param_iter = AXIOM_ELEMENT_GET_CHILD_ELEMENTS(child_ele, env, child_node);
+            ref_param_iter = axiom_element_get_child_elements(child_ele, env, child_node);
             if (ref_param_iter)
             {
                 while (AXIOM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(ref_param_iter, env))
@@ -604,7 +604,7 @@
             axiom_attribute_t *om_attr = NULL;
             axis2_char_t *attr_value = NULL;
             header_block_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
-            om_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, wsa_qname);
+            om_attr = axiom_element_get_attribute(header_block_ele, env, wsa_qname);
             if (om_attr)
             {
                 attr_value = axiom_attribute_get_localname(om_attr, env);
@@ -662,7 +662,7 @@
             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);
+            is_ref_param_attr  = axiom_element_get_attribute(header_block_ele, env, is_ref_qn);
             if (is_ref_param_attr)
             {
                 attr_value = axiom_attribute_get_localname(is_ref_param_attr, env);
@@ -724,7 +724,7 @@
 
     ns1 = axiom_namespace_create(env, addr_ns_str, "wsa");
     text_om_ele = axiom_element_create(env, NULL, "ProblemHeaderQName", ns1, &text_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, header_name, text_om_node);
+    axiom_element_set_text(text_om_ele, env, header_name, text_om_node);
 
     sub_codes = axis2_array_list_create(env, 2);
     if (sub_codes)

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=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Fri Mar 16 01:30:59 2007
@@ -232,7 +232,7 @@
         soap_header_ele =
             (axiom_element_t *)
             AXIOM_NODE_GET_DATA_ELEMENT(soap_header_node, env);
-        AXIOM_ELEMENT_DECLARE_NAMESPACE(soap_header_ele, env,
+        axiom_element_declare_namespace(soap_header_ele, env,
                 soap_header_node, addressing_namespace);
 
         epr = axis2_msg_info_headers_get_to(msg_info_headers, env);
@@ -283,7 +283,7 @@
                     to_header_block_element = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(to_header_block_node, env);
                     if (to_header_block_element)
                     {
-                        AXIOM_ELEMENT_SET_TEXT(to_header_block_element, env, address, to_header_block_node);
+                        axiom_element_set_text(to_header_block_element, env, address, to_header_block_node);
                     }
                 }
             }
@@ -423,7 +423,7 @@
                             env);
                 if (relates_to_header_ele)
                 {
-                    dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(relates_to_header_ele, env,
+                    dec_ns = axiom_element_find_declared_namespace(relates_to_header_ele, env,
                             addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
                     if (dec_ns)
                     {
@@ -439,17 +439,17 @@
                             AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE,
                             addr_ns_obj);
 
-                    AXIOM_ELEMENT_ADD_ATTRIBUTE(relates_to_header_ele, env,
+                    axiom_element_add_attribute(relates_to_header_ele, env,
                             om_attr, relates_to_header_node);
 
                 }
                 if (relates_to_header_ele)
                 {
-                    dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(relates_to_header_ele, env,
+                    dec_ns = axiom_element_find_declared_namespace(relates_to_header_ele, env,
                             addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
                     if (NULL == dec_ns)
                     {
-                        dec_ns = AXIOM_ELEMENT_FIND_NAMESPACE(relates_to_header_ele, env,
+                        dec_ns = axiom_element_find_namespace(relates_to_header_ele, env,
                                 relates_to_header_node, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
                         if (dec_ns)
                         {
@@ -505,9 +505,9 @@
         if (header_block_ele)
         {
             axiom_namespace_t *dec_ns = NULL;
-            AXIOM_ELEMENT_SET_TEXT(header_block_ele, env, value,
+            axiom_element_set_text(header_block_ele, env, value,
                     header_block_node);
-            dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(header_block_ele, env,
+            dec_ns = axiom_element_find_declared_namespace(header_block_ele, env,
                     addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
             if (! dec_ns)
             {
@@ -574,8 +574,8 @@
         if (address_ele)
         {
             axiom_namespace_t *dec_ns = NULL;
-            AXIOM_ELEMENT_SET_TEXT(address_ele, env, address, address_node);
-            dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(address_ele, env,
+            axiom_element_set_text(address_ele, env, address, address_node);
+            dec_ns = axiom_element_find_declared_namespace(address_ele, env,
                     addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
             if (! dec_ns)
             {
@@ -615,7 +615,7 @@
                 axiom_attribute_t *attr = (axiom_attribute_t *)axis2_array_list_get(ref_attribute_list, env, j);
                 if (attr)
                 {
-                    AXIOM_ELEMENT_ADD_ATTRIBUTE(reference_ele, env, attr, reference_node);
+                    axiom_element_add_attribute(reference_ele, env, attr, reference_node);
                 }
             }
         }
@@ -659,7 +659,7 @@
                 axiom_attribute_t *attr = (axiom_attribute_t *)axis2_array_list_get(meta_attribute_list, env, j);
                 if (attr)
                 {
-                    AXIOM_ELEMENT_ADD_ATTRIBUTE(reference_ele, env, attr, reference_node);
+                    axiom_element_add_attribute(reference_ele, env, attr, reference_node);
                 }
             }
         }
@@ -744,12 +744,12 @@
                     (AXIS2_STRLEN(qname_prefix) +
                             AXIS2_STRLEN(qname_localpart) + 2));
         sprintf(text, "%s:%s", qname_prefix, qname_localpart);
-        AXIOM_ELEMENT_SET_TEXT(interface_ele, env, text, interface_node);
+        axiom_element_set_text(interface_ele, env, text, interface_node);
         AXIS2_FREE(env->allocator, text);
         if (interface_ele)
         {
             axiom_namespace_t *dec_ns = NULL;
-            dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(interface_ele , env,
+            dec_ns = axiom_element_find_declared_namespace(interface_ele , env,
                     addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
             if (! dec_ns)
             {
@@ -814,7 +814,7 @@
                                     AXIS2_WSA_TYPE_ATTRIBUTE_VALUE,
                                     addr_ns_obj);
                     }
-                    AXIOM_ELEMENT_SET_TEXT(ele, env, v, node);
+                    axiom_element_set_text(ele, env, v, node);
                 }
             }
         }

Modified: webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c Fri Mar 16 01:30:59 2007
@@ -158,7 +158,7 @@
     ns1 = axiom_namespace_create(env, "http://ws.apache.org/axis2/c/samples", "ns1");
     echo_om_ele = axiom_element_create(env, NULL, "echoString", ns1, &echo_om_node);
     text_om_ele = axiom_element_create(env, echo_om_node, "text", NULL, &text_om_node);
-    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, "echo5", text_om_node);
+    axiom_element_set_text(text_om_ele, env, "echo5", text_om_node);
 
     om_str = AXIOM_NODE_TO_STRING(echo_om_node, env);
     if (om_str)

Modified: webservices/axis2/trunk/c/rampart/samples/server/sec_echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/server/sec_echo/echo.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/server/sec_echo/echo.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/server/sec_echo/echo.c Fri Mar 16 01:30:59 2007
@@ -51,7 +51,7 @@
 
     text_om_ele = axiom_element_create(env, echo_om_node, "LocalName", 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);
 
     return echo_om_node;
 }

Modified: webservices/axis2/trunk/c/rampart/samples/server/sec_echo/echo_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/server/sec_echo/echo_skeleton.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/server/sec_echo/echo_skeleton.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/server/sec_echo/echo_skeleton.c Fri Mar 16 01:30:59 2007
@@ -110,7 +110,7 @@
     axiom_element_t *error_ele = NULL;
     
 	error_ele = axiom_element_create(env, NULL, "EchoServiceError", NULL,  &error_node);
-    AXIOM_ELEMENT_SET_TEXT(error_ele, env, "Echo service failed ", text_node);
+    axiom_element_set_text(error_ele, env, "Echo service failed ", text_node);
     return error_node;
 }
 

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c Fri Mar 16 01:30:59 2007
@@ -46,7 +46,7 @@
 
     ele =  AXIOM_NODE_GET_DATA_ELEMENT(node, env);
     attr =  axiom_attribute_create(env, attribute , value, ns);
-    status = AXIOM_ELEMENT_ADD_ATTRIBUTE(ele, env, attr, node);
+    status = axiom_element_add_attribute(ele, env, attr, node);
     
     return status;
 }
@@ -74,7 +74,7 @@
         return -1;
     }
 
-    qname_iter = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(parent_ele, env, qname, parent);
+    qname_iter = axiom_element_get_children_with_qname(parent_ele, env, qname, parent);
     while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(qname_iter , env))
     {
 
@@ -176,7 +176,7 @@
     axiom_element_t *ele = NULL;
     
     ele = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
-    attribute_value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(ele, env, attribute_name);
+    attribute_value = axiom_element_get_attribute_value_by_name(ele, env, attribute_name);
     
     return attribute_value;
 }
@@ -203,7 +203,7 @@
         return NULL;
     }
     /*Get the child*/
-    ele = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(parent_ele, env, qname, parent, &node);
+    ele = axiom_element_get_first_child_with_qname(parent_ele, env, qname, parent, &node);
 
     AXIS2_QNAME_FREE(qname, env);
     qname = NULL;
@@ -228,7 +228,7 @@
     ele = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
     if (!ele) return NULL;
 
-    content = AXIOM_ELEMENT_GET_TEXT(ele, env, node);
+    content = axiom_element_get_text(ele, env, node);
     if (!content) return NULL;
 
     return content;
@@ -295,7 +295,7 @@
     axis2_qname_t* qname = NULL;
 
     ele = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
-    qname = AXIOM_ELEMENT_GET_QNAME(ele, env, node);
+    qname = axiom_element_get_qname(ele, env, node);
 
     namestr = AXIS2_QNAME_GET_LOCALPART(qname, env);
     ret_name =  AXIS2_STRCMP(namestr, name) ;

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c Fri Mar 16 01:30:59 2007
@@ -779,7 +779,7 @@
 
     if (!ele) return AXIS2_FAILURE; /*should it be failure?*/
     
-    ns = AXIOM_ELEMENT_GET_NAMESPACE(ele, ctx->env, (axiom_node_t *)node);
+    ns = axiom_element_get_namespace(ele, ctx->env, (axiom_node_t *)node);
     
     save_stack = c14n_ns_stack_create(ctx);
     c14n_ns_stack_push(save_stack, ctx); /*save current ns stack*/
@@ -797,7 +797,7 @@
             c14n_output(":", ctx);
         }
     }
-    c14n_output(AXIOM_ELEMENT_GET_LOCALNAME(ele, ctx->env), ctx);
+    c14n_output(axiom_element_get_localname(ele, ctx->env), ctx);
 
     if (ctx->exclusive)
         res = c14n_apply_on_namespace_axis_exclusive(ele, node, ctx);
@@ -863,7 +863,7 @@
             c14n_output(":", ctx);
         }
     }
-    c14n_output(AXIOM_ELEMENT_GET_LOCALNAME(ele, ctx->env), ctx);
+    c14n_output(axiom_element_get_localname(ele, ctx->env), ctx);
 
     c14n_output(">", ctx);
 
@@ -1023,7 +1023,7 @@
     axis2_hash_index_t *hi = NULL;
     c14n_sorted_list_t *attr_list = c14n_sorted_list_create(ctx->env);
  
-    attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES((axiom_element_t *)ele, 
+    attr_ht = axiom_element_get_all_attributes((axiom_element_t *)ele, 
             ctx->env);
     
     if(attr_ht)
@@ -1186,7 +1186,7 @@
     c14n_sorted_list_t *out_list = c14n_sorted_list_create(ctx->env);
 
 
-    ns_ht = AXIOM_ELEMENT_GET_NAMESPACES((axiom_element_t *)ele, ctx->env);
+    ns_ht = axiom_element_get_namespaces((axiom_element_t *)ele, ctx->env);
     
     if(ns_ht)
     {
@@ -1273,7 +1273,7 @@
 
     /*treat the default namespace specially*/
 
-    ns = AXIOM_ELEMENT_GET_NAMESPACE(pele, ctx->env,
+    ns = axiom_element_get_namespace(pele, ctx->env,
             pnode);
 
     if (ns)
@@ -1298,7 +1298,7 @@
     while (pnode)
     {
         pele = AXIOM_NODE_GET_DATA_ELEMENT((axiom_node_t *)pnode, ctx->env);
-        ns_ht = AXIOM_ELEMENT_GET_NAMESPACES((axiom_element_t *)pele, ctx->env);
+        ns_ht = axiom_element_get_namespaces((axiom_element_t *)pele, ctx->env);
         
         if (ns_ht)
         {
@@ -1430,7 +1430,7 @@
             ctx->env);
     axis2_char_t *pfx_ele = NULL;
     axis2_char_t *uri_ele = NULL;
-    ns_ele = AXIOM_ELEMENT_GET_NAMESPACE((axiom_element_t*)ele, ctx->env,
+    ns_ele = axiom_element_get_namespace((axiom_element_t*)ele, ctx->env,
             (axiom_node_t *)node);
     
     if (ns_ele)  /* return AXIS2_FALSE; TODO:check */
@@ -1442,7 +1442,7 @@
         vu = AXIS2_TRUE;
     else
     {
-        axis2_hash_t *attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(
+        axis2_hash_t *attr_ht = axiom_element_get_all_attributes(
                 (axiom_element_t *)ele, ctx->env);
         axis2_hash_index_t *hi = NULL;
         if (attr_ht)
@@ -1509,7 +1509,7 @@
         /* if (in_nodeset(parent)){*/
         parent_element = AXIOM_NODE_GET_DATA_ELEMENT(
                 (axiom_node_t *)parent_node, ctx->env);
-        parent_ns = AXIOM_ELEMENT_GET_NAMESPACE((axiom_element_t *) 
+        parent_ns = axiom_element_get_namespace((axiom_element_t *) 
                 parent_element, ctx->env, (axiom_node_t *)parent_node);
         
         if (parent_ns)  
@@ -1524,7 +1524,7 @@
             }
         }
 
-        attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(
+        attr_ht = axiom_element_get_all_attributes(
                 (axiom_element_t *)parent_element, ctx->env);
         if (attr_ht)
         {

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_binary_security_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_binary_security_token.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_binary_security_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_binary_security_token.c Fri Mar 16 01:30:59 2007
@@ -74,12 +74,12 @@
     encoding_type_att =  axiom_attribute_create(env, OXS_ATTR_ENCODING_TYPE, encoding_type, NULL);
     value_type_att =  axiom_attribute_create(env, OXS_ATTR_VALUE_TYPE, value_type, NULL);
 
-    ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(binary_security_token_ele, env, id_attr, binary_security_token_node);
-    ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(binary_security_token_ele, env, encoding_type_att, binary_security_token_node);
-    ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(binary_security_token_ele, env, value_type_att, binary_security_token_node);
+    ret = axiom_element_add_attribute(binary_security_token_ele, env, id_attr, binary_security_token_node);
+    ret = axiom_element_add_attribute(binary_security_token_ele, env, encoding_type_att, binary_security_token_node);
+    ret = axiom_element_add_attribute(binary_security_token_ele, env, value_type_att, binary_security_token_node);
 
     if(data){
-         ret  = AXIOM_ELEMENT_SET_TEXT(binary_security_token_ele, env, data, binary_security_token_node);
+         ret  = axiom_element_set_text(binary_security_token_ele, env, data, binary_security_token_node);
     }
 
     return binary_security_token_node;



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