axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r524225 [17/22] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/src/util/ include/ modules/core/addr/ modules/core/clientapi/ modules/core/context/ modules...
Date Fri, 30 Mar 2007 18:28:34 GMT
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=524225&r1=524224&r2=524225
==============================================================================
--- 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 Fri Mar 30 11:28:18 2007
@@ -37,7 +37,7 @@
 #include <woden_qname_or_token_any_attr.h>
 #include <woden_qname_list_or_token_any_attr.h>
 #include <axis2_uri.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
 
 typedef struct woden_ext_registry_impl woden_ext_registry_impl_t;
 
@@ -52,24 +52,24 @@
     This is a Map of Maps. The top-level Map is keyed by parent type,
     and the inner Maps are keyed by element QN.
     */
-    axis2_hash_t *deserializer_reg;
+    axutil_hash_t *deserializer_reg;
     /*
     This is a Map of Maps. The top-level Map is keyed by parent type,
     and the inner Maps are keyed by element QN.
     */
-    axis2_hash_t *ext_element_reg;
+    axutil_hash_t *ext_element_reg;
     /*
     This is a Map of Maps. The top-level Map is keyed by parent type,
     and the inner Maps are keyed by attr qname.
     */
-    axis2_hash_t *ext_attr_reg;
+    axutil_hash_t *ext_attr_reg;
 
     /*
     * This is a Map of Maps. The top-level Map is keyed by parent component
     * and the inner Map is keyed by (URI)extension namespace with a value of
     * component extensions.
     */
-    axis2_hash_t *comp_ext_reg;
+    axutil_hash_t *comp_ext_reg;
 
     axutil_array_list_t *key_set;
 
@@ -228,25 +228,25 @@
     registry_impl->registry.ops->query_component_ext_namespaces =
         woden_ext_registry_query_component_ext_namespaces;
 
-    registry_impl->ext_attr_reg = axis2_hash_make(env);
+    registry_impl->ext_attr_reg = axutil_hash_make(env);
     if (!registry_impl->ext_attr_reg)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    registry_impl->deserializer_reg = axis2_hash_make(env);
+    registry_impl->deserializer_reg = axutil_hash_make(env);
     if (!registry_impl->deserializer_reg)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    registry_impl->ext_element_reg = axis2_hash_make(env);
+    registry_impl->ext_element_reg = axutil_hash_make(env);
     if (!registry_impl->ext_element_reg)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    registry_impl->comp_ext_reg = axis2_hash_make(env);
+    registry_impl->comp_ext_reg = axutil_hash_make(env);
     if (!registry_impl->comp_ext_reg)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -325,22 +325,22 @@
     void *ed)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_deserializer_reg = NULL;
