You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/03/06 10:15:33 UTC

svn commit: r515039 [4/5] - in /webservices/axis2/trunk/c: axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/src/util/ modules/core/addr/ modules/core/clientapi/ modules/core/context/ modules/core/deployment/ modules/...

Modified: webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/test_wsdl2.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/test_wsdl2.c (original)
+++ webservices/axis2/trunk/c/woden/samples/test_wsdl2.c Tue Mar  6 01:15:20 2007
@@ -77,7 +77,7 @@
     AXIS2_FREE(env->allocator, doc_base_uri);
     WODEN_RESOLVER_FREE(resolver, env);
     intfaces = WODEN_DESC_GET_INTERFACES(desc, env);
-    intface = AXIS2_ARRAY_LIST_GET(intfaces, env, 0);
+    intface = axis2_array_list_get(intfaces, env, 0);
     if (intface)
         intface_qname = WODEN_INTERFACE_GET_QNAME(intface, env);
     if (intface_qname)
@@ -90,7 +90,7 @@
         axis2_array_list_t *endpoints = NULL;
         int i = 0, no_of_endpoints = -1;
 
-        svc = AXIS2_ARRAY_LIST_GET(svc_list, env, 0);
+        svc = axis2_array_list_get(svc_list, env, 0);
         if (svc)
         {
             axis2_qname_t *svc_qname = WODEN_SVC_GET_QNAME(svc, env);
@@ -102,7 +102,7 @@
             endpoints = WODEN_SVC_GET_ENDPOINTS(svc, env);
             if (endpoints)
             {
-                no_of_endpoints = AXIS2_ARRAY_LIST_SIZE(endpoints, env);
+                no_of_endpoints = axis2_array_list_size(endpoints, env);
             }
             else
             {
@@ -115,7 +115,7 @@
                 axis2_char_t *ep_ncname = NULL;
                 woden_endpoint_t *endpoint = NULL;
 
-                endpoint = AXIS2_ARRAY_LIST_GET(endpoints, env, i);
+                endpoint = axis2_array_list_get(endpoints, env, i);
                 ncname = WODEN_ENDPOINT_GET_NAME(endpoint, env);
                 if (ncname)
                     ep_ncname = WODEN_NC_NAME_TO_STRING(ncname, env);
@@ -130,7 +130,7 @@
     if (binding_list)
     {
         void *binding = NULL;
-        binding = AXIS2_ARRAY_LIST_GET(binding_list, env, 0);
+        binding = axis2_array_list_get(binding_list, env, 0);
         if (binding)
         {
             axis2_qname_t *binding_qname = WODEN_BINDING_GET_QNAME(binding, env);
@@ -146,7 +146,7 @@
     if (ed_list)
     {
 
-        ed = AXIS2_ARRAY_LIST_GET(ed_list, env, 0);
+        ed = axis2_array_list_get(ed_list, env, 0);
         if (ed)
             ed_qname = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
     }

Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c Tue Mar  6 01:15:20 2007
@@ -83,7 +83,7 @@
 		  return -1;
 
 	 if (intfaces)
-		  intface = AXIS2_ARRAY_LIST_GET(intfaces, env, 0);
+		  intface = axis2_array_list_get(intfaces, env, 0);
 	 else 
 		  return -1;
 
@@ -100,7 +100,7 @@
         void *svc = NULL;
         axis2_array_list_t *endpoints = NULL;
         int i = 0, no_of_endpoints = -1;
-        svc = AXIS2_ARRAY_LIST_GET(svc_list, env, 0);
+        svc = axis2_array_list_get(svc_list, env, 0);
         if (svc)
         {
             axis2_qname_t *svc_qname = WODEN_SVC_GET_QNAME(svc, env);
@@ -112,7 +112,7 @@
             endpoints = WODEN_SVC_GET_ENDPOINTS(svc, env);
             if (endpoints)
             {
-                no_of_endpoints = AXIS2_ARRAY_LIST_SIZE(endpoints, env);
+                no_of_endpoints = axis2_array_list_size(endpoints, env);
             }
             else
             {
@@ -125,7 +125,7 @@
                 axis2_char_t *ep_ncname = NULL;
                 woden_wsdl10_endpoint_t *endpoint = NULL;
 
-                endpoint = AXIS2_ARRAY_LIST_GET(endpoints, env, i);
+                endpoint = axis2_array_list_get(endpoints, env, i);
                 ncname = WODEN_WSDL10_ENDPOINT_GET_NAME(endpoint, env);
                 if (ncname)
                     ep_ncname = WODEN_NC_NAME_TO_STRING(ncname, env);
@@ -140,7 +140,7 @@
     if (binding_list)
     {
         void *binding = NULL;
-        binding = AXIS2_ARRAY_LIST_GET(binding_list, env, 0);
+        binding = axis2_array_list_get(binding_list, env, 0);
         if (binding)
         {
             axis2_qname_t *binding_qname = WODEN_BINDING_GET_QNAME(binding, env);
@@ -156,7 +156,7 @@
     if (ed_list)
     {
 
-        ed = AXIS2_ARRAY_LIST_GET(ed_list, env, 0);
+        ed = axis2_array_list_get(ed_list, env, 0);
         if (ed)
             ed_qname = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
     }

Modified: webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_reader.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Tue Mar  6 01:15:20 2007
@@ -1375,11 +1375,11 @@
 
         string_list = axis2_tokenize(env, style_default, ' ');
         if (string_list)
-            size = AXIS2_ARRAY_LIST_SIZE(string_list, env);
+            size = axis2_array_list_size(string_list, env);
         for (i = 0; i < size; i++)
         {
             axis2_uri_t *uri = NULL;
-            uri_str = AXIS2_ARRAY_LIST_GET(string_list, env, i);
+            uri_str = axis2_array_list_get(string_list, env, i);
             intface = woden_interface_to_interface_element(intface, env);
             uri = get_uri(env, uri_str);
             WODEN_INTERFACE_ELEMENT_ADD_STYLE_DEFAULT_URI(intface, env, uri);
@@ -1670,11 +1670,11 @@
         axis2_uri_t *uri = NULL;
         int i = 0, size = 0;
 
-        size = AXIS2_ARRAY_LIST_SIZE(str_list, env);
+        size = axis2_array_list_size(str_list, env);
         axis2_tokenize(env, style, ' ');
         for (i = 0; i < size; i++)
         {
-            uri_str = AXIS2_ARRAY_LIST_GET(str_list, env, i);
+            uri_str = axis2_array_list_get(str_list, env, i);
             uri = get_uri(env, uri_str);
             op = woden_interface_op_to_interface_op_element(op, env);
             WODEN_INTERFACE_OP_ELEMENT_ADD_STYLE_URI(op, env, uri);
@@ -2286,13 +2286,13 @@
 
         desc = woden_desc_to_desc_element(desc, env);
         interfaces = WODEN_DESC_ELEMENT_GET_INTERFACE_ELEMENTS(desc, env);
-        size = AXIS2_ARRAY_LIST_SIZE(interfaces, env);
+        size = axis2_array_list_size(interfaces, env);
         for (i = 0; i < size; i++)
         {
             void *intface = NULL;
             axis2_qname_t *qname = NULL;
 
-            intface = AXIS2_ARRAY_LIST_GET(interfaces, env, i);
+            intface = axis2_array_list_get(interfaces, env, i);
             intface = woden_interface_to_interface_element(intface, env);
             qname = WODEN_INTERFACE_ELEMENT_GET_QNAME(intface, env);
             if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(intface_qn, env, qname))
@@ -2475,13 +2475,13 @@
             int_faults =
                 WODEN_INTERFACE_ELEMENT_GET_INTERFACE_FAULT_ELEMENTS(
                     intface, env);
-            size = AXIS2_ARRAY_LIST_SIZE(int_faults, env);
+            size = axis2_array_list_size(int_faults, env);
             for (i = 0; i < size; i++)
             {
                 void *intface_flt = NULL;
                 axis2_qname_t *qname = NULL;
 
-                intface_flt = AXIS2_ARRAY_LIST_GET(int_faults, env, i);
+                intface_flt = axis2_array_list_get(int_faults, env, i);
                 if (intface_flt)
                 {
                     intface_flt =
@@ -2616,13 +2616,13 @@
         intface = WODEN_BINDING_ELEMENT_GET_INTERFACE_ELEMENT(parent, env);
         intface = woden_interface_to_interface_element(intface, env);
         int_ops = WODEN_INTERFACE_ELEMENT_GET_INTERFACE_OP_ELEMENTS(intface, env);
-        size = AXIS2_ARRAY_LIST_SIZE(int_ops, env);
+        size = axis2_array_list_size(int_ops, env);
         for (i = 0; i < size; i++)
         {
             void *intface_op = NULL;
             axis2_qname_t *qname = NULL;
 
-            intface_op = AXIS2_ARRAY_LIST_GET(int_ops, env, i);
+            intface_op = axis2_array_list_get(int_ops, env, i);
             if (intface_op)
                 qname = WODEN_INTERFACE_OP_ELEMENT_GET_QNAME(
                             intface_op, env);
@@ -2872,14 +2872,14 @@
             int_flt_refs =
                 WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_FAULT_REF_ELEMENTS(
                     int_op, env);
-            size = AXIS2_ARRAY_LIST_SIZE(int_flt_refs, env);
+            size = axis2_array_list_size(int_flt_refs, env);
             for (i = 0; i < size; i++)
             {
                 void *int_flt_ref = NULL;
                 axis2_qname_t *qname = NULL;
                 woden_msg_label_t *label = NULL;
 
-                int_flt_ref = AXIS2_ARRAY_LIST_GET(int_flt_refs, env, i);
+                int_flt_ref = axis2_array_list_get(int_flt_refs, env, i);
                 int_flt_ref =
                     woden_interface_fault_ref_to_interface_fault_ref_element(
                         int_flt_ref, env);
@@ -3122,14 +3122,14 @@
             int_msg_refs =
                 WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_MSG_REF_ELEMENTS(
                     int_op, env);
-            size = AXIS2_ARRAY_LIST_SIZE(int_msg_refs, env);
+            size = axis2_array_list_size(int_msg_refs, env);
             for (i = 0; i < size; i++)
             {
                 void *int_msg_ref = NULL;
                 woden_msg_label_t *msg_label = NULL;
                 woden_msg_label_t *label = NULL;
 
-                int_msg_ref = AXIS2_ARRAY_LIST_GET(int_msg_refs, env, i);
+                int_msg_ref = axis2_array_list_get(int_msg_refs, env, i);
                 int_msg_ref =
                     woden_interface_msg_ref_to_interface_msg_ref_element(
                         int_msg_ref, env);
@@ -3275,13 +3275,13 @@
         desc = woden_desc_to_desc_element(desc, env);
         interfaces = WODEN_DESC_ELEMENT_GET_INTERFACE_ELEMENTS(desc, env);
         if (interfaces)
-            size = AXIS2_ARRAY_LIST_SIZE(interfaces, env);
+            size = axis2_array_list_size(interfaces, env);
         for (i = 0; i < size; i++)
         {
             void *intface = NULL;
             axis2_qname_t *qname = NULL;
 
-            intface = AXIS2_ARRAY_LIST_GET(interfaces, env, i);
+            intface = axis2_array_list_get(interfaces, env, i);
             intface = woden_interface_to_interface_element(intface, env);
             qname = WODEN_INTERFACE_ELEMENT_GET_QNAME(intface, env);
             if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(intface_qn, env, qname))
@@ -3434,13 +3434,13 @@
         desc = woden_desc_to_desc_element(desc, env);
         bindings = WODEN_DESC_ELEMENT_GET_BINDING_ELEMENTS(desc, env);
         if (bindings)
-            size = AXIS2_ARRAY_LIST_SIZE(bindings, env);
+            size = axis2_array_list_size(bindings, env);
         for (i = 0; i < size; i++)
         {
             void *binding = NULL;
             axis2_qname_t *qname = NULL;
 
-            binding = AXIS2_ARRAY_LIST_GET(bindings, env, i);
+            binding = axis2_array_list_get(bindings, env, i);
             binding = woden_binding_to_binding_element(binding, env);
             qname = WODEN_BINDING_ELEMENT_GET_QNAME(binding, env);
             if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(binding_qn, env, qname))

Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Tue Mar  6 01:15:20 2007
@@ -1624,11 +1624,11 @@
 
         string_list = axis2_tokenize(env, style_default, ' ');
         if (string_list)
-            size = AXIS2_ARRAY_LIST_SIZE(string_list, env);
+            size = axis2_array_list_size(string_list, env);
         for (i = 0; i < size; i++)
         {
             axis2_uri_t *uri = NULL;
-            uri_str = AXIS2_ARRAY_LIST_GET(string_list, env, i);
+            uri_str = axis2_array_list_get(string_list, env, i);
             intface = woden_interface_to_interface_element(intface, env);
             uri = get_uri(env, uri_str);
             WODEN_INTERFACE_ELEMENT_ADD_STYLE_DEFAULT_URI(intface, env, uri);
@@ -1782,11 +1782,11 @@
         axis2_uri_t *uri = NULL;
         int i = 0, size = 0;
 
-        size = AXIS2_ARRAY_LIST_SIZE(str_list, env);
+        size = axis2_array_list_size(str_list, env);
         axis2_tokenize(env, style, ' ');
         for (i = 0; i < size; i++)
         {
-            uri_str = AXIS2_ARRAY_LIST_GET(str_list, env, i);
+            uri_str = axis2_array_list_get(str_list, env, i);
             uri = get_uri(env, uri_str);
             op = woden_interface_op_to_interface_op_element(op, env);
             WODEN_INTERFACE_OP_ELEMENT_ADD_STYLE_URI(op, env, uri);
@@ -2165,13 +2165,13 @@
         desc = woden_wsdl10_desc_to_desc_element(desc, env);
         msgs = WODEN_WSDL10_DESC_ELEMENT_GET_MSG_ELEMENTS(desc, env);
         if (msgs)
-            size = AXIS2_ARRAY_LIST_SIZE(msgs, env);
+            size = axis2_array_list_size(msgs, env);
         for (i = 0; i < size; i++)
         {
             void *msg = NULL;
             axis2_qname_t *msg_qname = NULL;
 
-            msg = AXIS2_ARRAY_LIST_GET(msgs, env, i);
+            msg = axis2_array_list_get(msgs, env, i);
             msg_qname = WODEN_WSDL10_MSG_REF_GET_QNAME(msg, env);
             if (AXIS2_QNAME_EQUALS(msg_qname, env, qname))
             {
@@ -2291,13 +2291,13 @@
 
         desc = woden_wsdl10_desc_to_desc_element(desc, env);
         interfaces = WODEN_WSDL10_DESC_ELEMENT_GET_INTERFACE_ELEMENTS(desc, env);
-        size = AXIS2_ARRAY_LIST_SIZE(interfaces, env);
+        size = axis2_array_list_size(interfaces, env);
         for (i = 0; i < size; i++)
         {
             void *intface = NULL;
             axis2_qname_t *qname = NULL;
 
-            intface = AXIS2_ARRAY_LIST_GET(interfaces, env, i);
+            intface = axis2_array_list_get(interfaces, env, i);
             intface = woden_interface_to_interface_element(intface, env);
             qname = WODEN_INTERFACE_ELEMENT_GET_QNAME(intface, env);
             if (AXIS2_QNAME_EQUALS(intface_qn, env, qname))
@@ -2463,13 +2463,13 @@
         intface = WODEN_BINDING_ELEMENT_GET_INTERFACE_ELEMENT(parent, env);
         intface = woden_interface_to_interface_element(intface, env);
         int_ops = WODEN_INTERFACE_ELEMENT_GET_INTERFACE_OP_ELEMENTS(intface, env);
-        size = AXIS2_ARRAY_LIST_SIZE(int_ops, env);
+        size = axis2_array_list_size(int_ops, env);
         for (i = 0; i < size; i++)
         {
             void *intface_op = NULL;
             axis2_qname_t *qname = NULL;
 
-            intface_op = AXIS2_ARRAY_LIST_GET(int_ops, env, i);
+            intface_op = axis2_array_list_get(int_ops, env, i);
             if (intface_op)
                 qname = WODEN_INTERFACE_OP_ELEMENT_GET_QNAME(
                             intface_op, env);
@@ -2720,13 +2720,13 @@
             int_flt_refs =
                 WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_FAULT_REF_ELEMENTS(
                     int_op, env);
-            size = AXIS2_ARRAY_LIST_SIZE(int_flt_refs, env);
+            size = axis2_array_list_size(int_flt_refs, env);
             for (i = 0; i < size; i++)
             {
                 void *int_flt_ref = NULL;
                 axis2_qname_t *qname = NULL;
 
-                int_flt_ref = AXIS2_ARRAY_LIST_GET(int_flt_refs, env, i);
+                int_flt_ref = axis2_array_list_get(int_flt_refs, env, i);
                 int_flt_ref =
                     woden_wsdl10_interface_fault_ref_to_interface_fault_ref_element(
                         int_flt_ref, env);
@@ -2910,14 +2910,14 @@
         int_msg_refs =
             WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_MSG_REF_ELEMENTS(
                 int_op, env);
-        size = AXIS2_ARRAY_LIST_SIZE(int_msg_refs, env);
+        size = axis2_array_list_size(int_msg_refs, env);
         for (i = 0; i < size; i++)
         {
             void *int_msg_ref = NULL;
             axis2_qname_t *intf_msg_qname = NULL;
             axis2_qname_t *binding_msg_qname = NULL;
 
-            int_msg_ref = AXIS2_ARRAY_LIST_GET(int_msg_refs, env, i);
+            int_msg_ref = axis2_array_list_get(int_msg_refs, env, i);
             int_msg_ref =
                 woden_wsdl10_interface_msg_ref_to_interface_msg_ref_element(
                     int_msg_ref, env);
@@ -3075,13 +3075,13 @@
         desc = woden_wsdl10_desc_to_desc_element(desc, env);
         interfaces = WODEN_WSDL10_DESC_ELEMENT_GET_INTERFACE_ELEMENTS(desc, env);
         if (interfaces)
-            size = AXIS2_ARRAY_LIST_SIZE(interfaces, env);
+            size = axis2_array_list_size(interfaces, env);
         for (i = 0; i < size; i++)
         {
             void *intface = NULL;
             axis2_qname_t *qname = NULL;
 
-            intface = AXIS2_ARRAY_LIST_GET(interfaces, env, i);
+            intface = axis2_array_list_get(interfaces, env, i);
             intface = woden_interface_to_interface_element(intface, env);
             qname = WODEN_INTERFACE_ELEMENT_GET_QNAME(intface, env);
             if (AXIS2_QNAME_EQUALS(intface_qn, env, qname))
@@ -3243,13 +3243,13 @@
         desc = woden_wsdl10_desc_to_desc_element(desc, env);
         bindings = WODEN_WSDL10_DESC_ELEMENT_GET_BINDING_ELEMENTS(desc, env);
         if (bindings)
-            size = AXIS2_ARRAY_LIST_SIZE(bindings, env);
+            size = axis2_array_list_size(bindings, env);
         for (i = 0; i < size; i++)
         {
             void *binding = NULL;
             axis2_qname_t *qname = NULL;
 
-            binding = AXIS2_ARRAY_LIST_GET(bindings, env, i);
+            binding = axis2_array_list_get(bindings, env, i);
             binding = woden_binding_to_binding_element(binding, env);
             qname = WODEN_BINDING_ELEMENT_GET_QNAME(binding, env);
             if (AXIS2_QNAME_EQUALS(binding_qn, env, qname))

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c Tue Mar  6 01:15:20 2007
@@ -154,15 +154,15 @@
     if (extensible_impl->temp_attrs)
     {
         int size = 0, i = 0;
-        size = AXIS2_ARRAY_LIST_SIZE(extensible_impl->temp_attrs, env);
+        size = axis2_array_list_size(extensible_impl->temp_attrs, env);
         for (i = 0; i < size; i++)
         {
             void *ext_el = NULL;
 
-            ext_el = AXIS2_ARRAY_LIST_GET(extensible_impl->temp_attrs, env, i);
+            ext_el = axis2_array_list_get(extensible_impl->temp_attrs, env, i);
             WODEN_XML_ATTR_FREE(ext_el, env);
         }
-        AXIS2_ARRAY_LIST_FREE(extensible_impl->temp_attrs, env);
+        axis2_array_list_free(extensible_impl->temp_attrs, env);
         extensible_impl->temp_attrs = NULL;
     }
 
@@ -332,15 +332,15 @@
     if (extensible_impl->temp_attrs)
     {
         int size = 0, i = 0;
-        size = AXIS2_ARRAY_LIST_SIZE(extensible_impl->temp_attrs, env);
+        size = axis2_array_list_size(extensible_impl->temp_attrs, env);
         for (i = 0; i < size; i++)
         {
             void *ext_el = NULL;
 
-            ext_el = AXIS2_ARRAY_LIST_GET(extensible_impl->temp_attrs, env, i);
+            ext_el = axis2_array_list_get(extensible_impl->temp_attrs, env, i);
             WODEN_XML_ATTR_FREE(ext_el, env);
         }
-        AXIS2_ARRAY_LIST_FREE(extensible_impl->temp_attrs, env);
+        axis2_array_list_free(extensible_impl->temp_attrs, env);
         extensible_impl->temp_attrs = NULL;
     }
     extensible_impl->temp_attrs = axis2_array_list_create(env, 0);
@@ -350,7 +350,7 @@
         void *value = NULL;
 
         axis2_hash_this(index, NULL, NULL, &value);
-        AXIS2_ARRAY_LIST_ADD(extensible_impl->temp_attrs, env, value);
+        axis2_array_list_add(extensible_impl->temp_attrs, env, value);
     }
     return extensible_impl->temp_attrs;
 }
@@ -375,15 +375,15 @@
     if (extensible_impl->temp_attrs)
     {
         int size = 0, i = 0;
-        size = AXIS2_ARRAY_LIST_SIZE(extensible_impl->temp_attrs, env);
+        size = axis2_array_list_size(extensible_impl->temp_attrs, env);
         for (i = 0; i < size; i++)
         {
             void *ext_el = NULL;
 
-            ext_el = AXIS2_ARRAY_LIST_GET(extensible_impl->temp_attrs, env, i);
+            ext_el = axis2_array_list_get(extensible_impl->temp_attrs, env, i);
             WODEN_XML_ATTR_FREE(ext_el, env);
         }
-        AXIS2_ARRAY_LIST_FREE(extensible_impl->temp_attrs, env);
+        axis2_array_list_free(extensible_impl->temp_attrs, env);
         extensible_impl->temp_attrs = NULL;
     }
 
@@ -394,7 +394,7 @@
         void *value = NULL;
 
         axis2_hash_this(index, NULL, NULL, &value);
-        AXIS2_ARRAY_LIST_ADD(extensible_impl->temp_attrs, env, value);
+        axis2_array_list_add(extensible_impl->temp_attrs, env, value);
     }
 
     return extensible_impl->temp_attrs;

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c Tue Mar  6 01:15:20 2007
@@ -624,13 +624,13 @@
 
     if (binding_impl->f_faults)
     {
-        AXIS2_ARRAY_LIST_FREE(binding_impl->f_faults, env);
+        axis2_array_list_free(binding_impl->f_faults, env);
         binding_impl->f_faults = NULL;
     }
 
     if (binding_impl->f_ops)
     {
-        AXIS2_ARRAY_LIST_FREE(binding_impl->f_ops, env);
+        axis2_array_list_free(binding_impl->f_ops, env);
         binding_impl->f_ops = NULL;
     }
 
@@ -1016,7 +1016,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(binding_impl->f_faults, env, fault);
+    axis2_array_list_add(binding_impl->f_faults, env, fault);
 
     return AXIS2_SUCCESS;
 }
@@ -1061,7 +1061,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(binding_impl->f_ops, env, op);
+    axis2_array_list_add(binding_impl->f_ops, env, op);
 
     return AXIS2_SUCCESS;
 }
@@ -1102,13 +1102,13 @@
     binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
-    size = AXIS2_ARRAY_LIST_SIZE(binding_impl->f_faults, env);
+    size = axis2_array_list_size(binding_impl->f_faults, env);
     for (i = 0; i < size; i++)
     {
         void *bind_fault = NULL;
         axis2_qname_t *qname_l = NULL;
 
-        bind_fault = AXIS2_ARRAY_LIST_GET(binding_impl->f_faults,
+        bind_fault = axis2_array_list_get(binding_impl->f_faults,
                 env, i);
         qname_l = (axis2_qname_t *) WODEN_BINDING_FAULT_ELEMENT_GET_REF(
                     bind_fault, env);
@@ -1139,13 +1139,13 @@
     binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
-    size = AXIS2_ARRAY_LIST_SIZE(binding_impl->f_ops, env);
+    size = axis2_array_list_size(binding_impl->f_ops, env);
     for (i = 0; i < size; i++)
     {
         void *bind_op = NULL;
         axis2_qname_t *qname_l = NULL;
 
-        bind_op = AXIS2_ARRAY_LIST_GET(binding_impl->f_ops,
+        bind_op = axis2_array_list_get(binding_impl->f_ops,
                 env, i);
         qname_l = (axis2_qname_t *) WODEN_BINDING_OP_ELEMENT_GET_REF(
                     bind_op, env);

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_configurable.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_configurable.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_configurable.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_configurable.c Tue Mar  6 01:15:20 2007
@@ -220,13 +220,13 @@
 
     if (configurable_impl->f_features)
     {
-        AXIS2_ARRAY_LIST_FREE(configurable_impl->f_features, env);
+        axis2_array_list_free(configurable_impl->f_features, env);
         configurable_impl->f_features = NULL;
     }
 
     if (configurable_impl->f_properties)
     {
-        AXIS2_ARRAY_LIST_FREE(configurable_impl->f_properties, env);
+        axis2_array_list_free(configurable_impl->f_properties, env);
         configurable_impl->f_properties = NULL;
     }
 
@@ -363,7 +363,7 @@
             return AXIS2_FAILURE;
         }
     }
-    return AXIS2_ARRAY_LIST_ADD(configurable_impl->f_features, env,
+    return axis2_array_list_add(configurable_impl->f_features, env,
             feature);
 }
 
@@ -407,7 +407,7 @@
             return AXIS2_FAILURE;
         }
     }
-    return AXIS2_ARRAY_LIST_ADD(configurable_impl->f_properties, env,
+    return axis2_array_list_add(configurable_impl->f_properties, env,
             property);
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_documentable.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_documentable.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_documentable.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_documentable.c Tue Mar  6 01:15:20 2007
@@ -194,7 +194,7 @@
 
     if (documentable_impl->f_doc_elems)
     {
-        AXIS2_ARRAY_LIST_FREE(documentable_impl->f_doc_elems, env);
+        axis2_array_list_free(documentable_impl->f_doc_elems, env);
         documentable_impl->f_doc_elems = NULL;
     }
 
@@ -314,7 +314,7 @@
             return AXIS2_FAILURE;
         }
     }
-    return AXIS2_ARRAY_LIST_ADD(documentable_impl->f_doc_elems, env,
+    return axis2_array_list_add(documentable_impl->f_doc_elems, env,
             documentation);
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c Tue Mar  6 01:15:20 2007
@@ -146,22 +146,22 @@
 
     if (extensible_impl->f_ext_elements)
     {
-        AXIS2_ARRAY_LIST_FREE(extensible_impl->f_ext_elements, env);
+        axis2_array_list_free(extensible_impl->f_ext_elements, env);
         extensible_impl->f_ext_elements = NULL;
     }
 
     if (extensible_impl->temp_elems)
     {
         int size = 0, i = 0;
-        size = AXIS2_ARRAY_LIST_SIZE(extensible_impl->temp_elems, env);
+        size = axis2_array_list_size(extensible_impl->temp_elems, env);
         for (i = 0; i < size; i++)
         {
             void *ext_el = NULL;
 
-            ext_el = AXIS2_ARRAY_LIST_GET(extensible_impl->temp_elems, env, i);
+            ext_el = axis2_array_list_get(extensible_impl->temp_elems, env, i);
             WODEN_XML_ATTR_FREE(ext_el, env);
         }
-        AXIS2_ARRAY_LIST_FREE(extensible_impl->temp_elems, env);
+        axis2_array_list_free(extensible_impl->temp_elems, env);
         extensible_impl->temp_elems = NULL;
     }
 
@@ -280,7 +280,7 @@
             "WODEN_ELEMENT_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
 
 
-    return AXIS2_ARRAY_LIST_ADD(extensible_impl->f_ext_elements, env, ext_el);
+    return axis2_array_list_add(extensible_impl->f_ext_elements, env, ext_el);
 }
 
 axis2_status_t AXIS2_CALL
@@ -299,8 +299,8 @@
     extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_ELEMENT_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
 
-    index = AXIS2_ARRAY_LIST_INDEX_OF(extensible_impl->f_ext_elements, env, ext_el);
-    AXIS2_ARRAY_LIST_REMOVE(extensible_impl->f_ext_elements, env, index);
+    index = axis2_array_list_index_of(extensible_impl->f_ext_elements, env, ext_el);
+    axis2_array_list_remove(extensible_impl->f_ext_elements, env, index);
     return AXIS2_SUCCESS;
 }
 
@@ -338,31 +338,31 @@
     if (extensible_impl->temp_elems)
     {
         int size = 0, i = 0;
-        size = AXIS2_ARRAY_LIST_SIZE(extensible_impl->temp_elems, env);
+        size = axis2_array_list_size(extensible_impl->temp_elems, env);
         for (i = 0; i < size; i++)
         {
             void *ext_el = NULL;
 
-            ext_el = AXIS2_ARRAY_LIST_GET(extensible_impl->temp_elems, env, i);
+            ext_el = axis2_array_list_get(extensible_impl->temp_elems, env, i);
             WODEN_XML_ATTR_FREE(ext_el, env);
         }
-        AXIS2_ARRAY_LIST_FREE(extensible_impl->temp_elems, env);
+        axis2_array_list_free(extensible_impl->temp_elems, env);
         extensible_impl->temp_elems = NULL;
     }
 
     extensible_impl->temp_elems = axis2_array_list_create(env, 0);
-    size = AXIS2_ARRAY_LIST_SIZE(extensible_impl->f_ext_elements, env);
+    size = axis2_array_list_size(extensible_impl->f_ext_elements, env);
     for (i = 0; i < size; i++)
     {
         woden_ext_element_t *ext_elem = NULL;
         axis2_qname_t *ext_type_l = NULL;
 
-        ext_elem = (woden_ext_element_t *)AXIS2_ARRAY_LIST_GET(
+        ext_elem = (woden_ext_element_t *)axis2_array_list_get(
                     extensible_impl->f_ext_elements, env, i);
         ext_type_l = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_elem, env);
         if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(ext_type, env, ext_type_l))
         {
-            AXIS2_ARRAY_LIST_ADD(extensible_impl->temp_elems, env, ext_elem);
+            axis2_array_list_add(extensible_impl->temp_elems, env, ext_elem);
         }
     }
     return extensible_impl->temp_elems;
@@ -388,14 +388,14 @@
             "WODEN_ELEMENT_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
 
     ext_ns = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
-    size = AXIS2_ARRAY_LIST_SIZE(extensible_impl->f_ext_elements, env);
+    size = axis2_array_list_size(extensible_impl->f_ext_elements, env);
     for (i = 0; i < size; i++)
     {
         woden_ext_element_t *ext_elem = NULL;
         axis2_qname_t *ext_type = NULL;
         axis2_char_t *uri = NULL;
 
-        ext_elem = (woden_ext_element_t *) AXIS2_ARRAY_LIST_GET(
+        ext_elem = (woden_ext_element_t *) axis2_array_list_get(
                     extensible_impl->f_ext_elements, env, i);
         ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_elem, env);
         uri = AXIS2_QNAME_GET_URI(ext_type, env);

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c Tue Mar  6 01:15:20 2007
@@ -516,7 +516,7 @@
 
     if (interface_impl->f_extended_interfaces)
     {
-        AXIS2_ARRAY_LIST_FREE(interface_impl->f_extended_interfaces, env);
+        axis2_array_list_free(interface_impl->f_extended_interfaces, env);
         interface_impl->f_extended_interfaces = NULL;
     }
 
@@ -528,25 +528,25 @@
 
     if (interface_impl->f_extends_qnames)
     {
-        AXIS2_ARRAY_LIST_FREE(interface_impl->f_extends_qnames, env);
+        axis2_array_list_free(interface_impl->f_extends_qnames, env);
         interface_impl->f_extends_qnames = NULL;
     }
 
     if (interface_impl->f_style_default)
     {
-        AXIS2_ARRAY_LIST_FREE(interface_impl->f_style_default, env);
+        axis2_array_list_free(interface_impl->f_style_default, env);
         interface_impl->f_style_default = NULL;
     }
 
     if (interface_impl->f_interface_fault_elements)
     {
-        AXIS2_ARRAY_LIST_FREE(interface_impl->f_interface_fault_elements, env);
+        axis2_array_list_free(interface_impl->f_interface_fault_elements, env);
         interface_impl->f_interface_fault_elements = NULL;
     }
 
     if (interface_impl->f_interface_op_elements)
     {
-        AXIS2_ARRAY_LIST_FREE(interface_impl->f_interface_op_elements, env);
+        axis2_array_list_free(interface_impl->f_interface_op_elements, env);
         interface_impl->f_interface_op_elements = NULL;
     }
 
@@ -750,13 +750,13 @@
     interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
-    size = AXIS2_ARRAY_LIST_SIZE(interface_impl->f_interface_fault_elements, env);
+    size = axis2_array_list_size(interface_impl->f_interface_fault_elements, env);
     for (i = 0; i < size; i++)
     {
         void *flt = NULL;
         axis2_qname_t *qname_l = NULL;
 
-        flt = AXIS2_ARRAY_LIST_GET(interface_impl->f_interface_fault_elements,
+        flt = axis2_array_list_get(interface_impl->f_interface_fault_elements,
                 env, i);
         qname_l = (axis2_qname_t *) WODEN_INTERFACE_FAULT_GET_QNAME(flt, env);
         if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(qname, env, qname_l))
@@ -851,7 +851,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(interface_impl->f_style_default, env, AXIS2_URI_CLONE(
+    axis2_array_list_add(interface_impl->f_style_default, env, AXIS2_URI_CLONE(
                 uri, env));
 
     return AXIS2_SUCCESS;
@@ -897,7 +897,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(interface_impl->f_extends_qnames, env, qname);
+    axis2_array_list_add(interface_impl->f_extends_qnames, env, qname);
 
     return AXIS2_SUCCESS;
 }
@@ -942,7 +942,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(interface_impl->f_interface_fault_elements, env, fault);
+    axis2_array_list_add(interface_impl->f_interface_fault_elements, env, fault);
 
     return AXIS2_SUCCESS;
 }
@@ -987,7 +987,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(interface_impl->f_interface_op_elements, env, op);
+    axis2_array_list_add(interface_impl->f_interface_op_elements, env, op);
 
     return AXIS2_SUCCESS;
 }
@@ -1032,7 +1032,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(interface_impl->f_extended_interfaces, env, extended_interface);
+    axis2_array_list_add(interface_impl->f_extended_interfaces, env, extended_interface);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c Tue Mar  6 01:15:20 2007
@@ -736,19 +736,19 @@
 
     if (interface_op_impl->f_style)
     {
-        AXIS2_ARRAY_LIST_FREE(interface_op_impl->f_style, env);
+        axis2_array_list_free(interface_op_impl->f_style, env);
         interface_op_impl->f_style = NULL;
     }
 
     if (interface_op_impl->f_msg_refs)
     {
-        AXIS2_ARRAY_LIST_FREE(interface_op_impl->f_msg_refs, env);
+        axis2_array_list_free(interface_op_impl->f_msg_refs, env);
         interface_op_impl->f_msg_refs = NULL;
     }
 
     if (interface_op_impl->f_fault_refs)
     {
-        AXIS2_ARRAY_LIST_FREE(interface_op_impl->f_fault_refs, env);
+        axis2_array_list_free(interface_op_impl->f_fault_refs, env);
         interface_op_impl->f_fault_refs = NULL;
     }
 
@@ -1080,7 +1080,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(interface_op_impl->f_style, env, AXIS2_URI_CLONE(uri, env));
+    axis2_array_list_add(interface_op_impl->f_style, env, AXIS2_URI_CLONE(uri, env));
     return AXIS2_SUCCESS;
 }
 
@@ -1100,8 +1100,8 @@
     interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
-    index = AXIS2_ARRAY_LIST_INDEX_OF(interface_op_impl->f_style, env, uri);
-    AXIS2_ARRAY_LIST_REMOVE(interface_op_impl->f_style, env, index);
+    index = axis2_array_list_index_of(interface_op_impl->f_style, env, uri);
+    axis2_array_list_remove(interface_op_impl->f_style, env, index);
     return AXIS2_SUCCESS;
 }
 
@@ -1129,7 +1129,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(interface_op_impl->f_msg_refs, env, msg_ref);
+    axis2_array_list_add(interface_op_impl->f_msg_refs, env, msg_ref);
 
     return AXIS2_SUCCESS;
 }
@@ -1150,8 +1150,8 @@
     interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
-    index = AXIS2_ARRAY_LIST_INDEX_OF(interface_op_impl->f_msg_refs, env, msg_ref);
-    AXIS2_ARRAY_LIST_REMOVE(interface_op_impl->f_msg_refs, env, index);
+    index = axis2_array_list_index_of(interface_op_impl->f_msg_refs, env, msg_ref);
+    axis2_array_list_remove(interface_op_impl->f_msg_refs, env, index);
     return AXIS2_SUCCESS;
 }
 
@@ -1196,7 +1196,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(interface_op_impl->f_fault_refs, env, fault_ref);
+    axis2_array_list_add(interface_op_impl->f_fault_refs, env, fault_ref);
 
     return AXIS2_SUCCESS;
 }
@@ -1217,8 +1217,8 @@
     interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
-    index = AXIS2_ARRAY_LIST_INDEX_OF(interface_op_impl->f_fault_refs, env, fault_ref);
-    AXIS2_ARRAY_LIST_REMOVE(interface_op_impl->f_fault_refs, env, index);
+    index = axis2_array_list_index_of(interface_op_impl->f_fault_refs, env, fault_ref);
+    axis2_array_list_remove(interface_op_impl->f_fault_refs, env, index);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c Tue Mar  6 01:15:20 2007
@@ -128,15 +128,15 @@
     {
         int i = 0, size = 0;
 
-        size = AXIS2_ARRAY_LIST_SIZE(soap_fault_subcodes_impl->f_subcode_qns,
+        size = axis2_array_list_size(soap_fault_subcodes_impl->f_subcode_qns,
                 env);
         for (i = 0; i < size; i++)
         {
-            axis2_qname_t *qname = AXIS2_ARRAY_LIST_GET(soap_fault_subcodes_impl->
+            axis2_qname_t *qname = axis2_array_list_get(soap_fault_subcodes_impl->
                     f_subcode_qns, env, i);
             AXIS2_QNAME_FREE(qname, env);
         }
-        AXIS2_ARRAY_LIST_FREE(soap_fault_subcodes_impl->f_subcode_qns, env);
+        axis2_array_list_free(soap_fault_subcodes_impl->f_subcode_qns, env);
         soap_fault_subcodes_impl->f_subcode_qns = NULL;
     }
 
@@ -178,7 +178,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     soap_fault_subcodes_impl = INTF_TO_IMPL(soap_fault_subcodes);
 
-    size = AXIS2_ARRAY_LIST_SIZE(soap_fault_subcodes_impl->f_subcode_qns, env);
+    size = axis2_array_list_size(soap_fault_subcodes_impl->f_subcode_qns, env);
     return (size > 0);
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c Tue Mar  6 01:15:20 2007
@@ -565,13 +565,13 @@
 
     if (types_impl->f_schemas)
     {
-        AXIS2_ARRAY_LIST_FREE(types_impl->f_schemas, env);
+        axis2_array_list_free(types_impl->f_schemas, env);
         types_impl->f_schemas = NULL;
     }
 
     if (types_impl->schema_defs)
     {
-        AXIS2_ARRAY_LIST_FREE(types_impl->schema_defs, env);
+        axis2_array_list_free(types_impl->schema_defs, env);
         types_impl->schema_defs = NULL;
     }
 
@@ -772,7 +772,7 @@
     types_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
-    return AXIS2_ARRAY_LIST_ADD(types_impl->f_schemas, env, schema);
+    return axis2_array_list_add(types_impl->f_schemas, env, schema);
 }
 
 axis2_status_t AXIS2_CALL
@@ -792,8 +792,8 @@
     types_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
-    index = AXIS2_ARRAY_LIST_INDEX_OF(types_impl->f_schemas, env, schema);
-    AXIS2_ARRAY_LIST_REMOVE(types_impl->f_schemas, env, index);
+    index = axis2_array_list_index_of(types_impl->f_schemas, env, schema);
+    axis2_array_list_remove(types_impl->f_schemas, env, index);
     code = AXIS2_ERROR_GET_STATUS_CODE(env->error);
     return code;
 }
@@ -831,20 +831,20 @@
 
     if (namespc)
         str_namespc = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
-    size = AXIS2_ARRAY_LIST_SIZE(types_impl->f_schemas, env);
+    size = axis2_array_list_size(types_impl->f_schemas, env);
     for (i = 0; i < size; i++)
     {
         axis2_char_t *str_namespc_l = NULL;
         woden_schema_t *schema = (woden_schema_t *)
-                AXIS2_ARRAY_LIST_GET(types_impl->f_schemas, env, i);
+                axis2_array_list_get(types_impl->f_schemas, env, i);
         str_namespc_l = WODEN_SCHEMA_GET_NAMESPACE_AS_STRING(schema, env);
         /* get schemas whose namespace is missing */
         if (!str_namespc && !str_namespc_l)
-            AXIS2_ARRAY_LIST_ADD(types_impl->schema_defs, env, schema);
+            axis2_array_list_add(types_impl->schema_defs, env, schema);
         else if (str_namespc && str_namespc_l && 0 == AXIS2_STRCMP(str_namespc,
                 str_namespc_l))
         {
-            AXIS2_ARRAY_LIST_ADD(types_impl->schema_defs , env, schema);
+            axis2_array_list_add(types_impl->schema_defs , env, schema);
         }
     }
     return types_impl->schema_defs;
@@ -864,14 +864,14 @@
     types_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
-    size = AXIS2_ARRAY_LIST_SIZE(types_impl->f_schemas, env);
+    size = axis2_array_list_size(types_impl->f_schemas, env);
     for (i = 0; i < size; i++)
     {
         woden_schema_t *s = (woden_schema_t *)
-                AXIS2_ARRAY_LIST_GET(types_impl->f_schemas, env, i);
+                axis2_array_list_get(types_impl->f_schemas, env, i);
         if (WODEN_INLINED_SCHEMA == WODEN_SCHEMA_TYPE(s, env))
         {
-            AXIS2_ARRAY_LIST_ADD(types_impl->schema_defs, env, s);
+            axis2_array_list_add(types_impl->schema_defs, env, s);
         }
     }
     return types_impl->schema_defs;
@@ -891,14 +891,14 @@
     types_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
-    size = AXIS2_ARRAY_LIST_SIZE(types_impl->f_schemas, env);
+    size = axis2_array_list_size(types_impl->f_schemas, env);
     for (i = 0; i < size; i++)
     {
         woden_schema_t *s = (woden_schema_t *)
-                AXIS2_ARRAY_LIST_GET(types_impl->f_schemas, env, i);
+                axis2_array_list_get(types_impl->f_schemas, env, i);
         if (WODEN_IMPORTED_SCHEMA == WODEN_SCHEMA_TYPE(s, env))
         {
-            AXIS2_ARRAY_LIST_ADD(types_impl->schema_defs, env, s);
+            axis2_array_list_add(types_impl->schema_defs, env, s);
         }
     }
     return types_impl->schema_defs;
@@ -931,11 +931,11 @@
         int i = 0, size = 0;
 
         /* search the schemas with this qname's namespace */
-        size = AXIS2_ARRAY_LIST_SIZE(schemas, env);
+        size = axis2_array_list_size(schemas, env);
         for (i = 0; i < size; i++)
         {
             xml_schema_t *xml_schema = (xml_schema_t *)
-                    AXIS2_ARRAY_LIST_GET(schemas, env, i);
+                    axis2_array_list_get(schemas, env, i);
             xml_schema_el = XML_SCHEMA_GET_ELEMENT_BY_QNAME(xml_schema,
                     env, qname);
             if (xml_schema_el)
@@ -974,11 +974,11 @@
             int i = 0, size = 0;
 
             /* search the schemas with this qname's namespace */
-            size = AXIS2_ARRAY_LIST_SIZE(schema_refs, env);
+            size = axis2_array_list_size(schema_refs, env);
             for (i = 0; i < size; i++)
             {
                 xml_schema_t *xml_schema = (xml_schema_t *)
-                        AXIS2_ARRAY_LIST_GET(schema_refs, env, i);
+                        axis2_array_list_get(schema_refs, env, i);
                 xml_schema_type = XML_SCHEMA_GET_TYPE_BY_QNAME(xml_schema,
                         env, qname);
                 if (xml_schema_type)
@@ -1008,14 +1008,14 @@
     if (types_impl->schema_defs)
     {
         int i = 0, size = 0;
-        size = AXIS2_ARRAY_LIST_SIZE(types_impl->schema_defs, env);
+        size = axis2_array_list_size(types_impl->schema_defs, env);
         for (i = 0; i < size; i++)
         {
-            woden_schema_t *schema = AXIS2_ARRAY_LIST_GET(
+            woden_schema_t *schema = axis2_array_list_get(
                         types_impl->schema_defs, env, i);
             WODEN_SCHEMA_FREE(schema, env);
         }
-        AXIS2_ARRAY_LIST_FREE(types_impl->schema_defs, env);
+        axis2_array_list_free(types_impl->schema_defs, env);
     }
     types_impl->schema_defs = axis2_array_list_create(env, 0);
     if (!types_impl->schema_defs)
@@ -1023,16 +1023,16 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    size = AXIS2_ARRAY_LIST_SIZE(types_impl->f_schemas, env);
+    size = axis2_array_list_size(types_impl->f_schemas, env);
     for (i = 0; i < size; i++)
     {
-        void *s = AXIS2_ARRAY_LIST_GET(types_impl->f_schemas, env, i);
+        void *s = axis2_array_list_get(types_impl->f_schemas, env, i);
         xml_schema_t *schema_def = WODEN_SCHEMA_GET_SCHEMA_DEF(s,
                 env);
         if (AXIS2_TRUE == WODEN_SCHEMA_IS_REFERENCEABLE(s, env) &&
                 schema_def)
         {
-            AXIS2_ARRAY_LIST_ADD(types_impl->schema_defs, env, schema_def);
+            axis2_array_list_add(types_impl->schema_defs, env, schema_def);
         }
     }
     return types_impl->schema_defs;
@@ -1054,11 +1054,11 @@
     types_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
-    size = AXIS2_ARRAY_LIST_SIZE(types_impl->f_schemas, env);
+    size = axis2_array_list_size(types_impl->f_schemas, env);
     for (i = 0; i < size; i++)
     {
         woden_schema_t *schema =
-            (woden_schema_t *) AXIS2_ARRAY_LIST_GET(types_impl->f_schemas,
+            (woden_schema_t *) axis2_array_list_get(types_impl->f_schemas,
                     env, i);
         axis2_char_t *namespc_l =
             WODEN_SCHEMA_GET_NAMESPACE_AS_STRING(schema, env);
@@ -1067,7 +1067,7 @@
         if (AXIS2_TRUE == WODEN_SCHEMA_IS_REFERENCEABLE(schema, env) &&
                 0 == AXIS2_STRCMP(namespc, namespc_l) &&  schema_def)
         {
-            AXIS2_ARRAY_LIST_ADD(types_impl->schema_defs, env, schema_def);
+            axis2_array_list_add(types_impl->schema_defs, env, schema_def);
         }
     }
     return types_impl->schema_defs;
@@ -1133,12 +1133,12 @@
     types_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
-    size = AXIS2_ARRAY_LIST_SIZE(types_impl->f_schemas, env);
+    size = axis2_array_list_size(types_impl->f_schemas, env);
     for (i = 0; i < size; i++)
     {
         axis2_char_t *namespc_l = NULL;
 
-        woden_schema_t *s = (woden_schema_t *) AXIS2_ARRAY_LIST_GET(
+        woden_schema_t *s = (woden_schema_t *) axis2_array_list_get(
                     types_impl->f_schemas, env, i);
         if (!s)
         {

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_ref.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_ref.c Tue Mar  6 01:15:20 2007
@@ -382,7 +382,7 @@
             return AXIS2_FAILURE;
         }
     }
-    return AXIS2_ARRAY_LIST_ADD(wsdl_ref_impl->f_documentation_elements, env,
+    return axis2_array_list_add(wsdl_ref_impl->f_documentation_elements, env,
             doc_el);
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c Tue Mar  6 01:15:20 2007
@@ -622,7 +622,7 @@
 
     if (header_block_impl->f_documentation_elements)
     {
-        AXIS2_ARRAY_LIST_FREE(header_block_impl->f_documentation_elements, env);
+        axis2_array_list_free(header_block_impl->f_documentation_elements, env);
         header_block_impl->f_documentation_elements = NULL;
     }
 
@@ -1010,7 +1010,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(header_block_impl->f_documentation_elements, env, doc_el);
+    axis2_array_list_add(header_block_impl->f_documentation_elements, env, doc_el);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c Tue Mar  6 01:15:20 2007
@@ -590,7 +590,7 @@
 
     if (module_impl->f_documentation_elements)
     {
-        AXIS2_ARRAY_LIST_FREE(module_impl->f_documentation_elements, env);
+        axis2_array_list_free(module_impl->f_documentation_elements, env);
         module_impl->f_documentation_elements = NULL;
     }
 
@@ -887,7 +887,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(module_impl->f_documentation_elements, env, doc_el);
+    axis2_array_list_add(module_impl->f_documentation_elements, env, doc_el);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c Tue Mar  6 01:15:20 2007
@@ -466,7 +466,7 @@
             void *v = NULL;
 
             axis2_hash_this(i, NULL, NULL, &v);
-            AXIS2_ARRAY_LIST_ADD(registry_impl->key_set, env, v);
+            axis2_array_list_add(registry_impl->key_set, env, v);
         }
     }
     return registry_impl->key_set;
@@ -698,7 +698,7 @@
             const void *key = NULL;
 
             axis2_hash_this(i, &key, NULL, NULL);
-            AXIS2_ARRAY_LIST_ADD(registry_impl->key_set, env, key);
+            axis2_array_list_add(registry_impl->key_set, env, key);
         }
     }
     return registry_impl->key_set;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c Tue Mar  6 01:15:20 2007
@@ -806,13 +806,13 @@
 
       if (binding_op_impl->f_msg_refs)
       {
-	    AXIS2_ARRAY_LIST_FREE(binding_op_impl->f_msg_refs, env);
+	    axis2_array_list_free(binding_op_impl->f_msg_refs, env);
 	    binding_op_impl->f_msg_refs = NULL;
       }
 
       if (binding_op_impl->f_fault_refs)
       {
-	    AXIS2_ARRAY_LIST_FREE(binding_op_impl->f_fault_refs, env);
+	    axis2_array_list_free(binding_op_impl->f_fault_refs, env);
 	    binding_op_impl->f_fault_refs = NULL;
       }
 
@@ -1106,7 +1106,7 @@
 		  return AXIS2_FAILURE;
 	    }
       }
-      AXIS2_ARRAY_LIST_ADD(binding_op_impl->f_msg_refs, env, msg_ref);
+      axis2_array_list_add(binding_op_impl->f_msg_refs, env, msg_ref);
 
       return AXIS2_SUCCESS;
 }
@@ -1127,8 +1127,8 @@
       binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
-      index = AXIS2_ARRAY_LIST_INDEX_OF(binding_op_impl->f_msg_refs, env, msg_ref);
-      AXIS2_ARRAY_LIST_REMOVE(binding_op_impl->f_msg_refs, env, index);
+      index = axis2_array_list_index_of(binding_op_impl->f_msg_refs, env, msg_ref);
+      axis2_array_list_remove(binding_op_impl->f_msg_refs, env, index);
       return AXIS2_SUCCESS;
 }
 
@@ -1173,7 +1173,7 @@
 		  return AXIS2_FAILURE;
 	    }
       }
-      AXIS2_ARRAY_LIST_ADD(binding_op_impl->f_fault_refs, env, fault_ref);
+      axis2_array_list_add(binding_op_impl->f_fault_refs, env, fault_ref);
 
       return AXIS2_SUCCESS;
 }
@@ -1194,8 +1194,8 @@
       binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
-      index = AXIS2_ARRAY_LIST_INDEX_OF(binding_op_impl->f_fault_refs, env, fault_ref);
-      AXIS2_ARRAY_LIST_REMOVE(binding_op_impl->f_fault_refs, env, index);
+      index = axis2_array_list_index_of(binding_op_impl->f_fault_refs, env, fault_ref);
+      axis2_array_list_remove(binding_op_impl->f_fault_refs, env, index);
       return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c Tue Mar  6 01:15:20 2007
@@ -345,13 +345,13 @@
       includes = WODEN_WSDL10_DESC_ELEMENT_GET_INCLUDE_ELEMENTS(desc, env);
       if (includes)
       {
-	    size = AXIS2_ARRAY_LIST_SIZE(includes, env);
+	    size = axis2_array_list_size(includes, env);
 	    for (i = 0; i < size; i++)
 	    {
 		  void *incl_desc = NULL;
 		  void *incl_el = NULL;
 
-		  incl_el = AXIS2_ARRAY_LIST_GET(includes, env, i);
+		  incl_el = axis2_array_list_get(includes, env, i);
 		  incl_desc = WODEN_INCLUDE_ELEMENT_GET_DESC_ELEMENT(incl_el, env);
 		  if (incl_desc)
 		  {
@@ -363,13 +363,13 @@
       imports = WODEN_WSDL10_DESC_ELEMENT_GET_IMPORT_ELEMENTS(desc, env);
       if (imports)
       {
-	    size = AXIS2_ARRAY_LIST_SIZE(imports, env);
+	    size = axis2_array_list_size(imports, env);
 	    for (i = 0; i < size; i++)
 	    {
 		  void *imp_desc = NULL;
 		  void *imp_el = NULL;
 
-		  imp_el = AXIS2_ARRAY_LIST_GET(imports, env, i);
+		  imp_el = axis2_array_list_get(imports, env, i);
 		  imp_desc = WODEN_IMPORT_ELEMENT_GET_DESC_ELEMENT(imp_el, env);
 		  if (imp_desc)
 		  {
@@ -416,21 +416,21 @@
 	    referenceable_schema_defs =
 		  WODEN_TYPES_GET_REFERENCEABLE_SCHEMA_DEFS(types, env);
 	    if (referenceable_schema_defs)
-		  size = AXIS2_ARRAY_LIST_SIZE(referenceable_schema_defs, env);
+		  size = axis2_array_list_size(referenceable_schema_defs, env);
 	    for (i = 0; i < size; i++)
 	    {
 		  void *schema_def = NULL;
 		  int i = 0, size = 0;
 		  axis2_bool_t new_schema = AXIS2_TRUE;
 
-		  schema_def = AXIS2_ARRAY_LIST_GET(referenceable_schema_defs, env, i);
+		  schema_def = axis2_array_list_get(referenceable_schema_defs, env, i);
 		  if (builder_impl->f_schemas_done)
-			size = AXIS2_ARRAY_LIST_SIZE(builder_impl->f_schemas_done, env);
+			size = axis2_array_list_size(builder_impl->f_schemas_done, env);
 		  for (i = 0; i < size; i++)
 		  {
 			void *schema_done = NULL;
 
-			schema_done = AXIS2_ARRAY_LIST_GET(builder_impl->f_schemas_done,
+			schema_done = axis2_array_list_get(builder_impl->f_schemas_done,
 							   env, i);
 			/* TODO Check the logic here */
 			if (schema_def == schema_done)
@@ -451,7 +451,7 @@
 				    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
 						    AXIS2_FAILURE);
 			}
-			AXIS2_ARRAY_LIST_ADD(builder_impl->f_schemas_done, env, schema_def);
+			axis2_array_list_add(builder_impl->f_schemas_done, env, schema_def);
 		  }
 	    }
       }
@@ -486,13 +486,13 @@
 	    element_table = XML_SCHEMA_GET_ELEMENTS(schema_def, env);
 	    qnames = XML_SCHEMA_OBJ_TABLE_GET_NAMES(element_table, env);
 	    if (qnames)
-		  size = AXIS2_ARRAY_LIST_SIZE(qnames, env);
+		  size = axis2_array_list_size(qnames, env);
 	    for (i = 0; i < size; i++)
 	    {
 		  axis2_qname_t *qname = NULL;
 		  axis2_char_t *namespc = NULL;
 
-		  qname = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(qnames, env, i);
+		  qname = (axis2_qname_t *) axis2_array_list_get(qnames, env, i);
 		  if (qname)
 			namespc = AXIS2_QNAME_GET_URI(qname, env);
 		  if (namespc && 0 == AXIS2_STRCMP(namespc, schema_tns))
@@ -543,13 +543,13 @@
 	    type_table = XML_SCHEMA_GET_SCHEMA_TYPES(schema_def, env);
 	    qnames = XML_SCHEMA_OBJ_TABLE_GET_NAMES(type_table, env);
 	    if (qnames)
-		  size = AXIS2_ARRAY_LIST_SIZE(qnames, env);
+		  size = axis2_array_list_size(qnames, env);
 	    for (i = 0; i < size; i++)
 	    {
 		  axis2_qname_t *qname = NULL;
 		  axis2_char_t *namespc = NULL;
 
-		  qname = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(qnames, env, i);
+		  qname = (axis2_qname_t *) axis2_array_list_get(qnames, env, i);
 		  if (qname)
 			namespc = AXIS2_QNAME_GET_URI(qname, env);
 		  if (0 == AXIS2_STRCMP(namespc, schema_tns))
@@ -593,14 +593,14 @@
       AXIS2_PARAM_CHECK(env->error, msg_els, AXIS2_FAILURE);
       builder_impl = AXIS2_INTF_TO_IMPL(builder);
 
-      size = AXIS2_ARRAY_LIST_SIZE(msg_els, env);
+      size = axis2_array_list_size(msg_els, env);
       for (i = 0; i < size; i++)
       {
 	    void *msg_impl = NULL;
 
-	    msg_impl = AXIS2_ARRAY_LIST_GET(msg_els, env, i);
+	    msg_impl = axis2_array_list_get(msg_els, env, i);
 	    if (!builder_impl->f_msgs_done || (AXIS2_TRUE !=
-					       AXIS2_ARRAY_LIST_CONTAINS(builder_impl->f_msgs_done, env,
+					       axis2_array_list_contains(builder_impl->f_msgs_done, env,
 									 msg_impl)))
 	    {
 		  WODEN_WSDL10_DESC_ADD_TO_ALL_MSGS(builder_impl->f_desc,
@@ -613,7 +613,7 @@
 			      AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
 					      AXIS2_FAILURE);
 		  }
-		  AXIS2_ARRAY_LIST_ADD(builder_impl->f_msgs_done, env, msg_impl);
+		  axis2_array_list_add(builder_impl->f_msgs_done, env, msg_impl);
 	    }
       }
       return AXIS2_SUCCESS;
@@ -675,15 +675,15 @@
       interface_els = WODEN_WSDL10_DESC_ELEMENT_GET_INTERFACE_ELEMENTS(desc, env);
       if (interface_els)
       {
-	    size = AXIS2_ARRAY_LIST_SIZE(interface_els, env);
+	    size = axis2_array_list_size(interface_els, env);
       }
       for (i = 0; i < size; i++)
       {
 	    void *int_impl = NULL;
 
-	    int_impl = AXIS2_ARRAY_LIST_GET(interface_els, env, i);
+	    int_impl = axis2_array_list_get(interface_els, env, i);
 	    if (!builder_impl->f_interfaces_done || AXIS2_TRUE !=
-                AXIS2_ARRAY_LIST_CONTAINS(builder_impl->f_interfaces_done, env,
+                axis2_array_list_contains(builder_impl->f_interfaces_done, env,
 					  int_impl))
 	    {
 		  axis2_array_list_t *property_els = NULL;
@@ -705,7 +705,7 @@
 			      AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
 					      AXIS2_FAILURE);
 		  }
-		  AXIS2_ARRAY_LIST_ADD(builder_impl->f_interfaces_done, env, int_impl);
+		  axis2_array_list_add(builder_impl->f_interfaces_done, env, int_impl);
 	    }
       }
       return AXIS2_SUCCESS;
@@ -729,7 +729,7 @@
       ops = WODEN_INTERFACE_ELEMENT_GET_INTERFACE_OP_ELEMENTS(
 	    interface, env);
       if (ops)
-	    size = AXIS2_ARRAY_LIST_SIZE(ops, env);
+	    size = axis2_array_list_size(ops, env);
       for (i = 0; i < size; i++)
       {
 	    void *op = NULL;
@@ -737,7 +737,7 @@
 	    void *nested_confble = NULL;
 	    void *confble = NULL;
 
-	    op = AXIS2_ARRAY_LIST_GET(ops, env, i);
+	    op = axis2_array_list_get(ops, env, i);
 	    nested_confble = WODEN_INTERFACE_OP_GET_BASE_IMPL(op, env);
 	    confble = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(nested_confble, env);
 	    confble = woden_configurable_to_configurable_element(confble, env);
@@ -768,14 +768,14 @@
       fault_refs = WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_FAULT_REF_ELEMENTS(
 	    op, env);
       if (fault_refs)
-	    size = AXIS2_ARRAY_LIST_SIZE(fault_refs, env);
+	    size = axis2_array_list_size(fault_refs, env);
       for (i = 0; i < size; i++)
       {
 	    void *fault_ref = NULL;
 	    axis2_array_list_t *property_elements = NULL;
 	    axis2_qname_t *qname = NULL;
 
-	    fault_ref = AXIS2_ARRAY_LIST_GET(fault_refs, env, i);
+	    fault_ref = axis2_array_list_get(fault_refs, env, i);
 	    fault_ref = woden_wsdl10_interface_fault_ref_to_configurable_element(fault_ref, env);
 	    property_elements = WODEN_CONFIGURABLE_ELEMENT_GET_PROPERTY_ELEMENTS(
 		  fault_ref, env);
@@ -812,12 +812,12 @@
       int_msg_refs = WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_MSG_REF_ELEMENTS(
 	    op, env);
       if (int_msg_refs)
-	    size = AXIS2_ARRAY_LIST_SIZE(int_msg_refs, env);
+	    size = axis2_array_list_size(int_msg_refs, env);
       for (i = 0; i < size; i++)
       {
 	    void *int_msg_ref = NULL;
 	    axis2_qname_t *qname = NULL;
-	    int_msg_ref = AXIS2_ARRAY_LIST_GET(int_msg_refs, env, i);
+	    int_msg_ref = axis2_array_list_get(int_msg_refs, env, i);
 	    int_msg_ref = woden_wsdl10_interface_msg_ref_to_configurable_element(int_msg_ref, env);
 
 
@@ -859,14 +859,14 @@
       desc = woden_wsdl10_desc_to_desc_element(desc, env);
       binding_els = WODEN_WSDL10_DESC_ELEMENT_GET_BINDING_ELEMENTS(desc, env);
       if (binding_els)
-	    size = AXIS2_ARRAY_LIST_SIZE(binding_els, env);
+	    size = axis2_array_list_size(binding_els, env);
       for (i = 0; i < size; i++)
       {
 	    void *bind_impl = NULL;
 
-	    bind_impl = AXIS2_ARRAY_LIST_GET(binding_els, env, i);
+	    bind_impl = axis2_array_list_get(binding_els, env, i);
 	    if (builder_impl->f_bindings_done && AXIS2_TRUE !=
-                AXIS2_ARRAY_LIST_CONTAINS(builder_impl->f_bindings_done,
+                axis2_array_list_contains(builder_impl->f_bindings_done,
 					  env, bind_impl))
 	    {
 		  axis2_array_list_t *property_elements = NULL;
@@ -886,7 +886,7 @@
 			      AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
 					      AXIS2_FAILURE);
 		  }
-		  AXIS2_ARRAY_LIST_ADD(builder_impl->f_bindings_done, env, bind_impl);
+		  axis2_array_list_add(builder_impl->f_bindings_done, env, bind_impl);
 
 	    }
       }
@@ -911,13 +911,13 @@
       ops = WODEN_BINDING_ELEMENT_GET_BINDING_OP_ELEMENTS(
 	    binding, env);
       if (ops)
-	    size = AXIS2_ARRAY_LIST_SIZE(ops, env);
+	    size = axis2_array_list_size(ops, env);
       for (i = 0; i < size; i++)
       {
 	    void *op = NULL;
 	    axis2_array_list_t *property_elements = NULL;
 
-	    op = AXIS2_ARRAY_LIST_GET(ops, env, i);
+	    op = axis2_array_list_get(ops, env, i);
 	    op = woden_wsdl10_binding_op_to_configurable_element(op, env);
 	    property_elements = WODEN_CONFIGURABLE_ELEMENT_GET_PROPERTY_ELEMENTS(
 		  op, env);
@@ -948,12 +948,12 @@
       fault_refs = WODEN_WSDL10_BINDING_OP_ELEMENT_GET_BINDING_FAULT_REF_ELEMENTS(
 	    op, env);
       if (fault_refs)
-	    size = AXIS2_ARRAY_LIST_SIZE(fault_refs, env);
+	    size = axis2_array_list_size(fault_refs, env);
       for (i = 0; i < size; i++)
       {
 	    void *fault_ref = NULL;
 
-	    fault_ref = AXIS2_ARRAY_LIST_GET(fault_refs, env, i);
+	    fault_ref = axis2_array_list_get(fault_refs, env, i);
 	    build_binding_fault_ref_exts(builder, env, fault_ref);
       }
       return AXIS2_SUCCESS;
@@ -977,12 +977,12 @@
       msgs = WODEN_WSDL10_BINDING_OP_ELEMENT_GET_BINDING_MSG_REF_ELEMENTS(
 	    op, env);
       if (msgs)
-	    size = AXIS2_ARRAY_LIST_SIZE(msgs, env);
+	    size = axis2_array_list_size(msgs, env);
       for (i = 0; i < size; i++)
       {
 	    void *msg = NULL;
 
-	    msg = AXIS2_ARRAY_LIST_GET(msgs, env, i);
+	    msg = axis2_array_list_get(msgs, env, i);
 	    build_binding_msg_ref_exts(builder, env, msg);
       }
       return AXIS2_SUCCESS;
@@ -1014,7 +1014,7 @@
        * First, create a Component Extensions object for each registered extension namespace 
        * used with this binding. 
        */
-      size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
+      size = axis2_array_list_size(ext_namespcs, env);
       for (i = 0; i < size; i++)
       {
 	    axis2_uri_t *ext_ns = NULL;
@@ -1025,7 +1025,7 @@
 	    void *docble = NULL;
 	    void *confble = NULL;
 
-	    ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
+	    ext_ns = axis2_array_list_get(ext_namespcs, env, i);
 
 	    confble = WODEN_BINDING_GET_BASE_IMPL(binding, env);
 	    docble = WODEN_CONFIGURABLE_GET_BASE_IMPL(confble, env);
@@ -1109,7 +1109,7 @@
       er = WODEN_WSDL10_DESC_ELEMENT_GET_EXT_REGISTRY(builder_impl->f_desc, env);
       ext_namespcs = WODEN_WSDL10_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_op");
       if (ext_namespcs)
-	    size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
+	    size = axis2_array_list_size(ext_namespcs, env);
       /*
        * First, create a Component Extensions object for each registered extension 
        * namespace used with this binding operation. 
@@ -1120,7 +1120,7 @@
 	    axis2_bool_t temp1 = AXIS2_FALSE;
 	    axis2_bool_t temp2 = AXIS2_FALSE;
 
-	    ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
+	    ext_ns = axis2_array_list_get(ext_namespcs, env, i);
 	    bind_op = woden_wsdl10_binding_op_to_attr_extensible(
 		  bind_op, env);
 	    temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -1200,14 +1200,14 @@
       er = WODEN_WSDL10_DESC_ELEMENT_GET_EXT_REGISTRY(builder_impl->f_desc, env);
       ext_namespcs = WODEN_WSDL10_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_msg_ref");
       if (ext_namespcs)
-	    size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
+	    size = axis2_array_list_size(ext_namespcs, env);
       for (i = 0; i < size; i++)
       {
 	    axis2_uri_t *ext_ns = NULL;
 	    axis2_bool_t temp1 = AXIS2_FALSE;
 	    axis2_bool_t temp2 = AXIS2_FALSE;
 
-	    ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
+	    ext_ns = axis2_array_list_get(ext_namespcs, env, i);
 	    bind_msg_ref = woden_wsdl10_binding_msg_ref_to_attr_extensible(
 		  bind_msg_ref, env);
 	    temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -1249,14 +1249,14 @@
       er = WODEN_WSDL10_DESC_ELEMENT_GET_EXT_REGISTRY(builder_impl->f_desc, env);
       ext_namespcs = WODEN_WSDL10_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_fault_ref");
       if (ext_namespcs)
-	    size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
+	    size = axis2_array_list_size(ext_namespcs, env);
       for (i = 0; i < size; i++)
       {
 	    axis2_uri_t *ext_ns = NULL;
 	    axis2_bool_t temp1 = AXIS2_FALSE;
 	    axis2_bool_t temp2 = AXIS2_FALSE;
 
-	    ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
+	    ext_ns = axis2_array_list_get(ext_namespcs, env, i);
 	    bind_fault_ref = woden_binding_fault_ref_to_attr_extensible(
 		  bind_fault_ref, env);
 	    temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -1331,14 +1331,14 @@
       desc = woden_wsdl10_desc_to_desc_element(desc, env);
       svcs = WODEN_WSDL10_DESC_ELEMENT_GET_SVC_ELEMENTS(desc, env);
       if (svcs)
-	    size = AXIS2_ARRAY_LIST_SIZE(svcs, env);
+	    size = axis2_array_list_size(svcs, env);
       for (i = 0; i < size; i++)
       {
 	    void *svc = NULL;
 
-	    svc = AXIS2_ARRAY_LIST_GET(svcs, env, i);
+	    svc = axis2_array_list_get(svcs, env, i);
 	    if (builder_impl->f_svcs_done &&
-                (AXIS2_TRUE != AXIS2_ARRAY_LIST_CONTAINS(builder_impl->f_svcs_done,
+                (AXIS2_TRUE != axis2_array_list_contains(builder_impl->f_svcs_done,
 							 env, svc)))
 	    {
 		  WODEN_WSDL10_DESC_ADD_TO_ALL_SVCS(builder_impl->f_desc, env, svc);
@@ -1352,7 +1352,7 @@
 			      return AXIS2_FAILURE;
 			}
 		  }
-		  AXIS2_ARRAY_LIST_ADD(builder_impl->f_svcs_done, env, svc);
+		  axis2_array_list_add(builder_impl->f_svcs_done, env, svc);
 	    }
       }
       return AXIS2_SUCCESS;
@@ -1378,13 +1378,13 @@
       AXIS2_PARAM_CHECK(env->error, parent, AXIS2_FAILURE);
       builder_impl = AXIS2_INTF_TO_IMPL(builder);
 
-      size = AXIS2_ARRAY_LIST_SIZE(prop_els, env);
+      size = axis2_array_list_size(prop_els, env);
       for (i = 0; i < size; i++)
       {
 	    void *prop = NULL;
 	    axis2_qname_t *qname = NULL;
 
-	    prop = AXIS2_ARRAY_LIST_GET(prop_els, env, i);
+	    prop = axis2_array_list_get(prop_els, env, i);
 	    prop = woden_property_to_property_element(prop, env);
 	    qname = WODEN_PROPERTY_ELEMENT_GET_CONSTRAINT_QNAME(prop, env);
 	    if (qname)

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c Tue Mar  6 01:15:20 2007
@@ -1069,16 +1069,16 @@
       {
 	    int i = 0, size = 0;
 
-	    size = AXIS2_ARRAY_LIST_SIZE(desc_impl->f_import_elements, env);
+	    size = axis2_array_list_size(desc_impl->f_import_elements, env);
 	    for (i = 0; i < size; i++)
 	    {
 		  woden_import_t *import = NULL;
 
-		  import = (woden_import_t *) AXIS2_ARRAY_LIST_GET(desc_impl->
+		  import = (woden_import_t *) axis2_array_list_get(desc_impl->
 								   f_import_elements, env, i);
 		  WODEN_IMPORT_FREE(import, env);
 	    }
-	    AXIS2_ARRAY_LIST_FREE(desc_impl->f_import_elements, env);
+	    axis2_array_list_free(desc_impl->f_import_elements, env);
 	    desc_impl->f_import_elements = NULL;
       }
       /* TODO free f_namespcs */
@@ -1398,11 +1398,11 @@
       if (AXIS2_TRUE != desc_impl->f_component_initialized)
 	    woden_wsdl10_desc_init_components(desc, env);
       if (desc_impl->f_all_element_decls)
-	    size = AXIS2_ARRAY_LIST_SIZE(desc_impl->f_all_element_decls, env);
+	    size = axis2_array_list_size(desc_impl->f_all_element_decls, env);
       for (i = 0; i < size; i++)
       {
 	    axis2_qname_t *qname_l = NULL;
-	    void *ed = AXIS2_ARRAY_LIST_GET(desc_impl->f_all_element_decls, env, i);
+	    void *ed = axis2_array_list_get(desc_impl->f_all_element_decls, env, i);
 	    qname_l = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
 	    if (0 == AXIS2_QNAME_EQUALS(qname, env, qname_l))
 	    {
@@ -1450,11 +1450,11 @@
 
       if (AXIS2_TRUE != desc_impl->f_component_initialized)
 	    woden_wsdl10_desc_init_components(desc, env);
-      size = AXIS2_ARRAY_LIST_SIZE(desc_impl->f_all_element_decls, env);
+      size = axis2_array_list_size(desc_impl->f_all_element_decls, env);
       for (i = 0; i < size; i++)
       {
 	    axis2_qname_t *qname_l = NULL;
-	    void *ed = AXIS2_ARRAY_LIST_GET(desc_impl->f_all_element_decls, env, i);
+	    void *ed = axis2_array_list_get(desc_impl->f_all_element_decls, env, i);
 	    qname_l = WODEN_TYPE_DEF_GET_QNAME(ed, env);
 	    if (0 == AXIS2_QNAME_EQUALS(qname, env, qname_l))
 	    {
@@ -1661,7 +1661,7 @@
       desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
-      return AXIS2_ARRAY_LIST_ADD(desc_impl->f_import_elements, env, import_el);
+      return axis2_array_list_add(desc_impl->f_import_elements, env, import_el);
 }
 
 axis2_array_list_t *AXIS2_CALL
@@ -1695,7 +1695,7 @@
       desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
-      return AXIS2_ARRAY_LIST_ADD(desc_impl->f_include_elements, env, include_el);
+      return axis2_array_list_add(desc_impl->f_include_elements, env, include_el);
 }
 
 axis2_array_list_t *AXIS2_CALL
@@ -1768,7 +1768,7 @@
       desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
-      return AXIS2_ARRAY_LIST_ADD(desc_impl->f_msg_elements, env, intface);
+      return axis2_array_list_add(desc_impl->f_msg_elements, env, intface);
 }
 
 axis2_array_list_t *AXIS2_CALL
@@ -1803,7 +1803,7 @@
       desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
-      return AXIS2_ARRAY_LIST_ADD(desc_impl->f_interface_elements, env, intface);
+      return axis2_array_list_add(desc_impl->f_interface_elements, env, intface);
 }
 
 axis2_array_list_t *AXIS2_CALL
@@ -1837,7 +1837,7 @@
       desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
-      return AXIS2_ARRAY_LIST_ADD(desc_impl->f_binding_elements, env, binding);
+      return axis2_array_list_add(desc_impl->f_binding_elements, env, binding);
 }
 
 axis2_array_list_t *AXIS2_CALL
@@ -1871,7 +1871,7 @@
       desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
-      return AXIS2_ARRAY_LIST_ADD(desc_impl->f_svc_elements, env, svc_el);
+      return axis2_array_list_add(desc_impl->f_svc_elements, env, svc_el);
 }
 
 axis2_array_list_t *AXIS2_CALL
@@ -2121,7 +2121,7 @@
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
-    return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_msgs, env, msg);
+    return axis2_array_list_add(desc_impl->f_all_msgs, env, msg);
 }
 
 axis2_status_t AXIS2_CALL
@@ -2139,7 +2139,7 @@
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
-    return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_interfaces, env, interface);
+    return axis2_array_list_add(desc_impl->f_all_interfaces, env, interface);
 }
 
 axis2_status_t AXIS2_CALL
@@ -2157,7 +2157,7 @@
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
-    return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_bindings, env, binding);
+    return axis2_array_list_add(desc_impl->f_all_bindings, env, binding);
 }
 
 axis2_status_t AXIS2_CALL
@@ -2175,7 +2175,7 @@
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
-    return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_svcs, env, svc);
+    return axis2_array_list_add(desc_impl->f_all_svcs, env, svc);
 }
 
 axis2_status_t AXIS2_CALL
@@ -2202,7 +2202,7 @@
             return AXIS2_FAILURE;
         }
     }
-    return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_element_decls, env, element_decl);
+    return axis2_array_list_add(desc_impl->f_all_element_decls, env, element_decl);
 }
 
 axis2_status_t AXIS2_CALL
@@ -2220,7 +2220,7 @@
     desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
-    return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_type_defs, env, type_def);
+    return axis2_array_list_add(desc_impl->f_all_type_defs, env, type_def);
 }
 
 static axis2_status_t AXIS2_CALL

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c Tue Mar  6 01:15:20 2007
@@ -635,7 +635,7 @@
 
       if (svc_impl->f_endpoints)
       {
-	    AXIS2_ARRAY_LIST_FREE(svc_impl->f_endpoints, env);
+	    axis2_array_list_free(svc_impl->f_endpoints, env);
 	    svc_impl->f_endpoints = NULL;
       }
 
@@ -916,7 +916,7 @@
 	    }
       }
 
