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 [10/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/wsdl/woden_interface.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c Fri Mar 30 11:28:18 2007
@@ -34,8 +34,8 @@
     woden_interface_t interface;
     woden_configurable_t *configurable;
     woden_obj_types_t obj_type;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
     axutil_array_list_t *f_extended_interfaces;
     axis2_qname_t *f_qname;
     axutil_array_list_t *f_extends_qnames;
@@ -51,7 +51,7 @@
     void *interface,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_interface_super_objs(
     void *interface,
     const axutil_env_t *env);
@@ -349,65 +349,65 @@
     interface_impl->interface.ops->to_element =
         woden_interface_to_element;
 
-    interface_impl->methods = axis2_hash_make(env);
+    interface_impl->methods = axutil_hash_make(env);
     if (!interface_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(interface_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(interface_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_interface_free);
-    axis2_hash_set(interface_impl->methods, "super_objs",
+    axutil_hash_set(interface_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_interface_super_objs);
-    axis2_hash_set(interface_impl->methods, "type",
+    axutil_hash_set(interface_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_interface_type);
 
-    axis2_hash_set(interface_impl->methods, "get_qname",
+    axutil_hash_set(interface_impl->methods, "get_qname",
             AXIS2_HASH_KEY_STRING,
             woden_interface_get_qname);
-    axis2_hash_set(interface_impl->methods, "get_extended_interfaces",
+    axutil_hash_set(interface_impl->methods, "get_extended_interfaces",
             AXIS2_HASH_KEY_STRING,
             woden_interface_get_extended_interfaces);
-    axis2_hash_set(interface_impl->methods, "get_interface_faults",
+    axutil_hash_set(interface_impl->methods, "get_interface_faults",
             AXIS2_HASH_KEY_STRING,
             woden_interface_get_interface_faults);
-    axis2_hash_set(interface_impl->methods, "get_interface_fault",
+    axutil_hash_set(interface_impl->methods, "get_interface_fault",
             AXIS2_HASH_KEY_STRING,
             woden_interface_get_interface_fault);
-    axis2_hash_set(interface_impl->methods, "get_interface_ops",
+    axutil_hash_set(interface_impl->methods, "get_interface_ops",
             AXIS2_HASH_KEY_STRING,
             woden_interface_get_interface_ops);
-    axis2_hash_set(interface_impl->methods, "to_element",
+    axutil_hash_set(interface_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_interface_to_element);
-    axis2_hash_set(interface_impl->methods, "set_qname",
+    axutil_hash_set(interface_impl->methods, "set_qname",
             AXIS2_HASH_KEY_STRING,
             woden_interface_set_qname);
-    axis2_hash_set(interface_impl->methods, "add_style_default_uri",
+    axutil_hash_set(interface_impl->methods, "add_style_default_uri",
             AXIS2_HASH_KEY_STRING,
             woden_interface_add_style_default_uri);
-    axis2_hash_set(interface_impl->methods, "get_style_default",
+    axutil_hash_set(interface_impl->methods, "get_style_default",
             AXIS2_HASH_KEY_STRING,
             woden_interface_get_style_default);
-    axis2_hash_set(interface_impl->methods, "add_extends_qnames",
+    axutil_hash_set(interface_impl->methods, "add_extends_qnames",
             AXIS2_HASH_KEY_STRING,
             woden_interface_get_extends_qnames);
-    axis2_hash_set(interface_impl->methods, "get_extends_qnames",
+    axutil_hash_set(interface_impl->methods, "get_extends_qnames",
             AXIS2_HASH_KEY_STRING,
             woden_interface_get_extends_qnames);
-    axis2_hash_set(interface_impl->methods, "add_interface_fault_element",
+    axutil_hash_set(interface_impl->methods, "add_interface_fault_element",
             AXIS2_HASH_KEY_STRING,
             woden_interface_add_interface_fault_element);
-    axis2_hash_set(interface_impl->methods, "get_interface_fault_elements",
+    axutil_hash_set(interface_impl->methods, "get_interface_fault_elements",
             AXIS2_HASH_KEY_STRING,
             woden_interface_get_interface_fault_elements);
-    axis2_hash_set(interface_impl->methods, "add_interface_op_element",
+    axutil_hash_set(interface_impl->methods, "add_interface_op_element",
             AXIS2_HASH_KEY_STRING,
             woden_interface_add_interface_op_element);
-    axis2_hash_set(interface_impl->methods, "get_interface_op_elements",
+    axutil_hash_set(interface_impl->methods, "get_interface_op_elements",
             AXIS2_HASH_KEY_STRING,
             woden_interface_get_interface_op_elements);
-    axis2_hash_set(interface_impl->methods, "add_extended_interface",
+    axutil_hash_set(interface_impl->methods, "add_extended_interface",
             AXIS2_HASH_KEY_STRING,
             woden_interface_add_extended_interface);
 
@@ -424,15 +424,15 @@
 
     interface_impl->configurable = woden_configurable_create(env);
 
-    interface_impl->super = axis2_hash_make(env);
+    interface_impl->super = axutil_hash_make(env);
     if (!interface_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(interface_impl->super, "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(interface_impl->super, "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING,
             &(interface_impl->interface));
-    axis2_hash_set(interface_impl->super, "WODEN_CONFIGURABLE", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(interface_impl->super, "WODEN_CONFIGURABLE", AXIS2_HASH_KEY_STRING,
             interface_impl->configurable);
 
     return &(interface_impl->interface);
@@ -552,13 +552,13 @@
 
     if (interface_impl->super)
     {
-        axis2_hash_free(interface_impl->super, env);
+        axutil_hash_free(interface_impl->super, env);
         interface_impl->super = NULL;
     }
 
     if (interface_impl->methods)
     {
-        axis2_hash_free(interface_impl->methods, env);
+        axutil_hash_free(interface_impl->methods, env);
         interface_impl->methods = NULL;
     }
 
@@ -584,7 +584,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_interface_super_objs(
     void *interface,
     const axutil_env_t *env)
@@ -628,7 +628,7 @@
     woden_interface_t *interface,
     const axutil_env_t *env,
     woden_interface_t *interface_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_interface_impl_t *interface_impl_l = NULL;
 
@@ -636,44 +636,44 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     interface_impl_l = INTF_TO_IMPL(interface_impl);
 
-    interface->ops->free = axis2_hash_get(methods, "free",
+    interface->ops->free = axutil_hash_get(methods, "free",
                         AXIS2_HASH_KEY_STRING);
-    interface->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    interface->ops->super_objs = axutil_hash_get(methods, "super_objs",
                         AXIS2_HASH_KEY_STRING);
-    interface->ops->type = axis2_hash_get(methods, "type",
+    interface->ops->type = axutil_hash_get(methods, "type",
                         AXIS2_HASH_KEY_STRING);
 
-    interface->ops->get_qname = axis2_hash_get(methods,
+    interface->ops->get_qname = axutil_hash_get(methods,
                         "get_qname", AXIS2_HASH_KEY_STRING);
     if (!interface->ops->get_qname && interface_impl_l)
         interface->ops->get_qname =
                         interface_impl_l->interface.ops->get_qname;
 
-    interface->ops->get_extended_interfaces = axis2_hash_get(methods,
+    interface->ops->get_extended_interfaces = axutil_hash_get(methods,
                         "get_extended_interfaces", AXIS2_HASH_KEY_STRING);
     if (!interface->ops->get_extended_interfaces && interface_impl_l)
         interface->ops->get_extended_interfaces =
                         interface_impl_l->interface.ops->get_extended_interfaces;
 
-    interface->ops->get_interface_faults = axis2_hash_get(methods,
+    interface->ops->get_interface_faults = axutil_hash_get(methods,
                         "get_interface_faults", AXIS2_HASH_KEY_STRING);
     if (!interface->ops->get_interface_faults && interface_impl_l)
         interface->ops->get_interface_faults =
                         interface_impl_l->interface.ops->get_interface_faults;
 
-    interface->ops->get_interface_fault = axis2_hash_get(methods,
+    interface->ops->get_interface_fault = axutil_hash_get(methods,
                         "get_interface_fault", AXIS2_HASH_KEY_STRING);
     if (!interface->ops->get_interface_fault && interface_impl_l)
         interface->ops->get_interface_fault =
                         interface_impl_l->interface.ops->get_interface_fault;
 
-    interface->ops->get_interface_ops = axis2_hash_get(methods,
+    interface->ops->get_interface_ops = axutil_hash_get(methods,
                         "get_interface_ops", AXIS2_HASH_KEY_STRING);
     if (!interface->ops->get_interface_ops && interface_impl_l)
         interface->ops->get_interface_ops =
                         interface_impl_l->interface.ops->get_interface_ops;
 
-    interface->ops->to_element = axis2_hash_get(methods,
+    interface->ops->to_element = axutil_hash_get(methods,
                         "to_element", AXIS2_HASH_KEY_STRING);
     if (!interface->ops->to_element && interface_impl_l)
         interface->ops->to_element =
@@ -691,11 +691,11 @@
     const axutil_env_t *env)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     return interface_impl->f_qname;
@@ -707,11 +707,11 @@
     const axutil_env_t *env)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     return interface_impl->f_extended_interfaces;
@@ -723,11 +723,11 @@
     const axutil_env_t *env)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     return interface_impl->f_interface_fault_elements;
@@ -740,14 +740,14 @@
     axis2_qname_t *qname)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
     int i = 0, size = 0;
     void *fault = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, qname, NULL);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     size = axutil_array_list_size(interface_impl->f_interface_fault_elements, env);
@@ -775,11 +775,11 @@
     const axutil_env_t *env)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     return interface_impl->f_interface_op_elements;
@@ -791,11 +791,11 @@
     const axutil_env_t *env)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     return &(interface_impl->interface);
@@ -811,12 +811,12 @@
     axis2_qname_t *qname)
 {
     woden_interface_impl_t *interface_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_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     if (interface_impl->f_qname)
@@ -834,12 +834,12 @@
     axis2_uri_t *uri)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, uri, AXIS2_FAILURE);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     if (!interface_impl->f_style_default)
@@ -863,11 +863,11 @@
     const axutil_env_t *env)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     return interface_impl->f_style_default;
@@ -880,12 +880,12 @@
     woden_wsdl_element_t *qname)
 {
     woden_interface_impl_t *interface_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_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     if (!interface_impl->f_extends_qnames)
@@ -908,11 +908,11 @@
     const axutil_env_t *env)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     return interface_impl->f_extends_qnames;
@@ -925,12 +925,12 @@
     void *fault)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, fault, AXIS2_FAILURE);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     if (!interface_impl->f_interface_fault_elements)
@@ -953,11 +953,11 @@
     const axutil_env_t *env)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     return interface_impl->f_interface_fault_elements;
@@ -970,12 +970,12 @@
     void *op)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     if (!interface_impl->f_interface_op_elements)
@@ -998,11 +998,11 @@
     const axutil_env_t *env)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     return interface_impl->f_interface_op_elements;
@@ -1015,12 +1015,12 @@
     void *extended_interface)
 {
     woden_interface_impl_t *interface_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, interface, AXIS2_FAILURE);
     super = WODEN_INTERFACE_SUPER_OBJS(interface, env);
-    interface_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE", AXIS2_HASH_KEY_STRING));
 
     if (!interface_impl->f_extended_interfaces)

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_element.c Fri Mar 30 11:28:18 2007
@@ -21,55 +21,55 @@
 woden_interface_element_resolve_methods(
     woden_interface_element_t *interface_element,
     const axutil_env_t *env,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
 
-    interface_element->ops->free = axis2_hash_get(methods, "free",
+    interface_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
 
-    interface_element->ops->type = axis2_hash_get(methods, "type",
+    interface_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     interface_element->ops->set_qname =
-        axis2_hash_get(methods, "set_qname",
+        axutil_hash_get(methods, "set_qname",
                 AXIS2_HASH_KEY_STRING);
 
     interface_element->ops->get_qname =
-        axis2_hash_get(methods, "get_qname",
+        axutil_hash_get(methods, "get_qname",
                 AXIS2_HASH_KEY_STRING);
 
     interface_element->ops->add_extends_qname =
-        axis2_hash_get(methods, "add_extends_qname",
+        axutil_hash_get(methods, "add_extends_qname",
                 AXIS2_HASH_KEY_STRING);
 
     interface_element->ops->get_extends_qnames =
-        axis2_hash_get(methods, "get_extends_qnames",
+        axutil_hash_get(methods, "get_extends_qnames",
                 AXIS2_HASH_KEY_STRING);
 
     interface_element->ops->add_style_default_uri =
-        axis2_hash_get(methods, "add_style_default_uri",
+        axutil_hash_get(methods, "add_style_default_uri",
                 AXIS2_HASH_KEY_STRING);
 
     interface_element->ops->get_style_default =
-        axis2_hash_get(methods, "get_style_default",
+        axutil_hash_get(methods, "get_style_default",
                 AXIS2_HASH_KEY_STRING);
 
     interface_element->ops->add_interface_fault_element =
-        axis2_hash_get(methods, "add_interface_fault_element",
+        axutil_hash_get(methods, "add_interface_fault_element",
                 AXIS2_HASH_KEY_STRING);
 
     interface_element->ops->get_interface_fault_elements =
-        axis2_hash_get(methods, "get_interface_fault_elements",
+        axutil_hash_get(methods, "get_interface_fault_elements",
                 AXIS2_HASH_KEY_STRING);
 
     interface_element->ops->add_interface_op_element =
-        axis2_hash_get(methods, "add_interface_op_element",
+        axutil_hash_get(methods, "add_interface_op_element",
                 AXIS2_HASH_KEY_STRING);
 
     interface_element->ops->get_interface_op_elements =
-        axis2_hash_get(methods, "get_interface_op_elements",
+        axutil_hash_get(methods, "get_interface_op_elements",
                 AXIS2_HASH_KEY_STRING);
 
     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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c Fri Mar 30 11:28:18 2007
@@ -35,8 +35,8 @@
     woden_interface_op_t interface_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_qname;
     axis2_uri_t *f_msg_exchange_pattern;
     axutil_array_list_t *f_style;
@@ -51,7 +51,7 @@
     void *interface_op,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_interface_op_super_objs(
     void *interface_op,
     const axutil_env_t *env);
@@ -505,68 +505,68 @@
     interface_op_impl->interface_op.ops->to_element =
         woden_interface_op_to_element;
 
-    interface_op_impl->methods = axis2_hash_make(env);
+    interface_op_impl->methods = axutil_hash_make(env);
     if (!interface_op_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(interface_op_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(interface_op_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_interface_op_free);
-    axis2_hash_set(interface_op_impl->methods, "super_objs",
+    axutil_hash_set(interface_op_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_interface_op_super_objs);
-    axis2_hash_set(interface_op_impl->methods, "type",
+    axutil_hash_set(interface_op_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_interface_op_type);
 
-    axis2_hash_set(interface_op_impl->methods, "get_qname",
+    axutil_hash_set(interface_op_impl->methods, "get_qname",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_get_qname);
-    axis2_hash_set(interface_op_impl->methods, "get_msg_exchange_pattern",
+    axutil_hash_set(interface_op_impl->methods, "get_msg_exchange_pattern",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_get_msg_exchange_pattern);
-    axis2_hash_set(interface_op_impl->methods, "get_interface_msg_refs",
+    axutil_hash_set(interface_op_impl->methods, "get_interface_msg_refs",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_get_interface_msg_refs);
-    axis2_hash_set(interface_op_impl->methods, "get_interface_fault_refs",
+    axutil_hash_set(interface_op_impl->methods, "get_interface_fault_refs",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_get_interface_fault_refs);
-    axis2_hash_set(interface_op_impl->methods, "get_style",
+    axutil_hash_set(interface_op_impl->methods, "get_style",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_get_style);
-    axis2_hash_set(interface_op_impl->methods, "to_element",
+    axutil_hash_set(interface_op_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_to_element);
-    axis2_hash_set(interface_op_impl->methods, "set_qname",
+    axutil_hash_set(interface_op_impl->methods, "set_qname",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_set_qname);
-    axis2_hash_set(interface_op_impl->methods, "set_pattern",
+    axutil_hash_set(interface_op_impl->methods, "set_pattern",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_set_pattern);
-    axis2_hash_set(interface_op_impl->methods, "get_pattern",
+    axutil_hash_set(interface_op_impl->methods, "get_pattern",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_get_pattern);
-    axis2_hash_set(interface_op_impl->methods, "add_style_uri",
+    axutil_hash_set(interface_op_impl->methods, "add_style_uri",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_add_style_uri);
-    axis2_hash_set(interface_op_impl->methods, "remove_style_uri",
+    axutil_hash_set(interface_op_impl->methods, "remove_style_uri",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_remove_style_uri);
-    axis2_hash_set(interface_op_impl->methods, "add_interface_msg_ref_element",
+    axutil_hash_set(interface_op_impl->methods, "add_interface_msg_ref_element",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_add_interface_msg_ref_element);
-    axis2_hash_set(interface_op_impl->methods, "remove_interface_msg_ref_element",
+    axutil_hash_set(interface_op_impl->methods, "remove_interface_msg_ref_element",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_remove_interface_msg_ref_element);
-    axis2_hash_set(interface_op_impl->methods, "get_interface_msg_ref_elements",
+    axutil_hash_set(interface_op_impl->methods, "get_interface_msg_ref_elements",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_get_interface_msg_ref_elements);
-    axis2_hash_set(interface_op_impl->methods, "add_interface_fault_ref_element",
+    axutil_hash_set(interface_op_impl->methods, "add_interface_fault_ref_element",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_add_interface_fault_ref_element);
-    axis2_hash_set(interface_op_impl->methods, "remove_interface_fault_ref_element",
+    axutil_hash_set(interface_op_impl->methods, "remove_interface_fault_ref_element",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_remove_interface_fault_ref_element);
-    axis2_hash_set(interface_op_impl->methods, "get_interface_fault_ref_elements",
+    axutil_hash_set(interface_op_impl->methods, "get_interface_fault_ref_elements",
             AXIS2_HASH_KEY_STRING,
             woden_interface_op_get_interface_fault_ref_elements);
 
@@ -585,24 +585,24 @@
 
     interface_op_impl->nested_configurable = woden_nested_configurable_create(env);
 
-    interface_op_impl->super = axis2_hash_make(env);
+    interface_op_impl->super = axutil_hash_make(env);
     if (!interface_op_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(interface_op_impl->super, "WODEN_INTERFACE_OP",
+    axutil_hash_set(interface_op_impl->super, "WODEN_INTERFACE_OP",
             AXIS2_HASH_KEY_STRING,
             &(interface_op_impl->interface_op));
-    axis2_hash_set(interface_op_impl->super, "WODEN_NESTED_CONFIGURABLE",
+    axutil_hash_set(interface_op_impl->super, "WODEN_NESTED_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING,
             interface_op_impl->nested_configurable);
     configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
                 interface_op_impl->nested_configurable, env);
-    axis2_hash_set(interface_op_impl->super, "WODEN_CONFIGURABLE",
+    axutil_hash_set(interface_op_impl->super, "WODEN_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING, configurable);
     documentable = WODEN_CONFIGURABLE_GET_BASE_IMPL(configurable, env);
-    axis2_hash_set(interface_op_impl->super, "WODEN_DOCUMENTABLE",
+    axutil_hash_set(interface_op_impl->super, "WODEN_DOCUMENTABLE",
             AXIS2_HASH_KEY_STRING, documentable);
 
     return &(interface_op_impl->interface_op);
@@ -754,13 +754,13 @@
 
     if (interface_op_impl->super)
     {
-        axis2_hash_free(interface_op_impl->super, env);
+        axutil_hash_free(interface_op_impl->super, env);
         interface_op_impl->super = NULL;
     }
 
     if (interface_op_impl->methods)
     {
-        axis2_hash_free(interface_op_impl->methods, env);
+        axutil_hash_free(interface_op_impl->methods, env);
         interface_op_impl->methods = NULL;
     }
 
@@ -787,7 +787,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_interface_op_super_objs(
     void *interface_op,
     const axutil_env_t *env)
@@ -831,7 +831,7 @@
     woden_interface_op_t *interface_op,
     const axutil_env_t *env,
     woden_interface_op_t *interface_op_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_interface_op_impl_t *interface_op_impl_l = NULL;
 
@@ -839,44 +839,44 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     interface_op_impl_l = INTF_TO_IMPL(interface_op_impl);
 
-    interface_op->ops->free = axis2_hash_get(methods, "free",
+    interface_op->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    interface_op->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    interface_op->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    interface_op->ops->type = axis2_hash_get(methods, "type",
+    interface_op->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    interface_op->ops->get_qname = axis2_hash_get(methods,
+    interface_op->ops->get_qname = axutil_hash_get(methods,
             "get_qname", AXIS2_HASH_KEY_STRING);
     if (!interface_op->ops->get_qname && interface_op_impl_l)
         interface_op->ops->get_qname =
             interface_op_impl_l->interface_op.ops->get_qname;
 
-    interface_op->ops->get_msg_exchange_pattern = axis2_hash_get(methods,
+    interface_op->ops->get_msg_exchange_pattern = axutil_hash_get(methods,
             "get_msg_exchange_pattern", AXIS2_HASH_KEY_STRING);
     if (!interface_op->ops->get_msg_exchange_pattern && interface_op_impl_l)
         interface_op->ops->get_msg_exchange_pattern =
             interface_op_impl_l->interface_op.ops->get_msg_exchange_pattern;
 
-    interface_op->ops->get_interface_msg_refs = axis2_hash_get(methods,
+    interface_op->ops->get_interface_msg_refs = axutil_hash_get(methods,
             "get_interface_msg_refs", AXIS2_HASH_KEY_STRING);
     if (!interface_op->ops->get_interface_msg_refs && interface_op_impl_l)
         interface_op->ops->get_interface_msg_refs =
             interface_op_impl_l->interface_op.ops->get_interface_msg_refs;
 
-    interface_op->ops->get_interface_fault_refs = axis2_hash_get(methods,
+    interface_op->ops->get_interface_fault_refs = axutil_hash_get(methods,
             "get_interface_fault_refs", AXIS2_HASH_KEY_STRING);
     if (!interface_op->ops->get_interface_fault_refs && interface_op_impl_l)
         interface_op->ops->get_interface_fault_refs =
             interface_op_impl_l->interface_op.ops->get_interface_fault_refs;
 
-    interface_op->ops->get_style = axis2_hash_get(methods,
+    interface_op->ops->get_style = axutil_hash_get(methods,
             "get_style", AXIS2_HASH_KEY_STRING);
     if (!interface_op->ops->get_style && interface_op_impl_l)
         interface_op->ops->get_style =
             interface_op_impl_l->interface_op.ops->get_style;
 
-    interface_op->ops->to_element = axis2_hash_get(methods,
+    interface_op->ops->to_element = axutil_hash_get(methods,
             "to_element", AXIS2_HASH_KEY_STRING);
     if (!interface_op->ops->to_element && interface_op_impl_l)
         interface_op->ops->to_element =
@@ -895,11 +895,11 @@
     const axutil_env_t *env)
 {
     woden_interface_op_impl_t *interface_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     return interface_op_impl->f_qname;
@@ -911,11 +911,11 @@
     const axutil_env_t *env)
 {
     woden_interface_op_impl_t *interface_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     return interface_op_impl->f_msg_exchange_pattern;
@@ -927,11 +927,11 @@
     const axutil_env_t *env)
 {
     woden_interface_op_impl_t *interface_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     return interface_op_impl->f_msg_refs;
@@ -943,11 +943,11 @@
     const axutil_env_t *env)
 {
     woden_interface_op_impl_t *interface_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     return interface_op_impl->f_fault_refs;
@@ -959,11 +959,11 @@
     const axutil_env_t *env)
 {
     woden_interface_op_impl_t *interface_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     return interface_op_impl->f_style;
@@ -975,11 +975,11 @@
     const axutil_env_t *env)
 {
     woden_interface_op_impl_t *interface_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     return &(interface_op_impl->interface_op);
@@ -996,12 +996,12 @@
     axis2_qname_t *qname)
 {
     woden_interface_op_impl_t *interface_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_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     if (interface_op_impl->f_qname)
@@ -1021,12 +1021,12 @@
     axis2_uri_t *uri)
 {
     woden_interface_op_impl_t *interface_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, uri, AXIS2_FAILURE);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     if (interface_op_impl->f_msg_exchange_pattern)
@@ -1046,11 +1046,11 @@
     const axutil_env_t *env)
 {
     woden_interface_op_impl_t *interface_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     return interface_op_impl->f_msg_exchange_pattern;
@@ -1063,12 +1063,12 @@
     axis2_uri_t *uri)
 {
     woden_interface_op_impl_t *interface_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, uri, AXIS2_FAILURE);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     if (!interface_op_impl->f_style)
@@ -1091,13 +1091,13 @@
     axis2_uri_t *uri)
 {
     woden_interface_op_impl_t *interface_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, uri, AXIS2_FAILURE);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     index = axutil_array_list_index_of(interface_op_impl->f_style, env, uri);
@@ -1112,12 +1112,12 @@
     void *msg_ref)
 {
     woden_interface_op_impl_t *interface_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_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     if (!interface_op_impl->f_msg_refs)
@@ -1141,13 +1141,13 @@
     void *msg_ref)
 {
     woden_interface_op_impl_t *interface_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_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     index = axutil_array_list_index_of(interface_op_impl->f_msg_refs, env, msg_ref);
@@ -1162,11 +1162,11 @@
     const axutil_env_t *env)
 {
     woden_interface_op_impl_t *interface_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     return interface_op_impl->f_msg_refs;
@@ -1179,12 +1179,12 @@
     void *fault_ref)
 {
     woden_interface_op_impl_t *interface_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_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     if (!interface_op_impl->f_fault_refs)
@@ -1208,13 +1208,13 @@
     void *fault_ref)
 {
     woden_interface_op_impl_t *interface_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_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     index = axutil_array_list_index_of(interface_op_impl->f_fault_refs, env, fault_ref);
@@ -1229,11 +1229,11 @@
     const axutil_env_t *env)
 {
     woden_interface_op_impl_t *interface_op_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_OP_SUPER_OBJS(interface_op, env);
-    interface_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_OP", AXIS2_HASH_KEY_STRING));
 
     return interface_op_impl->f_fault_refs;

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op_element.c Fri Mar 30 11:28:18 2007
@@ -21,67 +21,67 @@
 woden_interface_op_element_resolve_methods(
     woden_interface_op_element_t *interface_op_element,
     const axutil_env_t *env,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
 
-    interface_op_element->ops->free = axis2_hash_get(methods, "free",
+    interface_op_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    interface_op_element->ops->type = axis2_hash_get(methods, "type",
+    interface_op_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->set_qname =
-        axis2_hash_get(methods, "set_qname",
+        axutil_hash_get(methods, "set_qname",
                 AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->get_qname =
-        axis2_hash_get(methods, "get_qname",
+        axutil_hash_get(methods, "get_qname",
                 AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->set_pattern =
-        axis2_hash_get(methods, "set_pattern",
+        axutil_hash_get(methods, "set_pattern",
                 AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->get_pattern =
-        axis2_hash_get(methods, "get_pattern",
+        axutil_hash_get(methods, "get_pattern",
                 AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->add_style_uri =
-        axis2_hash_get(methods, "add_style_uri",
+        axutil_hash_get(methods, "add_style_uri",
                 AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->remove_style_uri =
-        axis2_hash_get(methods, "remove_style_uri",
+        axutil_hash_get(methods, "remove_style_uri",
                 AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->get_style =
-        axis2_hash_get(methods, "get_style",
+        axutil_hash_get(methods, "get_style",
                 AXIS2_HASH_KEY_STRING);
 
 
     interface_op_element->ops->add_interface_msg_ref_element =
-        axis2_hash_get(methods, "add_interface_msg_ref_element",
+        axutil_hash_get(methods, "add_interface_msg_ref_element",
                 AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->remove_interface_msg_ref_element =
-        axis2_hash_get(methods, "remove_interface_msg_ref_element",
+        axutil_hash_get(methods, "remove_interface_msg_ref_element",
                 AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->get_interface_msg_ref_elements =
-        axis2_hash_get(methods, "get_interface_msg_ref_elements",
+        axutil_hash_get(methods, "get_interface_msg_ref_elements",
                 AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->add_interface_fault_ref_element =
-        axis2_hash_get(methods, "add_interface_fault_ref_element",
+        axutil_hash_get(methods, "add_interface_fault_ref_element",
                 AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->remove_interface_fault_ref_element =
-        axis2_hash_get(methods, "remove_interface_fault_ref_element",
+        axutil_hash_get(methods, "remove_interface_fault_ref_element",
                 AXIS2_HASH_KEY_STRING);
 
     interface_op_element->ops->get_interface_fault_ref_elements =
-        axis2_hash_get(methods, "get_interface_fault_ref_elements",
+        axutil_hash_get(methods, "get_interface_fault_ref_elements",
                 AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_component.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_component.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_component.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_component.c Fri Mar 30 11:28:18 2007
@@ -21,18 +21,18 @@
 woden_nested_component_resolve_methods(
     woden_nested_component_t *nested_component,
     const axutil_env_t *env,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
 
-    nested_component->ops->free = axis2_hash_get(methods, "free",
+    nested_component->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    nested_component->ops->to_nested_component_free = axis2_hash_get(methods,
+    nested_component->ops->to_nested_component_free = axutil_hash_get(methods,
             "to_nested_component_free", AXIS2_HASH_KEY_STRING);
-    nested_component->ops->type = axis2_hash_get(methods, "type",
+    nested_component->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
-    nested_component->ops->get_parent = axis2_hash_get(methods,
+    nested_component->ops->get_parent = axutil_hash_get(methods,
             "get_parent", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_configurable.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_configurable.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_configurable.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_configurable.c Fri Mar 30 11:28:18 2007
@@ -29,8 +29,8 @@
 {
     woden_nested_configurable_t nested_configurable;
     woden_configurable_t *configurable;
-    axis2_hash_t *methods;
-    axis2_hash_t *super;
+    axutil_hash_t *methods;
+    axutil_hash_t *super;
     axutil_array_list_t *f_parent;
 };
 
@@ -41,7 +41,7 @@
     void *nested_configurable,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_nested_configurable_super_objs(
     void *nested_configurable,
     const axutil_env_t *env);
@@ -122,13 +122,13 @@
         AXIS2_MALLOC(env->allocator,
                 sizeof(woden_nested_configurable_ops_t));
 
-    nested_configurable_impl->super = axis2_hash_make(env);
+    nested_configurable_impl->super = axutil_hash_make(env);
     if (!nested_configurable_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(nested_configurable_impl->super, "WODEN_CONFIGURABLE",
+    axutil_hash_set(nested_configurable_impl->super, "WODEN_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING,
             &(nested_configurable_impl->nested_configurable));
 
@@ -139,19 +139,19 @@
     nested_configurable_impl->nested_configurable.ops->get_base_impl =
         woden_nested_configurable_get_base_impl;
 
-    nested_configurable_impl->methods = axis2_hash_make(env);
+    nested_configurable_impl->methods = axutil_hash_make(env);
     if (!nested_configurable_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(nested_configurable_impl->methods,
+    axutil_hash_set(nested_configurable_impl->methods,
             "get_parent", AXIS2_HASH_KEY_STRING,
             woden_nested_configurable_get_parent);
-    axis2_hash_set(nested_configurable_impl->methods,
+    axutil_hash_set(nested_configurable_impl->methods,
             "set_parent_element", AXIS2_HASH_KEY_STRING,
             woden_nested_configurable_set_parent_element);
-    axis2_hash_set(nested_configurable_impl->methods,
+    axutil_hash_set(nested_configurable_impl->methods,
             "get_parent_element", AXIS2_HASH_KEY_STRING,
             woden_nested_configurable_get_parent_element);
 
@@ -170,19 +170,19 @@
 
     nested_configurable_impl->configurable = woden_configurable_create(env);
 
-    nested_configurable_impl->super = axis2_hash_make(env);
+    nested_configurable_impl->super = axutil_hash_make(env);
     if (!nested_configurable_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(nested_configurable_impl->super, "WODEN_NESTED_CONFIGURABLE",
+    axutil_hash_set(nested_configurable_impl->super, "WODEN_NESTED_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING, &(nested_configurable_impl->nested_configurable));
-    axis2_hash_set(nested_configurable_impl->super, "WODEN_CONFIGURABLE",
+    axutil_hash_set(nested_configurable_impl->super, "WODEN_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING, nested_configurable_impl->configurable);
     documentable = WODEN_CONFIGURABLE_GET_BASE_IMPL(
                 nested_configurable_impl->configurable, env);
-    axis2_hash_set(nested_configurable_impl->super, "WODEN_DOCUMENTABLE",
+    axutil_hash_set(nested_configurable_impl->super, "WODEN_DOCUMENTABLE",
             AXIS2_HASH_KEY_STRING, documentable);
 
     return &(nested_configurable_impl->nested_configurable);
@@ -235,7 +235,7 @@
 
     if (nested_configurable_impl->super)
     {
-        axis2_hash_free(nested_configurable_impl->super, env);
+        axutil_hash_free(nested_configurable_impl->super, env);
         nested_configurable_impl->super = NULL;
     }
 
@@ -255,7 +255,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_nested_configurable_super_objs(
     void *nested_configurable,
     const axutil_env_t *env)
@@ -286,7 +286,7 @@
     woden_nested_configurable_t *nested_configurable,
     const axutil_env_t *env,
     woden_nested_configurable_t *nested_configurable_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_nested_configurable_impl_t *nested_configurable_impl_l = NULL;
 
@@ -296,11 +296,11 @@
 
     nested_configurable->ops = AXIS2_MALLOC(env->allocator,
             sizeof(woden_nested_configurable_ops_t));
-    nested_configurable->ops->free = axis2_hash_get(methods, "free",
+    nested_configurable->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    nested_configurable->ops->to_nested_configurable_free = axis2_hash_get(methods,
+    nested_configurable->ops->to_nested_configurable_free = axutil_hash_get(methods,
             "to_nested_configurable_free", AXIS2_HASH_KEY_STRING);
-    nested_configurable->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    nested_configurable->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;
@@ -312,11 +312,11 @@
     const axutil_env_t *env)
 {
     woden_nested_configurable_impl_t *nested_configurable_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_NESTED_CONFIGURABLE_SUPER_OBJS(nested_configurable, env);
-    nested_configurable_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    nested_configurable_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_NESTED_CONFIGURABLE", AXIS2_HASH_KEY_STRING));
 
     return nested_configurable_impl->f_parent;
@@ -329,13 +329,13 @@
     void *parent)
 {
     woden_nested_configurable_impl_t *nested_configurable_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, parent, AXIS2_FAILURE);
 
     super = WODEN_NESTED_CONFIGURABLE_SUPER_OBJS(nested_configurable, env);
-    nested_configurable_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    nested_configurable_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_NESTED_CONFIGURABLE", AXIS2_HASH_KEY_STRING));
 
     if (nested_configurable_impl->f_parent)
@@ -352,11 +352,11 @@
     const axutil_env_t *env)
 {
     woden_nested_configurable_impl_t *nested_configurable_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_NESTED_CONFIGURABLE_SUPER_OBJS(nested_configurable, env);
-    nested_configurable_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    nested_configurable_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_NESTED_CONFIGURABLE", AXIS2_HASH_KEY_STRING));
 
     return nested_configurable_impl->f_parent;

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_nested_element.c Fri Mar 30 11:28:18 2007
@@ -21,18 +21,18 @@
 woden_nested_element_resolve_methods(
     woden_nested_element_t *nested_element,
     const axutil_env_t *env,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
 
-    nested_element->ops->free = axis2_hash_get(methods, "free",
+    nested_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    nested_element->ops->type = axis2_hash_get(methods, "type",
+    nested_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
-    nested_element->ops->set_parent_element = axis2_hash_get(methods,
+    nested_element->ops->set_parent_element = axutil_hash_get(methods,
             "set_parent_element", AXIS2_HASH_KEY_STRING);
-    nested_element->ops->get_parent_element = axis2_hash_get(methods,
+    nested_element->ops->get_parent_element = axutil_hash_get(methods,
             "get_parent_element", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c Fri Mar 30 11:28:18 2007
@@ -38,8 +38,8 @@
     woden_property_t property;
     woden_obj_types_t obj_type;
     woden_documentable_t *documentable;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
     /* WSDL Component model data */
     axis2_uri_t *f_ref;
     axis2_generic_obj_t *f_value;
@@ -58,7 +58,7 @@
     void *property,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_property_super_objs(
     void *property,
     const axutil_env_t *env);
@@ -448,65 +448,65 @@
     property_impl->property.ops->get_parent = woden_property_get_parent;
     property_impl->property.ops->to_element = woden_property_to_element;
 
-    property_impl->methods = axis2_hash_make(env);
+    property_impl->methods = axutil_hash_make(env);
     if (!property_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(property_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(property_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_property_free);
-    axis2_hash_set(property_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(property_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             woden_property_super_objs);
-    axis2_hash_set(property_impl->methods, "type",
+    axutil_hash_set(property_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_property_type);
 
-    axis2_hash_set(property_impl->methods, "set_ref",
+    axutil_hash_set(property_impl->methods, "set_ref",
             AXIS2_HASH_KEY_STRING,
             woden_property_set_ref);
-    axis2_hash_set(property_impl->methods, "get_ref",
+    axutil_hash_set(property_impl->methods, "get_ref",
             AXIS2_HASH_KEY_STRING,
             woden_property_get_ref);
-    axis2_hash_set(property_impl->methods, "set_parent_element",
+    axutil_hash_set(property_impl->methods, "set_parent_element",
             AXIS2_HASH_KEY_STRING,
             woden_property_set_parent_element);
-    axis2_hash_set(property_impl->methods, "get_parent_element",
+    axutil_hash_set(property_impl->methods, "get_parent_element",
             AXIS2_HASH_KEY_STRING,
             woden_property_get_parent_element);
-    axis2_hash_set(property_impl->methods, "get_parent",
+    axutil_hash_set(property_impl->methods, "get_parent",
             AXIS2_HASH_KEY_STRING,
             woden_property_get_parent);
-    axis2_hash_set(property_impl->methods, "to_element",
+    axutil_hash_set(property_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_property_to_element);
-    axis2_hash_set(property_impl->methods, "set_value",
+    axutil_hash_set(property_impl->methods, "set_value",
             AXIS2_HASH_KEY_STRING,
             woden_property_set_value);
-    axis2_hash_set(property_impl->methods, "get_value",
+    axutil_hash_set(property_impl->methods, "get_value",
             AXIS2_HASH_KEY_STRING,
             woden_property_get_value);
-    axis2_hash_set(property_impl->methods, "set_value_constraint",
+    axutil_hash_set(property_impl->methods, "set_value_constraint",
             AXIS2_HASH_KEY_STRING,
             woden_property_set_value_constraint);
-    axis2_hash_set(property_impl->methods, "get_value_constraint",
+    axutil_hash_set(property_impl->methods, "get_value_constraint",
             AXIS2_HASH_KEY_STRING,
             woden_property_get_value_constraint);
-    axis2_hash_set(property_impl->methods, "set_constraint_qname",
+    axutil_hash_set(property_impl->methods, "set_constraint_qname",
             AXIS2_HASH_KEY_STRING,
             woden_property_set_constraint_qname);
-    axis2_hash_set(property_impl->methods, "get_constraint_qname",
+    axutil_hash_set(property_impl->methods, "get_constraint_qname",
             AXIS2_HASH_KEY_STRING,
             woden_property_get_constraint_qname);
-    axis2_hash_set(property_impl->methods, "get_constraint",
+    axutil_hash_set(property_impl->methods, "get_constraint",
             AXIS2_HASH_KEY_STRING,
             woden_property_get_constraint);
-    axis2_hash_set(property_impl->methods, "set_types",
+    axutil_hash_set(property_impl->methods, "set_types",
             AXIS2_HASH_KEY_STRING,
             woden_property_set_types);
-    axis2_hash_set(property_impl->methods, "set_has_value_token",
+    axutil_hash_set(property_impl->methods, "set_has_value_token",
             AXIS2_HASH_KEY_STRING,
             woden_property_set_has_value_token);
-    axis2_hash_set(property_impl->methods, "has_value_token",
+    axutil_hash_set(property_impl->methods, "has_value_token",
             AXIS2_HASH_KEY_STRING,
             woden_property_has_value_token);
 
@@ -523,15 +523,15 @@
 
     property_impl->documentable = woden_documentable_create(env);
 
-    property_impl->super = axis2_hash_make(env);
+    property_impl->super = axutil_hash_make(env);
     if (!property_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(property_impl->super, "WODEN_PROPERTY",
+    axutil_hash_set(property_impl->super, "WODEN_PROPERTY",
             AXIS2_HASH_KEY_STRING, &(property_impl->property));
-    axis2_hash_set(property_impl->super, "WODEN_DOCUMENTABLE",
+    axutil_hash_set(property_impl->super, "WODEN_DOCUMENTABLE",
             AXIS2_HASH_KEY_STRING, property_impl->documentable);
 
     return &(property_impl->property);
@@ -641,13 +641,13 @@
 
     if (property_impl->super)
     {
-        axis2_hash_free(property_impl->super, env);
+        axutil_hash_free(property_impl->super, env);
         property_impl->super = NULL;
     }
 
     if (property_impl->methods)
     {
-        axis2_hash_free(property_impl->methods, env);
+        axutil_hash_free(property_impl->methods, env);
         property_impl->methods = NULL;
     }
 
@@ -673,7 +673,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_property_super_objs(
     void *property,
     const axutil_env_t *env)
@@ -716,7 +716,7 @@
     woden_property_t *property,
     const axutil_env_t *env,
     woden_property_t *property_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_property_impl_t *property_impl_l = NULL;
 
@@ -724,38 +724,38 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     property_impl_l = INTF_TO_IMPL(property_impl);
 
-    property->ops->free = axis2_hash_get(methods, "free",
+    property->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    property->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    property->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    property->ops->type = axis2_hash_get(methods, "type",
+    property->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    property->ops->get_ref = axis2_hash_get(methods,
+    property->ops->get_ref = axutil_hash_get(methods,
             "get_ref", AXIS2_HASH_KEY_STRING);
     if (!property->ops->get_ref && property_impl_l)
         property->ops->get_ref =
             property_impl_l->property.ops->get_ref;
 
-    property->ops->get_value_constraint = axis2_hash_get(methods,
+    property->ops->get_value_constraint = axutil_hash_get(methods,
             "get_value_constraint", AXIS2_HASH_KEY_STRING);
     if (!property->ops->get_value_constraint && property_impl_l)
         property->ops->get_value_constraint =
             property_impl_l->property.ops->get_value_constraint;
 
-    property->ops->get_value = axis2_hash_get(methods,
+    property->ops->get_value = axutil_hash_get(methods,
             "get_value", AXIS2_HASH_KEY_STRING);
     if (!property->ops->get_value && property_impl_l)
         property->ops->get_value =
             property_impl_l->property.ops->get_value;
 
-    property->ops->get_parent = axis2_hash_get(methods,
+    property->ops->get_parent = axutil_hash_get(methods,
             "get_parent", AXIS2_HASH_KEY_STRING);
     if (!property->ops->get_parent && property_impl_l)
         property->ops->get_parent =
             property_impl_l->property.ops->get_parent;
 
-    property->ops->to_element = axis2_hash_get(methods,
+    property->ops->to_element = axutil_hash_get(methods,
             "to_element", AXIS2_HASH_KEY_STRING);
     if (!property->ops->to_element && property_impl_l)
         property->ops->to_element =
@@ -771,11 +771,11 @@
     axis2_uri_t *ref)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     if (property_impl->f_ref)
@@ -793,11 +793,11 @@
     const axutil_env_t *env)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     return property_impl->f_ref;
@@ -810,11 +810,11 @@
     woden_wsdl_element_t *parent)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     /*if(property_impl->f_parent)
@@ -831,11 +831,11 @@
     const axutil_env_t *env)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     return property_impl->f_parent;
@@ -847,11 +847,11 @@
     const axutil_env_t *env)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     return property_impl->f_parent;
@@ -863,11 +863,11 @@
     const axutil_env_t *env)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     return &(property_impl->property);
@@ -880,11 +880,11 @@
     axis2_generic_obj_t *value)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     if (property_impl->f_value)
@@ -902,11 +902,11 @@
     const axutil_env_t *env)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     return property_impl->f_value;
@@ -919,11 +919,11 @@
     void *type_def)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     /*if(property_impl->f_value_constraint)
@@ -942,11 +942,11 @@
     const axutil_env_t *env)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     return property_impl->f_value_constraint;
@@ -959,11 +959,11 @@
     axis2_qname_t *constraint)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     if (property_impl->f_constraint_qname)
@@ -981,11 +981,11 @@
     const axutil_env_t *env)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     return property_impl->f_constraint_qname;
@@ -998,11 +998,11 @@
 {
     woden_property_impl_t *property_impl = NULL;
     xml_schema_type_t *xst = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     if (property_impl->f_constraint_qname && property_impl->f_types)
@@ -1021,11 +1021,11 @@
     void *types)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     /*if(property_impl->f_types)
@@ -1044,11 +1044,11 @@
     axis2_bool_t b)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     property_impl->f_has_value_token = b;
@@ -1061,11 +1061,11 @@
     const axutil_env_t *env)
 {
     woden_property_impl_t *property_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_PROPERTY_SUPER_OBJS(property, env);
-    property_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    property_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_PROPERTY", AXIS2_HASH_KEY_STRING));
 
     return property_impl->f_has_value_token;

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_property_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_property_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_property_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_property_element.c Fri Mar 30 11:28:18 2007
@@ -21,32 +21,32 @@
 woden_property_element_resolve_methods(
     woden_property_element_t *property_element,
     const axutil_env_t *env,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
 
-    property_element->ops->free = axis2_hash_get(methods, "free",
+    property_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    property_element->ops->type = axis2_hash_get(methods, "type",
+    property_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
-    property_element->ops->set_ref = axis2_hash_get(methods,
+    property_element->ops->set_ref = axutil_hash_get(methods,
             "set_ref", AXIS2_HASH_KEY_STRING);
-    property_element->ops->get_ref = axis2_hash_get(methods,
+    property_element->ops->get_ref = axutil_hash_get(methods,
             "get_ref", AXIS2_HASH_KEY_STRING);
-    property_element->ops->set_value = axis2_hash_get(methods,
+    property_element->ops->set_value = axutil_hash_get(methods,
             "set_value", AXIS2_HASH_KEY_STRING);
-    property_element->ops->get_value = axis2_hash_get(methods,
+    property_element->ops->get_value = axutil_hash_get(methods,
             "get_value", AXIS2_HASH_KEY_STRING);
-    property_element->ops->set_constraint_qname = axis2_hash_get(methods,
+    property_element->ops->set_constraint_qname = axutil_hash_get(methods,
             "set_constraint_qname", AXIS2_HASH_KEY_STRING);
-    property_element->ops->get_constraint_qname = axis2_hash_get(methods,
+    property_element->ops->get_constraint_qname = axutil_hash_get(methods,
             "get_constraint_qname", AXIS2_HASH_KEY_STRING);
-    property_element->ops->get_constraint = axis2_hash_get(methods,
+    property_element->ops->get_constraint = axutil_hash_get(methods,
             "get_constraint", AXIS2_HASH_KEY_STRING);
-    property_element->ops->set_has_value_token = axis2_hash_get(methods,
+    property_element->ops->set_has_value_token = axutil_hash_get(methods,
             "set_has_value_token", AXIS2_HASH_KEY_STRING);
-    property_element->ops->has_value_token = axis2_hash_get(methods,
+    property_element->ops->has_value_token = axutil_hash_get(methods,
             "has_value_token", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c Fri Mar 30 11:28:18 2007
@@ -30,8 +30,8 @@
 {
     woden_type_def_t type_def;
     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_qname;
     axis2_uri_t *f_system;
     axis2_char_t *f_content_model;
@@ -45,7 +45,7 @@
     void *type_def,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_type_def_super_objs(
     void *type_def,
     const axutil_env_t *env);
@@ -135,34 +135,34 @@
     type_def_impl->type_def.ops->set_content =
         woden_type_def_set_content;
 
-    type_def_impl->methods = axis2_hash_make(env);
+    type_def_impl->methods = axutil_hash_make(env);
     if (!type_def_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(type_def_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(type_def_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_type_def_free);
-    axis2_hash_set(type_def_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(type_def_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             woden_type_def_super_objs);
-    axis2_hash_set(type_def_impl->methods, "type", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(type_def_impl->methods, "type", AXIS2_HASH_KEY_STRING,
             woden_type_def_type);
 
-    axis2_hash_set(type_def_impl->methods, "set_qname",
+    axutil_hash_set(type_def_impl->methods, "set_qname",
             AXIS2_HASH_KEY_STRING, woden_type_def_set_qname);
-    axis2_hash_set(type_def_impl->methods, "get_qname",
+    axutil_hash_set(type_def_impl->methods, "get_qname",
             AXIS2_HASH_KEY_STRING, woden_type_def_get_qname);
-    axis2_hash_set(type_def_impl->methods, "set_system",
+    axutil_hash_set(type_def_impl->methods, "set_system",
             AXIS2_HASH_KEY_STRING, woden_type_def_set_system);
-    axis2_hash_set(type_def_impl->methods, "get_system",
+    axutil_hash_set(type_def_impl->methods, "get_system",
             AXIS2_HASH_KEY_STRING, woden_type_def_get_system);
-    axis2_hash_set(type_def_impl->methods, "set_content_model",
+    axutil_hash_set(type_def_impl->methods, "set_content_model",
             AXIS2_HASH_KEY_STRING, woden_type_def_set_content_model);
-    axis2_hash_set(type_def_impl->methods, "get_content_model",
+    axutil_hash_set(type_def_impl->methods, "get_content_model",
             AXIS2_HASH_KEY_STRING, woden_type_def_get_content_model);
-    axis2_hash_set(type_def_impl->methods, "set_content",
+    axutil_hash_set(type_def_impl->methods, "set_content",
             AXIS2_HASH_KEY_STRING, woden_type_def_set_content);
-    axis2_hash_set(type_def_impl->methods, "get_content",
+    axutil_hash_set(type_def_impl->methods, "get_content",
             AXIS2_HASH_KEY_STRING, woden_type_def_get_content);
 
     return &(type_def_impl->type_def);
@@ -177,13 +177,13 @@
     AXIS2_ENV_CHECK(env, NULL);
     type_def_impl = (woden_type_def_impl_t *) create(env);
 
-    type_def_impl->super = axis2_hash_make(env);
+    type_def_impl->super = axutil_hash_make(env);
     if (!type_def_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(type_def_impl->super, "WODEN_TYPE_DEF",
+    axutil_hash_set(type_def_impl->super, "WODEN_TYPE_DEF",
             AXIS2_HASH_KEY_STRING, &(type_def_impl->type_def));
 
     return &(type_def_impl->type_def);
@@ -207,13 +207,13 @@
 
     if (type_def_impl->super)
     {
-        axis2_hash_free(type_def_impl->super, env);
+        axutil_hash_free(type_def_impl->super, env);
         type_def_impl->super = NULL;
     }
 
     if (type_def_impl->methods)
     {
-        axis2_hash_free(type_def_impl->methods, env);
+        axutil_hash_free(type_def_impl->methods, env);
         type_def_impl->methods = NULL;
     }
 
@@ -231,7 +231,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_type_def_super_objs(
     void *type_def,
     const axutil_env_t *env)
@@ -261,7 +261,7 @@
     woden_type_def_t *type_def,
     const axutil_env_t *env,
     woden_type_def_t *type_def_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_type_def_impl_t *type_def_impl_l = NULL;
 
@@ -272,56 +272,56 @@
     type_def->ops = AXIS2_MALLOC(env->allocator,
             sizeof(woden_type_def_ops_t));
 
-    type_def->ops->free = axis2_hash_get(methods, "free",
+    type_def->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    type_def->ops->super_objs = axis2_hash_get(methods,
+    type_def->ops->super_objs = axutil_hash_get(methods,
             "super_objs", AXIS2_HASH_KEY_STRING);
-    type_def->ops->type = axis2_hash_get(methods, "type",
+    type_def->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    type_def->ops->set_qname = axis2_hash_get(methods,
+    type_def->ops->set_qname = axutil_hash_get(methods,
             "set_qname", AXIS2_HASH_KEY_STRING);
     if (!type_def->ops->set_qname && type_def_impl_l)
         type_def->ops->set_qname =
             type_def_impl_l->type_def.ops->set_qname;
 
-    type_def->ops->get_qname = axis2_hash_get(methods,
+    type_def->ops->get_qname = axutil_hash_get(methods,
             "get_qname", AXIS2_HASH_KEY_STRING);
     if (!type_def->ops->get_qname && type_def_impl_l)
         type_def->ops->get_qname =
             type_def_impl_l->type_def.ops->get_qname;
 
-    type_def->ops->set_system = axis2_hash_get(methods,
+    type_def->ops->set_system = axutil_hash_get(methods,
             "set_system", AXIS2_HASH_KEY_STRING);
     if (!type_def->ops->set_system && type_def_impl_l)
         type_def->ops->set_system =
             type_def_impl_l->type_def.ops->set_system;
 
-    type_def->ops->get_system = axis2_hash_get(methods,
+    type_def->ops->get_system = axutil_hash_get(methods,
             "get_system", AXIS2_HASH_KEY_STRING);
     if (!type_def->ops->get_system && type_def_impl_l)
         type_def->ops->get_system =
             type_def_impl_l->type_def.ops->get_system;
 
-    type_def->ops->set_content_model = axis2_hash_get(methods,
+    type_def->ops->set_content_model = axutil_hash_get(methods,
             "set_content_model", AXIS2_HASH_KEY_STRING);
     if (!type_def->ops->set_content_model && type_def_impl_l)
         type_def->ops->set_content_model =
             type_def_impl_l->type_def.ops->set_content_model;
 
-    type_def->ops->get_content_model = axis2_hash_get(methods,
+    type_def->ops->get_content_model = axutil_hash_get(methods,
             "get_content_model", AXIS2_HASH_KEY_STRING);
     if (!type_def->ops->get_content_model && type_def_impl_l)
         type_def->ops->get_content_model =
             type_def_impl_l->type_def.ops->get_content_model;
 
-    type_def->ops->set_content = axis2_hash_get(methods,
+    type_def->ops->set_content = axutil_hash_get(methods,
             "set_content", AXIS2_HASH_KEY_STRING);
     if (!type_def->ops->set_content && type_def_impl_l)
         type_def->ops->set_content =
             type_def_impl_l->type_def.ops->set_content;
 
-    type_def->ops->get_content = axis2_hash_get(methods,
+    type_def->ops->get_content = axutil_hash_get(methods,
             "get_content", AXIS2_HASH_KEY_STRING);
     if (!type_def->ops->get_content && type_def_impl_l)
         type_def->ops->get_content =
@@ -337,12 +337,12 @@
     axis2_qname_t *qname)
 {
     woden_type_def_impl_t *type_def_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_TYPE_DEF_SUPER_OBJS(type_def, env);
-    type_def_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    type_def_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING));
 
     if (type_def_impl->f_qname)
@@ -360,11 +360,11 @@
     const axutil_env_t *env)
 {
     woden_type_def_impl_t *type_def_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env);
-    type_def_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    type_def_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING));
 
     return type_def_impl->f_qname;
@@ -377,12 +377,12 @@
     axis2_uri_t *type_system_uri)
 {
     woden_type_def_impl_t *type_def_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, type_system_uri, AXIS2_FAILURE);
     super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env);
-    type_def_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    type_def_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING));
 
     if (type_def_impl->f_system)
@@ -399,11 +399,11 @@
     const axutil_env_t *env)
 {
     woden_type_def_impl_t *type_def_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env);
-    type_def_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    type_def_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING));
 
     return type_def_impl->f_system;
@@ -416,12 +416,12 @@
     axis2_char_t *content_model)
 {
     woden_type_def_impl_t *type_def_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, content_model, AXIS2_FAILURE);
     super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env);
-    type_def_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    type_def_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING));
 
     if (type_def_impl->f_content_model)
@@ -438,11 +438,11 @@
     const axutil_env_t *env)
 {
     woden_type_def_impl_t *type_def_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env);
-    type_def_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    type_def_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING));
 
     return type_def_impl->f_content_model;
@@ -455,12 +455,12 @@
     void *type_def_content)
 {
     woden_type_def_impl_t *type_def_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, type_def, AXIS2_FAILURE);
     super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env);
-    type_def_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    type_def_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING));
 
     if (type_def_impl->f_content)
@@ -477,11 +477,11 @@
     const axutil_env_t *env)
 {
     woden_type_def_impl_t *type_def_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPE_DEF_SUPER_OBJS(type_def, env);
-    type_def_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    type_def_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPE_DEF", AXIS2_HASH_KEY_STRING));
 
     return type_def_impl->f_content;



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