+    axutil_hash_t *inner_deserializer_reg = NULL;
     axis2_char_t *element_type = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_deserializer_reg = axis2_hash_get(registry_impl->deserializer_reg,
+    inner_deserializer_reg = axutil_hash_get(registry_impl->deserializer_reg,
             parent_type, AXIS2_HASH_KEY_STRING);
     if (! inner_deserializer_reg)
     {
-        inner_deserializer_reg = axis2_hash_make(env);
-        axis2_hash_set(registry_impl->deserializer_reg, parent_type,
+        inner_deserializer_reg = axutil_hash_make(env);
+        axutil_hash_set(registry_impl->deserializer_reg, parent_type,
                 AXIS2_HASH_KEY_STRING, inner_deserializer_reg);
     }
     element_type = axis2_qname_to_string(element_qtype, env);
-    axis2_hash_set(inner_deserializer_reg, element_type, AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(inner_deserializer_reg, element_type, AXIS2_HASH_KEY_STRING,
             ed);
     return AXIS2_SUCCESS;
 }
@@ -369,19 +369,19 @@
     axis2_qname_t *element_type)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_deserializer_reg = NULL;
+    axutil_hash_t *inner_deserializer_reg = NULL;
     axis2_char_t *elem_name = NULL;
     void *ed = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_deserializer_reg = axis2_hash_get(registry_impl->deserializer_reg,
+    inner_deserializer_reg = axutil_hash_get(registry_impl->deserializer_reg,
             parent_type, AXIS2_HASH_KEY_STRING);
     elem_name = axis2_qname_to_string(element_type, env);
     if (inner_deserializer_reg)
     {
-        ed = axis2_hash_get(inner_deserializer_reg, elem_name,
+        ed = axutil_hash_get(inner_deserializer_reg, elem_name,
                 AXIS2_HASH_KEY_STRING);
     }
     return ed;
@@ -408,19 +408,19 @@
     axis2_qname_t *elem_qn)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_ext_attr_reg = NULL;
+    axutil_hash_t *inner_ext_attr_reg = NULL;
     axis2_char_t *elem_name = NULL;
     void *element = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_ext_attr_reg = axis2_hash_get(registry_impl->ext_attr_reg,
+    inner_ext_attr_reg = axutil_hash_get(registry_impl->ext_attr_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
     elem_name = axis2_qname_to_string(elem_qn, env);
     if (inner_ext_attr_reg)
     {
-        element = axis2_hash_get(inner_ext_attr_reg, elem_name,
+        element = axutil_hash_get(inner_ext_attr_reg, elem_name,
                 AXIS2_HASH_KEY_STRING);
     }
     return element;
@@ -441,24 +441,24 @@
     axis2_char_t *parent_type)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_deserializer_reg = NULL;
+    axutil_hash_t *inner_deserializer_reg = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_deserializer_reg = axis2_hash_get(registry_impl->deserializer_reg,
+    inner_deserializer_reg = axutil_hash_get(registry_impl->deserializer_reg,
             parent_type, AXIS2_HASH_KEY_STRING);
     if (inner_deserializer_reg)
     {
-        axis2_hash_index_t *i = NULL;
+        axutil_hash_index_t *i = NULL;
 
         registry_impl->key_set = axutil_array_list_create(env, 0);
-        for (i = axis2_hash_first(inner_deserializer_reg, env); i; i =
-                    axis2_hash_next(env, i))
+        for (i = axutil_hash_first(inner_deserializer_reg, env); i; i =
+                    axutil_hash_next(env, i))
         {
             void *v = NULL;
 
-            axis2_hash_this(i, NULL, NULL, &v);
+            axutil_hash_this(i, NULL, NULL, &v);
             axutil_array_list_add(registry_impl->key_set, env, v);
         }
     }
@@ -490,22 +490,22 @@
     void *element)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_ext_type_reg = NULL;
+    axutil_hash_t *inner_ext_type_reg = NULL;
     axis2_char_t *element_type = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_ext_type_reg = axis2_hash_get(registry_impl->ext_element_reg,
+    inner_ext_type_reg = axutil_hash_get(registry_impl->ext_element_reg,
             parent_type, AXIS2_HASH_KEY_STRING);
     if (! inner_ext_type_reg)
     {
-        inner_ext_type_reg = axis2_hash_make(env);
-        axis2_hash_set(registry_impl->ext_element_reg, parent_type,
+        inner_ext_type_reg = axutil_hash_make(env);
+        axutil_hash_set(registry_impl->ext_element_reg, parent_type,
                 AXIS2_HASH_KEY_STRING, inner_ext_type_reg);
     }
     element_type = axis2_qname_to_string(element_qtype, env);
-    axis2_hash_set(inner_ext_type_reg, element_type, AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(inner_ext_type_reg, element_type, AXIS2_HASH_KEY_STRING,
             element);
     return AXIS2_SUCCESS;
 }
@@ -533,22 +533,22 @@
     void *attr)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_ext_attr_reg = NULL;
+    axutil_hash_t *inner_ext_attr_reg = NULL;
     axis2_char_t *attr_name = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_ext_attr_reg = axis2_hash_get(registry_impl->ext_attr_reg,
+    inner_ext_attr_reg = axutil_hash_get(registry_impl->ext_attr_reg,
             owner_class, AXIS2_HASH_KEY_STRING);
     if (! inner_ext_attr_reg)
     {
-        inner_ext_attr_reg = axis2_hash_make(env);
-        axis2_hash_set(registry_impl->ext_attr_reg, owner_class,
+        inner_ext_attr_reg = axutil_hash_make(env);
+        axutil_hash_set(registry_impl->ext_attr_reg, owner_class,
                 AXIS2_HASH_KEY_STRING, inner_ext_attr_reg);
     }
     attr_name = axis2_qname_to_string(attr_qname, env);
-    axis2_hash_set(inner_ext_attr_reg, attr_name, AXIS2_HASH_KEY_STRING, attr);
+    axutil_hash_set(inner_ext_attr_reg, attr_name, AXIS2_HASH_KEY_STRING, attr);
     return AXIS2_SUCCESS;
 }
 
@@ -572,19 +572,19 @@
     axis2_qname_t *attr_qn)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_ext_attr_reg = NULL;
+    axutil_hash_t *inner_ext_attr_reg = NULL;
     void *attr = NULL;
     axis2_char_t *attr_name = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_ext_attr_reg = axis2_hash_get(registry_impl->ext_attr_reg,
+    inner_ext_attr_reg = axutil_hash_get(registry_impl->ext_attr_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
     attr_name = axis2_qname_to_string(attr_qn, env);
     if (inner_ext_attr_reg)
     {
-        attr = axis2_hash_get(inner_ext_attr_reg, attr_name,
+        attr = axutil_hash_get(inner_ext_attr_reg, attr_name,
                 AXIS2_HASH_KEY_STRING);
     }
     return attr;
@@ -607,22 +607,22 @@
     void *comp_ext)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_comp_ext_reg = NULL;
+    axutil_hash_t *inner_comp_ext_reg = NULL;
     axis2_char_t *namespc = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_comp_ext_reg = axis2_hash_get(registry_impl->comp_ext_reg,
+    inner_comp_ext_reg = axutil_hash_get(registry_impl->comp_ext_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
     if (! inner_comp_ext_reg)
     {
-        inner_comp_ext_reg = axis2_hash_make(env);
-        axis2_hash_set(registry_impl->comp_ext_reg, parent_class,
+        inner_comp_ext_reg = axutil_hash_make(env);
+        axutil_hash_set(registry_impl->comp_ext_reg, parent_class,
                 AXIS2_HASH_KEY_STRING, inner_comp_ext_reg);
     }
     namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
-    axis2_hash_set(inner_comp_ext_reg, namespc, AXIS2_HASH_KEY_STRING, comp_ext);
+    axutil_hash_set(inner_comp_ext_reg, namespc, AXIS2_HASH_KEY_STRING, comp_ext);
     return AXIS2_SUCCESS;
 }
 
@@ -642,19 +642,19 @@
     axis2_uri_t *ext_namespc)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_comp_ext_reg = NULL;
+    axutil_hash_t *inner_comp_ext_reg = NULL;
     void *comp_ext = NULL;
     axis2_char_t *namespc = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_comp_ext_reg = axis2_hash_get(registry_impl->comp_ext_reg,
+    inner_comp_ext_reg = axutil_hash_get(registry_impl->comp_ext_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
     namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
     if (inner_comp_ext_reg)
     {
-        comp_ext = axis2_hash_get(inner_comp_ext_reg, namespc,
+        comp_ext = axutil_hash_get(inner_comp_ext_reg, namespc,
                 AXIS2_HASH_KEY_STRING);
     }
     return comp_ext;
@@ -673,24 +673,24 @@
     axis2_char_t *parent_class)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_comp_ext_reg = NULL;
+    axutil_hash_t *inner_comp_ext_reg = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_comp_ext_reg = axis2_hash_get(registry_impl->comp_ext_reg,
+    inner_comp_ext_reg = axutil_hash_get(registry_impl->comp_ext_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
     registry_impl->key_set = axutil_array_list_create(env, 0);
     if (inner_comp_ext_reg)
     {
-        axis2_hash_index_t *i = NULL;
+        axutil_hash_index_t *i = NULL;
 
-        for (i = axis2_hash_first(inner_comp_ext_reg, env); i; i =
-                    axis2_hash_next(env, i))
+        for (i = axutil_hash_first(inner_comp_ext_reg, env); i; i =
+                    axutil_hash_next(env, i))
         {
             const void *key = NULL;
 
-            axis2_hash_this(i, &key, NULL, NULL);
+            axutil_hash_this(i, &key, NULL, NULL);
             axutil_array_list_add(registry_impl->key_set, env, key);
         }
     }

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_fault.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_fault.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_fault.c Fri Mar 30 11:28:18 2007
@@ -37,8 +37,8 @@
     woden_binding_fault_t binding_fault;
     woden_nested_configurable_t *nested_configurable;
     woden_obj_types_t obj_type;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
     axis2_qname_t *f_ref;
     void *f_interface_fault;
 };
@@ -50,7 +50,7 @@
     void *binding_fault,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_binding_fault_super_objs(
     void *binding_fault,
     const axutil_env_t *env);
@@ -491,35 +491,35 @@
     binding_fault_impl->binding_fault.ops->set_interface_fault_element =
         woden_binding_fault_set_interface_fault_element;
 
-    binding_fault_impl->methods = axis2_hash_make(env);
+    binding_fault_impl->methods = axutil_hash_make(env);
     if (!binding_fault_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_fault_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_fault_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_binding_fault_free);
-    axis2_hash_set(binding_fault_impl->methods, "super_objs",
+    axutil_hash_set(binding_fault_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_binding_fault_super_objs);
-    axis2_hash_set(binding_fault_impl->methods, "type",
+    axutil_hash_set(binding_fault_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_binding_fault_type);
 
-    axis2_hash_set(binding_fault_impl->methods, "get_interface_fault",
+    axutil_hash_set(binding_fault_impl->methods, "get_interface_fault",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_get_interface_fault);
-    axis2_hash_set(binding_fault_impl->methods, "to_element",
+    axutil_hash_set(binding_fault_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_to_element);
-    axis2_hash_set(binding_fault_impl->methods, "set_ref",
+    axutil_hash_set(binding_fault_impl->methods, "set_ref",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_set_ref);
-    axis2_hash_set(binding_fault_impl->methods, "get_ref",
+    axutil_hash_set(binding_fault_impl->methods, "get_ref",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_get_ref);
-    axis2_hash_set(binding_fault_impl->methods, "get_interface_fault_element",
+    axutil_hash_set(binding_fault_impl->methods, "get_interface_fault_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_get_interface_fault_element);
-    axis2_hash_set(binding_fault_impl->methods, "set_interface_fault_element",
+    axutil_hash_set(binding_fault_impl->methods, "set_interface_fault_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_set_interface_fault_element);
 
@@ -537,21 +537,21 @@
 
     binding_fault_impl->nested_configurable = woden_nested_configurable_create(env);
 
-    binding_fault_impl->super = axis2_hash_make(env);
+    binding_fault_impl->super = axutil_hash_make(env);
     if (!binding_fault_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_fault_impl->super, "WODEN_BINDING_FAULT",
+    axutil_hash_set(binding_fault_impl->super, "WODEN_BINDING_FAULT",
             AXIS2_HASH_KEY_STRING,
             &(binding_fault_impl->binding_fault));
-    axis2_hash_set(binding_fault_impl->super, "WODEN_NESTED_CONFIGURABLE",
+    axutil_hash_set(binding_fault_impl->super, "WODEN_NESTED_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING,
             binding_fault_impl->nested_configurable);
     configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
                 binding_fault_impl->nested_configurable, env);
-    axis2_hash_set(binding_fault_impl->super, "WODEN_CONFIGURABLE",
+    axutil_hash_set(binding_fault_impl->super, "WODEN_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING, configurable);
 
     return &(binding_fault_impl->binding_fault);
@@ -697,13 +697,13 @@
 
     if (binding_fault_impl->super)
     {
-        axis2_hash_free(binding_fault_impl->super, env);
+        axutil_hash_free(binding_fault_impl->super, env);
         binding_fault_impl->super = NULL;
     }
 
     if (binding_fault_impl->methods)
     {
-        axis2_hash_free(binding_fault_impl->methods, env);
+        axutil_hash_free(binding_fault_impl->methods, env);
         binding_fault_impl->methods = NULL;
     }
 
@@ -730,7 +730,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_binding_fault_super_objs(
     void *binding_fault,
     const axutil_env_t *env)
@@ -774,7 +774,7 @@
     woden_binding_fault_t *binding_fault,
     const axutil_env_t *env,
     woden_binding_fault_t *binding_fault_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_binding_fault_impl_t *binding_fault_impl_l = NULL;
 
@@ -782,26 +782,26 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     binding_fault_impl_l = INTF_TO_IMPL(binding_fault_impl);
 
-    binding_fault->ops->free = axis2_hash_get(methods, "free",
+    binding_fault->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_fault->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    binding_fault->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    binding_fault->ops->type = axis2_hash_get(methods, "type",
+    binding_fault->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    binding_fault->ops->get_interface_fault = axis2_hash_get(methods,
+    binding_fault->ops->get_interface_fault = axutil_hash_get(methods,
             "get_interface_fault", AXIS2_HASH_KEY_STRING);
     if (!binding_fault->ops->get_interface_fault && binding_fault_impl_l)
         binding_fault->ops->get_interface_fault =
             binding_fault_impl_l->binding_fault.ops->get_interface_fault;
 
-    binding_fault->ops->to_element = axis2_hash_get(methods,
+    binding_fault->ops->to_element = axutil_hash_get(methods,
             "to_element", AXIS2_HASH_KEY_STRING);
     if (!binding_fault->ops->to_element && binding_fault_impl_l)
         binding_fault->ops->to_element =
             binding_fault_impl_l->binding_fault.ops->to_element;
 
-    binding_fault->ops->set_interface_fault_element = axis2_hash_get(methods,
+    binding_fault->ops->set_interface_fault_element = axutil_hash_get(methods,
             "set_interface_fault_element", AXIS2_HASH_KEY_STRING);
     if (!binding_fault->ops->set_interface_fault_element && binding_fault_impl_l)
         binding_fault->ops->set_interface_fault_element =
@@ -819,11 +819,11 @@
     const axutil_env_t *env)
 {
     woden_binding_fault_impl_t *binding_fault_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_FAULT_SUPER_OBJS(binding_fault, env);
-    binding_fault_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT", AXIS2_HASH_KEY_STRING));
 
     return binding_fault_impl->f_interface_fault;
@@ -835,11 +835,11 @@
     const axutil_env_t *env)
 {
     woden_binding_fault_impl_t *binding_fault_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_FAULT_SUPER_OBJS(binding_fault, env);
-    binding_fault_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT", AXIS2_HASH_KEY_STRING));
 
     return &(binding_fault_impl->binding_fault);
@@ -855,12 +855,12 @@
     axis2_qname_t *qname)
 {
     woden_binding_fault_impl_t *binding_fault_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
     super = WODEN_BINDING_FAULT_SUPER_OBJS(binding_fault, env);
-    binding_fault_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT", AXIS2_HASH_KEY_STRING));
 
     if (binding_fault_impl->f_ref)
@@ -877,11 +877,11 @@
     const axutil_env_t *env)
 {
     woden_binding_fault_impl_t *binding_fault_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_FAULT_SUPER_OBJS(binding_fault, env);
-    binding_fault_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT", AXIS2_HASH_KEY_STRING));
 
     return binding_fault_impl->f_ref;
@@ -893,11 +893,11 @@
     const axutil_env_t *env)
 {
     woden_binding_fault_impl_t *binding_fault_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_FAULT_SUPER_OBJS(binding_fault, env);
-    binding_fault_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT", AXIS2_HASH_KEY_STRING));
 
     return binding_fault_impl->f_interface_fault;
@@ -914,12 +914,12 @@
     void *in_fault)
 {
     woden_binding_fault_impl_t *binding_fault_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, in_fault, AXIS2_FAILURE);
     super = WODEN_BINDING_FAULT_SUPER_OBJS(binding_fault, env);
-    binding_fault_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT", AXIS2_HASH_KEY_STRING));
 
     if (!binding_fault_impl->f_interface_fault)

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_msg_ref.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_msg_ref.c Fri Mar 30 11:28:18 2007
@@ -38,8 +38,8 @@
     woden_binding_msg_ref_t binding_msg_ref;
     woden_nested_configurable_t *nested_configurable;
     woden_obj_types_t obj_type;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
     void *f_direction;
     void *f_msg_label;
     void *f_interface_msg_ref;
@@ -52,7 +52,7 @@
     void *binding_msg_ref,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_binding_msg_ref_super_objs(
     void *binding_msg_ref,
     const axutil_env_t *env);
@@ -500,38 +500,38 @@
     binding_msg_ref_impl->binding_msg_ref.ops->set_interface_msg_ref_element =
         woden_binding_msg_ref_set_interface_msg_ref_element;
 
-    binding_msg_ref_impl->methods = axis2_hash_make(env);
+    binding_msg_ref_impl->methods = axutil_hash_make(env);
     if (!binding_msg_ref_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_msg_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_msg_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_binding_msg_ref_free);
-    axis2_hash_set(binding_msg_ref_impl->methods, "super_objs",
+    axutil_hash_set(binding_msg_ref_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_binding_msg_ref_super_objs);
-    axis2_hash_set(binding_msg_ref_impl->methods, "type",
+    axutil_hash_set(binding_msg_ref_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_binding_msg_ref_type);
 
-    axis2_hash_set(binding_msg_ref_impl->methods, "get_interface_msg_ref",
+    axutil_hash_set(binding_msg_ref_impl->methods, "get_interface_msg_ref",
             AXIS2_HASH_KEY_STRING,
             woden_binding_msg_ref_get_interface_msg_ref);
-    axis2_hash_set(binding_msg_ref_impl->methods, "to_element",
+    axutil_hash_set(binding_msg_ref_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_msg_ref_to_element);
-    axis2_hash_set(binding_msg_ref_impl->methods, "set_direction",
+    axutil_hash_set(binding_msg_ref_impl->methods, "set_direction",
             AXIS2_HASH_KEY_STRING,
             woden_binding_msg_ref_set_direction);
-    axis2_hash_set(binding_msg_ref_impl->methods, "get_direction",
+    axutil_hash_set(binding_msg_ref_impl->methods, "get_direction",
             AXIS2_HASH_KEY_STRING,
             woden_binding_msg_ref_get_direction);
-    axis2_hash_set(binding_msg_ref_impl->methods, "set_msg_label",
+    axutil_hash_set(binding_msg_ref_impl->methods, "set_msg_label",
             AXIS2_HASH_KEY_STRING,
             woden_binding_msg_ref_set_msg_label);
-    axis2_hash_set(binding_msg_ref_impl->methods, "get_msg_label",
+    axutil_hash_set(binding_msg_ref_impl->methods, "get_msg_label",
             AXIS2_HASH_KEY_STRING,
             woden_binding_msg_ref_get_msg_label);
-    axis2_hash_set(binding_msg_ref_impl->methods, "set_interface_msg_ref_element",
+    axutil_hash_set(binding_msg_ref_impl->methods, "set_interface_msg_ref_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_msg_ref_set_interface_msg_ref_element);
 
@@ -549,21 +549,21 @@
 
     binding_msg_ref_impl->nested_configurable = woden_nested_configurable_create(env);
 
-    binding_msg_ref_impl->super = axis2_hash_make(env);
+    binding_msg_ref_impl->super = axutil_hash_make(env);
     if (!binding_msg_ref_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_msg_ref_impl->super, "WODEN_BINDING_MSG_REF",
+    axutil_hash_set(binding_msg_ref_impl->super, "WODEN_BINDING_MSG_REF",
             AXIS2_HASH_KEY_STRING,
             &(binding_msg_ref_impl->binding_msg_ref));
-    axis2_hash_set(binding_msg_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
+    axutil_hash_set(binding_msg_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING,
             binding_msg_ref_impl->nested_configurable);
     configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
                 binding_msg_ref_impl->nested_configurable, env);
-    axis2_hash_set(binding_msg_ref_impl->super, "WODEN_CONFIGURABLE",
+    axutil_hash_set(binding_msg_ref_impl->super, "WODEN_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING, configurable);
 
     return &(binding_msg_ref_impl->binding_msg_ref);
@@ -712,13 +712,13 @@
 
     if (binding_msg_ref_impl->super)
     {
-        axis2_hash_free(binding_msg_ref_impl->super, env);
+        axutil_hash_free(binding_msg_ref_impl->super, env);
         binding_msg_ref_impl->super = NULL;
     }
 
     if (binding_msg_ref_impl->methods)
     {
-        axis2_hash_free(binding_msg_ref_impl->methods, env);
+        axutil_hash_free(binding_msg_ref_impl->methods, env);
         binding_msg_ref_impl->methods = NULL;
     }
 
@@ -744,7 +744,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_binding_msg_ref_super_objs(
     void *binding_msg_ref,
     const axutil_env_t *env)
@@ -788,7 +788,7 @@
     woden_binding_msg_ref_t *binding_msg_ref,
     const axutil_env_t *env,
     woden_binding_msg_ref_t *binding_msg_ref_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_binding_msg_ref_impl_t *binding_msg_ref_impl_l = NULL;
 
@@ -796,26 +796,26 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     binding_msg_ref_impl_l = INTF_TO_IMPL(binding_msg_ref_impl);
 
-    binding_msg_ref->ops->free = axis2_hash_get(methods, "free",
+    binding_msg_ref->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_msg_ref->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    binding_msg_ref->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    binding_msg_ref->ops->type = axis2_hash_get(methods, "type",
+    binding_msg_ref->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    binding_msg_ref->ops->get_interface_msg_ref = axis2_hash_get(methods,
+    binding_msg_ref->ops->get_interface_msg_ref = axutil_hash_get(methods,
             "get_interface_msg_ref", AXIS2_HASH_KEY_STRING);
     if (!binding_msg_ref->ops->get_interface_msg_ref && binding_msg_ref_impl_l)
         binding_msg_ref->ops->get_interface_msg_ref =
             binding_msg_ref_impl_l->binding_msg_ref.ops->get_interface_msg_ref;
 
-    binding_msg_ref->ops->to_element = axis2_hash_get(methods,
+    binding_msg_ref->ops->to_element = axutil_hash_get(methods,
             "to_element", AXIS2_HASH_KEY_STRING);
     if (!binding_msg_ref->ops->to_element && binding_msg_ref_impl_l)
         binding_msg_ref->ops->to_element =
             binding_msg_ref_impl_l->binding_msg_ref.ops->to_element;
 
-    binding_msg_ref->ops->set_interface_msg_ref_element = axis2_hash_get(methods,
+    binding_msg_ref->ops->set_interface_msg_ref_element = axutil_hash_get(methods,
             "set_interface_msg_ref_element", AXIS2_HASH_KEY_STRING);
     if (!binding_msg_ref->ops->set_interface_msg_ref_element && binding_msg_ref_impl_l)
         binding_msg_ref->ops->set_interface_msg_ref_element =
@@ -834,11 +834,11 @@
     const axutil_env_t *env)
 {
     woden_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-    binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     return binding_msg_ref_impl->f_interface_msg_ref;
@@ -850,11 +850,11 @@
     const axutil_env_t *env)
 {
     woden_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-    binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     return &(binding_msg_ref_impl->binding_msg_ref);
@@ -872,12 +872,12 @@
     void *dir)
 {
     woden_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, dir, AXIS2_FAILURE);
     super = WODEN_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-    binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     if (!binding_msg_ref_impl->f_direction)
@@ -896,11 +896,11 @@
     const axutil_env_t *env)
 {
     woden_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-    binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     return binding_msg_ref_impl->f_direction;
@@ -913,12 +913,12 @@
     void *msg_label)
 {
     woden_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg_label, AXIS2_FAILURE);
     super = WODEN_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-    binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     if (!binding_msg_ref_impl->f_msg_label)
@@ -937,11 +937,11 @@
     const axutil_env_t *env)
 {
     woden_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-    binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     return binding_msg_ref_impl->f_msg_label;
@@ -958,12 +958,12 @@
     void *int_msg_ref)
 {
     woden_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, int_msg_ref, AXIS2_FAILURE);
     super = WODEN_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-    binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     if (!binding_msg_ref_impl->f_interface_msg_ref)

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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c Fri Mar 30 11:28:18 2007
@@ -36,8 +36,8 @@
     woden_binding_op_t binding_op;
     woden_nested_configurable_t *nested_configurable;
     woden_obj_types_t obj_type;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
     axis2_qname_t *f_ref;
     axutil_array_list_t *f_msg_refs;
     axutil_array_list_t *f_fault_refs;
@@ -51,7 +51,7 @@
     void *binding_op,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_binding_op_super_objs(
     void *binding_op,
     const axutil_env_t *env);
@@ -567,59 +567,59 @@
     binding_op_impl->binding_op.ops->get_interface_op =
         woden_binding_op_get_interface_op;
 
-    binding_op_impl->methods = axis2_hash_make(env);
+    binding_op_impl->methods = axutil_hash_make(env);
     if (!binding_op_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_op_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_op_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_binding_op_free);
-    axis2_hash_set(binding_op_impl->methods, "super_objs",
+    axutil_hash_set(binding_op_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_binding_op_super_objs);
-    axis2_hash_set(binding_op_impl->methods, "type",
+    axutil_hash_set(binding_op_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_binding_op_type);
 
-    axis2_hash_set(binding_op_impl->methods, "get_interface_op",
+    axutil_hash_set(binding_op_impl->methods, "get_interface_op",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_get_interface_op);
-    axis2_hash_set(binding_op_impl->methods, "get_binding_msg_refs",
+    axutil_hash_set(binding_op_impl->methods, "get_binding_msg_refs",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_get_binding_msg_refs);
-    axis2_hash_set(binding_op_impl->methods, "get_binding_fault_refs",
+    axutil_hash_set(binding_op_impl->methods, "get_binding_fault_refs",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_get_binding_fault_refs);
-    axis2_hash_set(binding_op_impl->methods, "to_element",
+    axutil_hash_set(binding_op_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_to_element);
-    axis2_hash_set(binding_op_impl->methods, "set_ref",
+    axutil_hash_set(binding_op_impl->methods, "set_ref",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_set_ref);
-    axis2_hash_set(binding_op_impl->methods, "get_ref",
+    axutil_hash_set(binding_op_impl->methods, "get_ref",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_get_ref);
-    axis2_hash_set(binding_op_impl->methods, "get_interface_op_element",
+    axutil_hash_set(binding_op_impl->methods, "get_interface_op_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_get_interface_op_element);
-    axis2_hash_set(binding_op_impl->methods, "add_binding_msg_ref_element",
+    axutil_hash_set(binding_op_impl->methods, "add_binding_msg_ref_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_add_binding_msg_ref_element);
-    axis2_hash_set(binding_op_impl->methods, "remove_binding_msg_ref_element",
+    axutil_hash_set(binding_op_impl->methods, "remove_binding_msg_ref_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_remove_binding_msg_ref_element);
-    axis2_hash_set(binding_op_impl->methods, "get_binding_msg_ref_elements",
+    axutil_hash_set(binding_op_impl->methods, "get_binding_msg_ref_elements",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_get_binding_msg_ref_elements);
-    axis2_hash_set(binding_op_impl->methods, "add_binding_fault_ref_element",
+    axutil_hash_set(binding_op_impl->methods, "add_binding_fault_ref_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_add_binding_fault_ref_element);
-    axis2_hash_set(binding_op_impl->methods, "remove_binding_fault_ref_element",
+    axutil_hash_set(binding_op_impl->methods, "remove_binding_fault_ref_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_remove_binding_fault_ref_element);
-    axis2_hash_set(binding_op_impl->methods, "get_binding_fault_ref_elements",
+    axutil_hash_set(binding_op_impl->methods, "get_binding_fault_ref_elements",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_get_binding_fault_ref_elements);
-    axis2_hash_set(binding_op_impl->methods, "set_interface_op_element",
+    axutil_hash_set(binding_op_impl->methods, "set_interface_op_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_op_set_interface_op_element);
 
@@ -642,36 +642,36 @@
 
     binding_op_impl->nested_configurable = woden_nested_configurable_create(env);
 
-    binding_op_impl->super = axis2_hash_make(env);
+    binding_op_impl->super = axutil_hash_make(env);
     if (!binding_op_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_op_impl->super, "WODEN_BINDING_OP",
+    axutil_hash_set(binding_op_impl->super, "WODEN_BINDING_OP",
             AXIS2_HASH_KEY_STRING,
             &(binding_op_impl->binding_op));
-    axis2_hash_set(binding_op_impl->super, "WODEN_NESTED_CONFIGURABLE",
+    axutil_hash_set(binding_op_impl->super, "WODEN_NESTED_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING,
             binding_op_impl->nested_configurable);
     configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
                 binding_op_impl->nested_configurable, env);
-    axis2_hash_set(binding_op_impl->super, "WODEN_CONFIGURABLE",
+    axutil_hash_set(binding_op_impl->super, "WODEN_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING, configurable);
     documentable = WODEN_CONFIGURABLE_GET_BASE_IMPL(configurable, env);
     wsdl_obj = WODEN_DOCUMENTABLE_GET_BASE_IMPL(documentable, env);
     wsdl_el = WODEN_WSDL_OBJ_GET_BASE_IMPL(wsdl_obj, env);
     element_extensible = WODEN_WSDL_ELEMENT_GET_ELEMENT_EXTENSIBLE(wsdl_el, env);
     attr_extensible = WODEN_WSDL_ELEMENT_GET_ATTR_EXTENSIBLE(wsdl_el, env);
-    axis2_hash_set(binding_op_impl->super, "WODEN_DOCUMENTABLE",
+    axutil_hash_set(binding_op_impl->super, "WODEN_DOCUMENTABLE",
             AXIS2_HASH_KEY_STRING, documentable);
-    axis2_hash_set(binding_op_impl->super, "WODEN_WSDL_OBJ",
+    axutil_hash_set(binding_op_impl->super, "WODEN_WSDL_OBJ",
             AXIS2_HASH_KEY_STRING, wsdl_obj);
-    axis2_hash_set(binding_op_impl->super, "WODEN_WSDL_ELEMENT",
+    axutil_hash_set(binding_op_impl->super, "WODEN_WSDL_ELEMENT",
             AXIS2_HASH_KEY_STRING, wsdl_el);
-    axis2_hash_set(binding_op_impl->super, "WODEN_ELEMENT_EXTENSIBLE",
+    axutil_hash_set(binding_op_impl->super, "WODEN_ELEMENT_EXTENSIBLE",
             AXIS2_HASH_KEY_STRING, element_extensible);
-    axis2_hash_set(binding_op_impl->super, "WODEN_ATTR_EXTENSIBLE",
+    axutil_hash_set(binding_op_impl->super, "WODEN_ATTR_EXTENSIBLE",
             AXIS2_HASH_KEY_STRING, attr_extensible);
 
 
@@ -827,13 +827,13 @@
 
     if (binding_op_impl->super)
     {
-        axis2_hash_free(binding_op_impl->super, env);
+        axutil_hash_free(binding_op_impl->super, env);
         binding_op_impl->super = NULL;
     }
 
     if (binding_op_impl->methods)
     {
-        axis2_hash_free(binding_op_impl->methods, env);
+        axutil_hash_free(binding_op_impl->methods, env);
         binding_op_impl->methods = NULL;
     }
 
@@ -859,7 +859,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_binding_op_super_objs(
     void *binding_op,
     const axutil_env_t *env)
@@ -903,7 +903,7 @@
     woden_binding_op_t *binding_op,
     const axutil_env_t *env,
     woden_binding_op_t *binding_op_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_binding_op_impl_t *binding_op_impl_l = NULL;
 
@@ -911,42 +911,42 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     binding_op_impl_l = INTF_TO_IMPL(binding_op_impl);
 
-    binding_op->ops->free = axis2_hash_get(methods, "free",
+    binding_op->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
     binding_op->ops->to_binding_op_free =
-        axis2_hash_get(methods, "to_binding_op_free",
+        axutil_hash_get(methods, "to_binding_op_free",
                 AXIS2_HASH_KEY_STRING);
-    binding_op->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    binding_op->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    binding_op->ops->type = axis2_hash_get(methods, "type",
+    binding_op->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    binding_op->ops->get_interface_op = axis2_hash_get(methods,
+    binding_op->ops->get_interface_op = axutil_hash_get(methods,
             "get_interface_op", AXIS2_HASH_KEY_STRING);
     if (!binding_op->ops->get_interface_op && binding_op_impl_l)
         binding_op->ops->get_interface_op =
             binding_op_impl_l->binding_op.ops->get_interface_op;
 
-    binding_op->ops->get_binding_msg_refs = axis2_hash_get(methods,
+    binding_op->ops->get_binding_msg_refs = axutil_hash_get(methods,
             "get_binding_msg_refs", AXIS2_HASH_KEY_STRING);
     if (!binding_op->ops->get_binding_msg_refs && binding_op_impl_l)
         binding_op->ops->get_binding_msg_refs =
             binding_op_impl_l->binding_op.ops->get_binding_msg_refs;
 
-    binding_op->ops->get_binding_fault_refs = axis2_hash_get(methods,
+    binding_op->ops->get_binding_fault_refs = axutil_hash_get(methods,
             "get_binding_fault_refs", AXIS2_HASH_KEY_STRING);
     if (!binding_op->ops->get_binding_fault_refs && binding_op_impl_l)
         binding_op->ops->get_binding_fault_refs =
             binding_op_impl_l->binding_op.ops->get_binding_fault_refs;
 
 
-    binding_op->ops->to_element = axis2_hash_get(methods,
+    binding_op->ops->to_element = axutil_hash_get(methods,
             "to_element", AXIS2_HASH_KEY_STRING);
     if (!binding_op->ops->to_element && binding_op_impl_l)
         binding_op->ops->to_element =
             binding_op_impl_l->binding_op.ops->to_element;
 
-    binding_op->ops->set_interface_op_element = axis2_hash_get(methods,
+    binding_op->ops->set_interface_op_element = axutil_hash_get(methods,
             "set_interface_op_element", AXIS2_HASH_KEY_STRING);
     if (!binding_op->ops->set_interface_op_element && binding_op_impl_l)
         binding_op->ops->set_interface_op_element =
@@ -966,11 +966,11 @@
     const axutil_env_t *env)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     return binding_op_impl->f_msg_refs;
@@ -982,11 +982,11 @@
     const axutil_env_t *env)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     return binding_op_impl->f_fault_refs;
@@ -998,11 +998,11 @@
     const axutil_env_t *env)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     return &(binding_op_impl->binding_op);
@@ -1014,11 +1014,11 @@
     const axutil_env_t *env)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     return binding_op_impl->f_interface_op;
@@ -1034,12 +1034,12 @@
     axis2_qname_t *qname)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     if (binding_op_impl->f_ref)
@@ -1058,11 +1058,11 @@
     const axutil_env_t *env)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     return binding_op_impl->f_ref;
@@ -1074,11 +1074,11 @@
     const axutil_env_t *env)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     return binding_op_impl->f_interface_op;
@@ -1092,12 +1092,12 @@
     void *msg_ref)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg_ref, AXIS2_FAILURE);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     if (!binding_op_impl->f_msg_refs)
@@ -1121,13 +1121,13 @@
     void *msg_ref)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
     int index = 0;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg_ref, AXIS2_FAILURE);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     index = axutil_array_list_index_of(binding_op_impl->f_msg_refs, env, msg_ref);
@@ -1142,11 +1142,11 @@
     const axutil_env_t *env)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     return binding_op_impl->f_msg_refs;
@@ -1159,12 +1159,12 @@
     void *fault_ref)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, fault_ref, AXIS2_FAILURE);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     if (!binding_op_impl->f_fault_refs)
@@ -1188,13 +1188,13 @@
     void *fault_ref)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
     int index = 0;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, fault_ref, AXIS2_FAILURE);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     index = axutil_array_list_index_of(binding_op_impl->f_fault_refs, env, fault_ref);
@@ -1209,11 +1209,11 @@
     const axutil_env_t *env)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     return binding_op_impl->f_fault_refs;
@@ -1232,12 +1232,12 @@
     void *int_op)
 {
     woden_binding_op_impl_t *binding_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, int_op, AXIS2_FAILURE);
     super = WODEN_BINDING_OP_SUPER_OBJS(binding_op, env);
-    binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
     if (binding_op_impl->f_interface_op)



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