-      return AXIS2_ARRAY_LIST_ADD(svc_impl->f_endpoints, env, endpoint);
+      return axis2_array_list_add(svc_impl->f_endpoints, env, endpoint);
 }
 
 axis2_array_list_t *AXIS2_CALL

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c Tue Mar  6 01:15:20 2007
@@ -622,7 +622,7 @@
 
     if (header_block_impl->f_documentation_elements)
     {
-        AXIS2_ARRAY_LIST_FREE(header_block_impl->f_documentation_elements, env);
+        axis2_array_list_free(header_block_impl->f_documentation_elements, env);
         header_block_impl->f_documentation_elements = NULL;
     }
 
@@ -1010,7 +1010,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(header_block_impl->f_documentation_elements, env, doc_el);
+    axis2_array_list_add(header_block_impl->f_documentation_elements, env, doc_el);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c Tue Mar  6 01:15:20 2007
@@ -545,7 +545,7 @@
 
     if (module_impl->f_documentation_elements)
     {
-        AXIS2_ARRAY_LIST_FREE(module_impl->f_documentation_elements, env);
+        axis2_array_list_free(module_impl->f_documentation_elements, env);
         module_impl->f_documentation_elements = NULL;
     }
 
@@ -827,7 +827,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(module_impl->f_documentation_elements, env, doc_el);
+    axis2_array_list_add(module_impl->f_documentation_elements, env, doc_el);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c Tue Mar  6 01:15:20 2007
@@ -459,7 +459,7 @@
             void *v = NULL;
 
             axis2_hash_this(i, NULL, NULL, &v);
-            AXIS2_ARRAY_LIST_ADD(registry_impl->key_set, env, v);
+            axis2_array_list_add(registry_impl->key_set, env, v);
         }
     }
     return registry_impl->key_set;
@@ -691,7 +691,7 @@
             const void *key = NULL;
 
             axis2_hash_this(i, &key, NULL, NULL);
-            AXIS2_ARRAY_LIST_ADD(registry_impl->key_set, env, key);
+            axis2_array_list_add(registry_impl->key_set, env, key);
         }
     }
     return registry_impl->key_set;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c Tue Mar  6 01:15:20 2007
@@ -809,13 +809,13 @@
 
     if (binding_op_impl->f_msg_refs)
     {
-        AXIS2_ARRAY_LIST_FREE(binding_op_impl->f_msg_refs, env);
+        axis2_array_list_free(binding_op_impl->f_msg_refs, env);
         binding_op_impl->f_msg_refs = NULL;
     }
 
     if (binding_op_impl->f_fault_refs)
     {
-        AXIS2_ARRAY_LIST_FREE(binding_op_impl->f_fault_refs, env);
+        axis2_array_list_free(binding_op_impl->f_fault_refs, env);
         binding_op_impl->f_fault_refs = NULL;
     }
 
@@ -1109,7 +1109,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(binding_op_impl->f_msg_refs, env, msg_ref);
+    axis2_array_list_add(binding_op_impl->f_msg_refs, env, msg_ref);
 
     return AXIS2_SUCCESS;
 }
@@ -1130,8 +1130,8 @@
     binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
-    index = AXIS2_ARRAY_LIST_INDEX_OF(binding_op_impl->f_msg_refs, env, msg_ref);
-    AXIS2_ARRAY_LIST_REMOVE(binding_op_impl->f_msg_refs, env, index);
+    index = axis2_array_list_index_of(binding_op_impl->f_msg_refs, env, msg_ref);
+    axis2_array_list_remove(binding_op_impl->f_msg_refs, env, index);
     return AXIS2_SUCCESS;
 }
 
@@ -1176,7 +1176,7 @@
             return AXIS2_FAILURE;
         }
     }
-    AXIS2_ARRAY_LIST_ADD(binding_op_impl->f_fault_refs, env, fault_ref);
+    axis2_array_list_add(binding_op_impl->f_fault_refs, env, fault_ref);
 
     return AXIS2_SUCCESS;
 }
@@ -1197,8 +1197,8 @@
     binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
-    index = AXIS2_ARRAY_LIST_INDEX_OF(binding_op_impl->f_fault_refs, env, fault_ref);
-    AXIS2_ARRAY_LIST_REMOVE(binding_op_impl->f_fault_refs, env, index);
+    index = axis2_array_list_index_of(binding_op_impl->f_fault_refs, env, fault_ref);
+    axis2_array_list_remove(binding_op_impl->f_fault_refs, env, index);
     return AXIS2_SUCCESS;
 }
 



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