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 [19/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/woden_interface_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c Fri Mar 30 11:28:18 2007
@@ -39,8 +39,8 @@
     woden_interface_msg_ref_t interface_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_msg_label;
     void *f_direction;
     axis2_char_t *f_msg_content_model;
@@ -56,7 +56,7 @@
     void *interface_msg_ref,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_interface_msg_ref_super_objs(
     void *interface_msg_ref,
     const axutil_env_t *env);
@@ -481,56 +481,56 @@
     interface_msg_ref_impl->interface_msg_ref.ops->set_types =
         woden_interface_msg_ref_set_types;
 
-    interface_msg_ref_impl->methods = axis2_hash_make(env);
+    interface_msg_ref_impl->methods = axutil_hash_make(env);
     if (!interface_msg_ref_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(interface_msg_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(interface_msg_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_free);
-    axis2_hash_set(interface_msg_ref_impl->methods, "super_objs",
+    axutil_hash_set(interface_msg_ref_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_interface_msg_ref_super_objs);
-    axis2_hash_set(interface_msg_ref_impl->methods, "type",
+    axutil_hash_set(interface_msg_ref_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_interface_msg_ref_type);
 
-    axis2_hash_set(interface_msg_ref_impl->methods, "get_msg_label",
+    axutil_hash_set(interface_msg_ref_impl->methods, "get_msg_label",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_get_msg_label);
-    axis2_hash_set(interface_msg_ref_impl->methods, "get_direction",
+    axutil_hash_set(interface_msg_ref_impl->methods, "get_direction",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_get_direction);
-    axis2_hash_set(interface_msg_ref_impl->methods, "get_msg_content_model",
+    axutil_hash_set(interface_msg_ref_impl->methods, "get_msg_content_model",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_get_msg_content_model);
-    axis2_hash_set(interface_msg_ref_impl->methods, "get_element_declaration",
+    axutil_hash_set(interface_msg_ref_impl->methods, "get_element_declaration",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_get_element_declaration);
-    axis2_hash_set(interface_msg_ref_impl->methods, "to_element",
+    axutil_hash_set(interface_msg_ref_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_to_element);
-    axis2_hash_set(interface_msg_ref_impl->methods, "set_msg_label",
+    axutil_hash_set(interface_msg_ref_impl->methods, "set_msg_label",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_set_msg_label);
-    axis2_hash_set(interface_msg_ref_impl->methods, "set_msg_content_model",
+    axutil_hash_set(interface_msg_ref_impl->methods, "set_msg_content_model",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_set_msg_content_model);
-    axis2_hash_set(interface_msg_ref_impl->methods, "set_element_qname",
+    axutil_hash_set(interface_msg_ref_impl->methods, "set_element_qname",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_set_element_qname);
-    axis2_hash_set(interface_msg_ref_impl->methods, "get_element_qname",
+    axutil_hash_set(interface_msg_ref_impl->methods, "get_element_qname",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_get_element_qname);
-    axis2_hash_set(interface_msg_ref_impl->methods, "get_element",
+    axutil_hash_set(interface_msg_ref_impl->methods, "get_element",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_get_element);
-    axis2_hash_set(interface_msg_ref_impl->methods, "set_direction",
+    axutil_hash_set(interface_msg_ref_impl->methods, "set_direction",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_set_direction);
-    axis2_hash_set(interface_msg_ref_impl->methods, "set_element_declaration",
+    axutil_hash_set(interface_msg_ref_impl->methods, "set_element_declaration",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_set_element_declaration);
-    axis2_hash_set(interface_msg_ref_impl->methods, "set_types",
+    axutil_hash_set(interface_msg_ref_impl->methods, "set_types",
             AXIS2_HASH_KEY_STRING,
             woden_interface_msg_ref_set_types);
 
@@ -548,21 +548,21 @@
 
     interface_msg_ref_impl->nested_configurable = woden_nested_configurable_create(env);
 
-    interface_msg_ref_impl->super = axis2_hash_make(env);
+    interface_msg_ref_impl->super = axutil_hash_make(env);
     if (!interface_msg_ref_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(interface_msg_ref_impl->super, "WODEN_INTERFACE_MSG_REF",
+    axutil_hash_set(interface_msg_ref_impl->super, "WODEN_INTERFACE_MSG_REF",
             AXIS2_HASH_KEY_STRING,
             &(interface_msg_ref_impl->interface_msg_ref));
-    axis2_hash_set(interface_msg_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
+    axutil_hash_set(interface_msg_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING,
             interface_msg_ref_impl->nested_configurable);
     configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
                 interface_msg_ref_impl->nested_configurable, env);
-    axis2_hash_set(interface_msg_ref_impl->super, "WODEN_CONFIGURABLE",
+    axutil_hash_set(interface_msg_ref_impl->super, "WODEN_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING, configurable);
 
     return &(interface_msg_ref_impl->interface_msg_ref);
@@ -709,13 +709,13 @@
 
     if (interface_msg_ref_impl->super)
     {
-        axis2_hash_free(interface_msg_ref_impl->super, env);
+        axutil_hash_free(interface_msg_ref_impl->super, env);
         interface_msg_ref_impl->super = NULL;
     }
 
     if (interface_msg_ref_impl->methods)
     {
-        axis2_hash_free(interface_msg_ref_impl->methods, env);
+        axutil_hash_free(interface_msg_ref_impl->methods, env);
         interface_msg_ref_impl->methods = NULL;
     }
 
@@ -742,7 +742,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_interface_msg_ref_super_objs(
     void *interface_msg_ref,
     const axutil_env_t *env)
@@ -786,7 +786,7 @@
     woden_interface_msg_ref_t *interface_msg_ref,
     const axutil_env_t *env,
     woden_interface_msg_ref_t *interface_msg_ref_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_interface_msg_ref_impl_t *interface_msg_ref_impl_l = NULL;
 
@@ -794,50 +794,50 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     interface_msg_ref_impl_l = INTF_TO_IMPL(interface_msg_ref_impl);
 
-    interface_msg_ref->ops->free = axis2_hash_get(methods, "free",
+    interface_msg_ref->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    interface_msg_ref->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    interface_msg_ref->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    interface_msg_ref->ops->type = axis2_hash_get(methods, "type",
+    interface_msg_ref->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    interface_msg_ref->ops->get_msg_label = axis2_hash_get(methods,
+    interface_msg_ref->ops->get_msg_label = axutil_hash_get(methods,
             "", AXIS2_HASH_KEY_STRING);
     if (!interface_msg_ref->ops->get_msg_label && interface_msg_ref_impl_l)
         interface_msg_ref->ops->get_msg_label =
             interface_msg_ref_impl_l->interface_msg_ref.ops->get_msg_label;
 
-    interface_msg_ref->ops->get_direction = axis2_hash_get(methods,
+    interface_msg_ref->ops->get_direction = axutil_hash_get(methods,
             "get_direction", AXIS2_HASH_KEY_STRING);
     if (!interface_msg_ref->ops->get_direction && interface_msg_ref_impl_l)
         interface_msg_ref->ops->get_direction =
             interface_msg_ref_impl_l->interface_msg_ref.ops->get_direction;
 
-    interface_msg_ref->ops->get_msg_content_model = axis2_hash_get(methods,
+    interface_msg_ref->ops->get_msg_content_model = axutil_hash_get(methods,
             "get_msg_content_model", AXIS2_HASH_KEY_STRING);
     if (!interface_msg_ref->ops->get_msg_content_model && interface_msg_ref_impl_l)
         interface_msg_ref->ops->get_msg_content_model =
             interface_msg_ref_impl_l->interface_msg_ref.ops->get_msg_content_model;
 
-    interface_msg_ref->ops->get_element_declaration = axis2_hash_get(methods,
+    interface_msg_ref->ops->get_element_declaration = axutil_hash_get(methods,
             "get_element_declaration", AXIS2_HASH_KEY_STRING);
     if (!interface_msg_ref->ops->get_element_declaration && interface_msg_ref_impl_l)
         interface_msg_ref->ops->get_element_declaration =
             interface_msg_ref_impl_l->interface_msg_ref.ops->get_element_declaration;
 
-    interface_msg_ref->ops->to_element = axis2_hash_get(methods,
+    interface_msg_ref->ops->to_element = axutil_hash_get(methods,
             "to_element", AXIS2_HASH_KEY_STRING);
     if (!interface_msg_ref->ops->to_element && interface_msg_ref_impl_l)
         interface_msg_ref->ops->to_element =
             interface_msg_ref_impl_l->interface_msg_ref.ops->to_element;
 
-    interface_msg_ref->ops->set_element_declaration = axis2_hash_get(methods,
+    interface_msg_ref->ops->set_element_declaration = axutil_hash_get(methods,
             "set_element_declaration", AXIS2_HASH_KEY_STRING);
     if (!interface_msg_ref->ops->set_element_declaration && interface_msg_ref_impl_l)
         interface_msg_ref->ops->set_element_declaration =
             interface_msg_ref_impl_l->interface_msg_ref.ops->set_element_declaration;
 
-    interface_msg_ref->ops->set_types = axis2_hash_get(methods,
+    interface_msg_ref->ops->set_types = axutil_hash_get(methods,
             "set_types", AXIS2_HASH_KEY_STRING);
     if (!interface_msg_ref->ops->set_types && interface_msg_ref_impl_l)
         interface_msg_ref->ops->set_types =
@@ -856,11 +856,11 @@
     const axutil_env_t *env)
 {
     woden_interface_msg_ref_impl_t *interface_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     return interface_msg_ref_impl->f_msg_label;
@@ -872,11 +872,11 @@
     const axutil_env_t *env)
 {
     woden_interface_msg_ref_impl_t *interface_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     return interface_msg_ref_impl->f_direction;
@@ -888,11 +888,11 @@
     const axutil_env_t *env)
 {
     woden_interface_msg_ref_impl_t *interface_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     return interface_msg_ref_impl->f_msg_content_model;
@@ -904,11 +904,11 @@
     const axutil_env_t *env)
 {
     woden_interface_msg_ref_impl_t *interface_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     return interface_msg_ref_impl->f_element_decl;
@@ -920,11 +920,11 @@
     const axutil_env_t *env)
 {
     woden_interface_msg_ref_impl_t *interface_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     return &(interface_msg_ref_impl->interface_msg_ref);
@@ -941,12 +941,12 @@
     void *msg_label)
 {
     woden_interface_msg_ref_impl_t *interface_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_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     if (!interface_msg_ref_impl->f_msg_label)
@@ -966,12 +966,12 @@
     void *dir)
 {
     woden_interface_msg_ref_impl_t *interface_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_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     if (!interface_msg_ref_impl->f_direction)
@@ -992,12 +992,12 @@
     axis2_char_t *nm_token)
 {
     woden_interface_msg_ref_impl_t *interface_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, nm_token, AXIS2_FAILURE);
     super = WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     if (interface_msg_ref_impl->f_msg_content_model)
@@ -1015,12 +1015,12 @@
     axis2_qname_t *element)
 {
     woden_interface_msg_ref_impl_t *interface_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, element, AXIS2_FAILURE);
     super = WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     if (interface_msg_ref_impl->f_element_qname)
@@ -1037,11 +1037,11 @@
     const axutil_env_t *env)
 {
     woden_interface_msg_ref_impl_t *interface_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     return interface_msg_ref_impl->f_element_qname;
@@ -1053,12 +1053,12 @@
     const axutil_env_t *env)
 {
     woden_interface_msg_ref_impl_t *interface_msg_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
     xml_schema_element_t *xse = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     if (interface_msg_ref_impl->f_types)
@@ -1082,12 +1082,12 @@
     void *element)
 {
     woden_interface_msg_ref_impl_t *interface_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, element, AXIS2_FAILURE);
     super = WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     if (!interface_msg_ref_impl->f_element_decl)
@@ -1106,12 +1106,12 @@
     void *types)
 {
     woden_interface_msg_ref_impl_t *interface_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, types, AXIS2_FAILURE);
     super = WODEN_INTERFACE_MSG_REF_SUPER_OBJS(interface_msg_ref, env);
-    interface_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_INTERFACE_MSG_REF", AXIS2_HASH_KEY_STRING));
 
     if (!interface_msg_ref_impl->f_types)

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c Fri Mar 30 11:28:18 2007
@@ -34,8 +34,8 @@
     woden_svc_t svc;
     woden_obj_types_t obj_type;
     woden_configurable_t *configurable;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
     axis2_qname_t *f_qname;
     axis2_qname_t *f_interface_qname;
     void *f_interface;
@@ -49,7 +49,7 @@
     void *svc,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_svc_super_objs(
     void *svc,
     const axutil_env_t *env);
@@ -437,47 +437,47 @@
     svc_impl->svc.ops->set_interface_element =
         woden_svc_set_interface_element;
 
-    svc_impl->methods = axis2_hash_make(env);
+    svc_impl->methods = axutil_hash_make(env);
     if (!svc_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(svc_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(svc_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_svc_free);
-    axis2_hash_set(svc_impl->methods, "super_objs",
+    axutil_hash_set(svc_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_svc_super_objs);
-    axis2_hash_set(svc_impl->methods, "type",
+    axutil_hash_set(svc_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_svc_type);
 
-    axis2_hash_set(svc_impl->methods, "get_qname",
+    axutil_hash_set(svc_impl->methods, "get_qname",
             AXIS2_HASH_KEY_STRING,
             woden_svc_get_qname);
-    axis2_hash_set(svc_impl->methods, "get_interface",
+    axutil_hash_set(svc_impl->methods, "get_interface",
             AXIS2_HASH_KEY_STRING,
             woden_svc_get_interface);
-    axis2_hash_set(svc_impl->methods, "get_endpoints",
+    axutil_hash_set(svc_impl->methods, "get_endpoints",
             AXIS2_HASH_KEY_STRING,
             woden_svc_get_endpoints);
-    axis2_hash_set(svc_impl->methods, "set_qname",
+    axutil_hash_set(svc_impl->methods, "set_qname",
             AXIS2_HASH_KEY_STRING,
             woden_svc_set_qname);
-    axis2_hash_set(svc_impl->methods, "set_interface_qname",
+    axutil_hash_set(svc_impl->methods, "set_interface_qname",
             AXIS2_HASH_KEY_STRING,
             woden_svc_set_interface_qname);
-    axis2_hash_set(svc_impl->methods, "get_interface_qname",
+    axutil_hash_set(svc_impl->methods, "get_interface_qname",
             AXIS2_HASH_KEY_STRING,
             woden_svc_get_interface_qname);
-    axis2_hash_set(svc_impl->methods, "get_interface_element",
+    axutil_hash_set(svc_impl->methods, "get_interface_element",
             AXIS2_HASH_KEY_STRING,
             woden_svc_get_interface_element);
-    axis2_hash_set(svc_impl->methods, "add_endpoint_element",
+    axutil_hash_set(svc_impl->methods, "add_endpoint_element",
             AXIS2_HASH_KEY_STRING,
             woden_svc_add_endpoint_element);
-    axis2_hash_set(svc_impl->methods, "get_endpoint_elements",
+    axutil_hash_set(svc_impl->methods, "get_endpoint_elements",
             AXIS2_HASH_KEY_STRING,
             woden_svc_get_endpoint_elements);
-    axis2_hash_set(svc_impl->methods, "set_interface_element",
+    axutil_hash_set(svc_impl->methods, "set_interface_element",
             AXIS2_HASH_KEY_STRING,
             woden_svc_set_interface_element);
 
@@ -494,15 +494,15 @@
 
     svc_impl->configurable = woden_configurable_create(env);
 
-    svc_impl->super = axis2_hash_make(env);
+    svc_impl->super = axutil_hash_make(env);
     if (!svc_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(svc_impl->super, "WODEN_SVC", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(svc_impl->super, "WODEN_SVC", AXIS2_HASH_KEY_STRING,
             &(svc_impl->svc));
-    axis2_hash_set(svc_impl->super, "WODEN_NESTED_CONFIGURABLE", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(svc_impl->super, "WODEN_NESTED_CONFIGURABLE", AXIS2_HASH_KEY_STRING,
             svc_impl->configurable);
 
     return &(svc_impl->svc);
@@ -635,13 +635,13 @@
 
     if (svc_impl->super)
     {
-        axis2_hash_free(svc_impl->super, env);
+        axutil_hash_free(svc_impl->super, env);
         svc_impl->super = NULL;
     }
 
     if (svc_impl->methods)
     {
-        axis2_hash_free(svc_impl->methods, env);
+        axutil_hash_free(svc_impl->methods, env);
         svc_impl->methods = NULL;
     }
 
@@ -667,7 +667,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_svc_super_objs(
     void *svc,
     const axutil_env_t *env)
@@ -711,7 +711,7 @@
     woden_svc_t *svc,
     const axutil_env_t *env,
     woden_svc_t *svc_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_svc_impl_t *svc_impl_l = NULL;
 
@@ -719,32 +719,32 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     svc_impl_l = INTF_TO_IMPL(svc_impl);
 
-    svc->ops->free = axis2_hash_get(methods, "free",
+    svc->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    svc->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    svc->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    svc->ops->type = axis2_hash_get(methods, "type",
+    svc->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    svc->ops->get_qname = axis2_hash_get(methods,
+    svc->ops->get_qname = axutil_hash_get(methods,
             "get_qname", AXIS2_HASH_KEY_STRING);
     if (!svc->ops->get_qname && svc_impl_l)
         svc->ops->get_qname =
             svc_impl_l->svc.ops->get_qname;
 
-    svc->ops->get_interface = axis2_hash_get(methods,
+    svc->ops->get_interface = axutil_hash_get(methods,
             "get_interface", AXIS2_HASH_KEY_STRING);
     if (!svc->ops->get_interface && svc_impl_l)
         svc->ops->get_interface =
             svc_impl_l->svc.ops->get_interface;
 
-    svc->ops->get_endpoints = axis2_hash_get(methods,
+    svc->ops->get_endpoints = axutil_hash_get(methods,
             "get_endpoints", AXIS2_HASH_KEY_STRING);
     if (!svc->ops->get_endpoints && svc_impl_l)
         svc->ops->get_endpoints =
             svc_impl_l->svc.ops->get_endpoints;
 
-    svc->ops->set_interface_element = axis2_hash_get(methods,
+    svc->ops->set_interface_element = axutil_hash_get(methods,
             "set_interface_element", AXIS2_HASH_KEY_STRING);
     if (!svc->ops->set_interface_element && svc_impl_l)
         svc->ops->set_interface_element =
@@ -762,11 +762,11 @@
     const axutil_env_t *env)
 {
     woden_svc_impl_t *svc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_SVC_SUPER_OBJS(svc, env);
-    svc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    svc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SVC", AXIS2_HASH_KEY_STRING));
 
     return svc_impl->f_qname;
@@ -778,11 +778,11 @@
     const axutil_env_t *env)
 {
     woden_svc_impl_t *svc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_SVC_SUPER_OBJS(svc, env);
-    svc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    svc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SVC", AXIS2_HASH_KEY_STRING));
 
     return svc_impl->f_interface;
@@ -794,11 +794,11 @@
     const axutil_env_t *env)
 {
     woden_svc_impl_t *svc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_SVC_SUPER_OBJS(svc, env);
-    svc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    svc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SVC", AXIS2_HASH_KEY_STRING));
 
     return svc_impl->f_endpoints;
@@ -814,11 +814,11 @@
     axis2_qname_t *qname)
 {
     woden_svc_impl_t *svc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_SVC_SUPER_OBJS(svc, env);
-    svc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    svc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SVC", AXIS2_HASH_KEY_STRING));
 
     if (svc_impl->f_qname)
@@ -836,11 +836,11 @@
     axis2_qname_t *interface_qname)
 {
     woden_svc_impl_t *svc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_SVC_SUPER_OBJS(svc, env);
-    svc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    svc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SVC", AXIS2_HASH_KEY_STRING));
 
     if (svc_impl->f_interface_qname)
@@ -858,11 +858,11 @@
     const axutil_env_t *env)
 {
     woden_svc_impl_t *svc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_SVC_SUPER_OBJS(svc, env);
-    svc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    svc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SVC", AXIS2_HASH_KEY_STRING));
 
     return svc_impl->f_interface_qname;
@@ -874,11 +874,11 @@
     const axutil_env_t *env)
 {
     woden_svc_impl_t *svc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_SVC_SUPER_OBJS(svc, env);
-    svc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    svc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SVC", AXIS2_HASH_KEY_STRING));
 
     return svc_impl->f_interface;
@@ -891,11 +891,11 @@
     void *endpoint)
 {
     woden_svc_impl_t *svc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_SVC_SUPER_OBJS(svc, env);
-    svc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    svc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SVC", AXIS2_HASH_KEY_STRING));
 
     if (!svc_impl->f_endpoints)
@@ -917,11 +917,11 @@
     const axutil_env_t *env)
 {
     woden_svc_impl_t *svc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_SVC_SUPER_OBJS(svc, env);
-    svc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    svc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SVC", AXIS2_HASH_KEY_STRING));
 
     return svc_impl->f_endpoints;
@@ -937,11 +937,11 @@
     void *interface)
 {
     woden_svc_impl_t *svc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_SVC_SUPER_OBJS(svc, env);
-    svc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    svc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SVC", AXIS2_HASH_KEY_STRING));
 
     if (svc_impl->f_interface)

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_fault_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_fault_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_fault_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_fault_element.c Fri Mar 30 11:28:18 2007
@@ -21,26 +21,26 @@
 woden_binding_fault_element_resolve_methods(
     woden_binding_fault_element_t *binding_fault_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);
 
-    binding_fault_element->ops->free = axis2_hash_get(methods, "free",
+    binding_fault_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_fault_element->ops->type = axis2_hash_get(methods, "type",
+    binding_fault_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     binding_fault_element->ops->set_ref =
-        axis2_hash_get(methods, "set_ref",
+        axutil_hash_get(methods, "set_ref",
                 AXIS2_HASH_KEY_STRING);
 
     binding_fault_element->ops->get_ref =
-        axis2_hash_get(methods, "get_ref",
+        axutil_hash_get(methods, "get_ref",
                 AXIS2_HASH_KEY_STRING);
 
     binding_fault_element->ops->get_interface_fault_element =
-        axis2_hash_get(methods, "get_interface_fault_element",
+        axutil_hash_get(methods, "get_interface_fault_element",
                 AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_msg_ref_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_msg_ref_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_msg_ref_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_msg_ref_element.c Fri Mar 30 11:28:18 2007
@@ -21,30 +21,30 @@
 woden_binding_msg_ref_element_resolve_methods(
     woden_binding_msg_ref_element_t *binding_msg_ref_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);
 
-    binding_msg_ref_element->ops->free = axis2_hash_get(methods, "free",
+    binding_msg_ref_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_msg_ref_element->ops->type = axis2_hash_get(methods, "type",
+    binding_msg_ref_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     binding_msg_ref_element->ops->set_msg_label =
-        axis2_hash_get(methods, "set_msg_label",
+        axutil_hash_get(methods, "set_msg_label",
                 AXIS2_HASH_KEY_STRING);
 
     binding_msg_ref_element->ops->get_msg_label =
-        axis2_hash_get(methods, "get_msg_label",
+        axutil_hash_get(methods, "get_msg_label",
                 AXIS2_HASH_KEY_STRING);
 
     binding_msg_ref_element->ops->set_direction =
-        axis2_hash_get(methods, "set_direction",
+        axutil_hash_get(methods, "set_direction",
                 AXIS2_HASH_KEY_STRING);
 
     binding_msg_ref_element->ops->get_direction =
-        axis2_hash_get(methods, "get_direction",
+        axutil_hash_get(methods, "get_direction",
                 AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_op_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_op_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_op_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_binding_op_element.c Fri Mar 30 11:28:18 2007
@@ -21,50 +21,50 @@
 woden_binding_op_element_resolve_methods(
     woden_binding_op_element_t *binding_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);
 
-    binding_op_element->ops->free = axis2_hash_get(methods, "free",
+    binding_op_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_op_element->ops->type = axis2_hash_get(methods, "type",
+    binding_op_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     binding_op_element->ops->set_ref =
-        axis2_hash_get(methods, "set_ref",
+        axutil_hash_get(methods, "set_ref",
                 AXIS2_HASH_KEY_STRING);
 
     binding_op_element->ops->get_ref =
-        axis2_hash_get(methods, "get_ref",
+        axutil_hash_get(methods, "get_ref",
                 AXIS2_HASH_KEY_STRING);
 
     binding_op_element->ops->get_interface_op_element =
-        axis2_hash_get(methods, "get_interface_op_element",
+        axutil_hash_get(methods, "get_interface_op_element",
                 AXIS2_HASH_KEY_STRING);
 
     binding_op_element->ops->add_binding_msg_ref_element =
-        axis2_hash_get(methods, "add_binding_msg_ref_element",
+        axutil_hash_get(methods, "add_binding_msg_ref_element",
                 AXIS2_HASH_KEY_STRING);
 
     binding_op_element->ops->remove_binding_msg_ref_element =
-        axis2_hash_get(methods, "remove_binding_msg_ref_element",
+        axutil_hash_get(methods, "remove_binding_msg_ref_element",
                 AXIS2_HASH_KEY_STRING);
 
     binding_op_element->ops->get_binding_msg_ref_elements =
-        axis2_hash_get(methods, "get_binding_msg_ref_elements",
+        axutil_hash_get(methods, "get_binding_msg_ref_elements",
                 AXIS2_HASH_KEY_STRING);
 
     binding_op_element->ops->add_binding_fault_ref_element =
-        axis2_hash_get(methods, "add_binding_fault_ref_element",
+        axutil_hash_get(methods, "add_binding_fault_ref_element",
                 AXIS2_HASH_KEY_STRING);
 
     binding_op_element->ops->remove_binding_fault_ref_element =
-        axis2_hash_get(methods, "remove_binding_fault_ref_element",
+        axutil_hash_get(methods, "remove_binding_fault_ref_element",
                 AXIS2_HASH_KEY_STRING);
 
     binding_op_element->ops->get_binding_fault_ref_elements =
-        axis2_hash_get(methods, "get_binding_fault_ref_elements",
+        axutil_hash_get(methods, "get_binding_fault_ref_elements",
                 AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_desc_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_desc_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_desc_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_desc_element.c Fri Mar 30 11:28:18 2007
@@ -21,97 +21,97 @@
 woden_desc_element_resolve_methods(
     woden_desc_element_t *desc_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);
 
-    desc_element->ops->free = axis2_hash_get(methods, "free",
+    desc_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    desc_element->ops->type = axis2_hash_get(methods, "type",
+    desc_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    desc_element->ops->set_document_base_uri = axis2_hash_get(methods,
+    desc_element->ops->set_document_base_uri = axutil_hash_get(methods,
             "set_document_base_uri", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_document_base_uri = axis2_hash_get(methods,
+    desc_element->ops->get_document_base_uri = axutil_hash_get(methods,
             "get_document_base_uri", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->set_target_namespace = axis2_hash_get(methods,
+    desc_element->ops->set_target_namespace = axutil_hash_get(methods,
             "set_target_namespace", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_target_namespace = axis2_hash_get(methods,
+    desc_element->ops->get_target_namespace = axutil_hash_get(methods,
             "get_target_namespace", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->add_namespace = axis2_hash_get(methods,
+    desc_element->ops->add_namespace = axutil_hash_get(methods,
             "add_namespace", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->remove_namespace = axis2_hash_get(methods,
+    desc_element->ops->remove_namespace = axutil_hash_get(methods,
             "remove_namespace", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_namespace = axis2_hash_get(methods,
+    desc_element->ops->get_namespace = axutil_hash_get(methods,
             "get_namespace", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_namespaces = axis2_hash_get(methods,
+    desc_element->ops->get_namespaces = axutil_hash_get(methods,
             "get_namespaces", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_documentation_element = axis2_hash_get(methods,
+    desc_element->ops->create_documentation_element = axutil_hash_get(methods,
             "create_documentation_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_import_element = axis2_hash_get(methods,
+    desc_element->ops->create_import_element = axutil_hash_get(methods,
             "create_import_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_include_element = axis2_hash_get(methods,
+    desc_element->ops->create_include_element = axutil_hash_get(methods,
             "create_include_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_types_element = axis2_hash_get(methods,
+    desc_element->ops->create_types_element = axutil_hash_get(methods,
             "create_types_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_interface_element = axis2_hash_get(methods,
+    desc_element->ops->create_interface_element = axutil_hash_get(methods,
             "create_interface_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_interface_fault_element = axis2_hash_get(methods,
+    desc_element->ops->create_interface_fault_element = axutil_hash_get(methods,
             "create_interface_fault_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_interface_op_element = axis2_hash_get(methods,
+    desc_element->ops->create_interface_op_element = axutil_hash_get(methods,
             "create_interface_op_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_interface_fault_ref_element = axis2_hash_get(methods,
+    desc_element->ops->create_interface_fault_ref_element = axutil_hash_get(methods,
             "create_interface_fault_ref_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_interface_msg_ref_element = axis2_hash_get(methods,
+    desc_element->ops->create_interface_msg_ref_element = axutil_hash_get(methods,
             "create_interface_msg_ref_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_binding_element = axis2_hash_get(methods,
+    desc_element->ops->create_binding_element = axutil_hash_get(methods,
             "create_binding_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_binding_fault_element = axis2_hash_get(methods,
+    desc_element->ops->create_binding_fault_element = axutil_hash_get(methods,
             "create_binding_fault_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_binding_op_element = axis2_hash_get(methods,
+    desc_element->ops->create_binding_op_element = axutil_hash_get(methods,
             "create_binding_op_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_binding_fault_ref_element = axis2_hash_get(methods,
+    desc_element->ops->create_binding_fault_ref_element = axutil_hash_get(methods,
             "create_binding_fault_ref_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_binding_msg_ref_element = axis2_hash_get(methods,
+    desc_element->ops->create_binding_msg_ref_element = axutil_hash_get(methods,
             "create_binding_msg_ref_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_feature_element = axis2_hash_get(methods,
+    desc_element->ops->create_feature_element = axutil_hash_get(methods,
             "create_feature_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_svc_element = axis2_hash_get(methods,
+    desc_element->ops->create_svc_element = axutil_hash_get(methods,
             "create_svc_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_endpoint_element = axis2_hash_get(methods,
+    desc_element->ops->create_endpoint_element = axutil_hash_get(methods,
             "create_endpoint_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->create_property_element = axis2_hash_get(methods,
+    desc_element->ops->create_property_element = axutil_hash_get(methods,
             "create_property_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->add_import_element = axis2_hash_get(methods,
+    desc_element->ops->add_import_element = axutil_hash_get(methods,
             "add_import_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_import_elements = axis2_hash_get(methods,
+    desc_element->ops->get_import_elements = axutil_hash_get(methods,
             "get_import_elements", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->add_include_element = axis2_hash_get(methods,
+    desc_element->ops->add_include_element = axutil_hash_get(methods,
             "add_include_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_include_elements = axis2_hash_get(methods,
+    desc_element->ops->get_include_elements = axutil_hash_get(methods,
             "get_include_elements", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->set_types_element = axis2_hash_get(methods,
+    desc_element->ops->set_types_element = axutil_hash_get(methods,
             "set_types_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_types_element = axis2_hash_get(methods,
+    desc_element->ops->get_types_element = axutil_hash_get(methods,
             "get_types_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->add_interface_element = axis2_hash_get(methods,
+    desc_element->ops->add_interface_element = axutil_hash_get(methods,
             "add_interface_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_interface_elements = axis2_hash_get(methods,
+    desc_element->ops->get_interface_elements = axutil_hash_get(methods,
             "get_interface_elements", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->add_binding_element = axis2_hash_get(methods,
+    desc_element->ops->add_binding_element = axutil_hash_get(methods,
             "add_binding_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_binding_elements = axis2_hash_get(methods,
+    desc_element->ops->get_binding_elements = axutil_hash_get(methods,
             "get_binding_elements", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->add_svc_element = axis2_hash_get(methods,
+    desc_element->ops->add_svc_element = axutil_hash_get(methods,
             "add_svc_element", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_svc_elements = axis2_hash_get(methods,
+    desc_element->ops->get_svc_elements = axutil_hash_get(methods,
             "get_svc_elements", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->set_ext_registry = axis2_hash_get(methods,
+    desc_element->ops->set_ext_registry = axutil_hash_get(methods,
             "set_ext_registry", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->get_ext_registry = axis2_hash_get(methods,
+    desc_element->ops->get_ext_registry = axutil_hash_get(methods,
             "get_ext_registry", AXIS2_HASH_KEY_STRING);
-    desc_element->ops->to_component = axis2_hash_get(methods,
+    desc_element->ops->to_component = axutil_hash_get(methods,
             "to_component", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_endpoint_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_endpoint_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_endpoint_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_endpoint_element.c Fri Mar 30 11:28:18 2007
@@ -21,28 +21,28 @@
 woden_endpoint_element_resolve_methods(
     woden_endpoint_element_t *endpoint_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);
 
-    endpoint_element->ops->free = axis2_hash_get(methods, "free",
+    endpoint_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    endpoint_element->ops->type = axis2_hash_get(methods, "type",
+    endpoint_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
-    endpoint_element->ops->set_name = axis2_hash_get(methods,
+    endpoint_element->ops->set_name = axutil_hash_get(methods,
             "set_name", AXIS2_HASH_KEY_STRING);
-    endpoint_element->ops->get_name = axis2_hash_get(methods,
+    endpoint_element->ops->get_name = axutil_hash_get(methods,
             "get_name", AXIS2_HASH_KEY_STRING);
-    endpoint_element->ops->set_binding_qname = axis2_hash_get(methods,
+    endpoint_element->ops->set_binding_qname = axutil_hash_get(methods,
             "set_binding_qname", AXIS2_HASH_KEY_STRING);
-    endpoint_element->ops->get_binding_qname = axis2_hash_get(methods,
+    endpoint_element->ops->get_binding_qname = axutil_hash_get(methods,
             "get_binding_qname", AXIS2_HASH_KEY_STRING);
-    endpoint_element->ops->get_binding_element = axis2_hash_get(methods,
+    endpoint_element->ops->get_binding_element = axutil_hash_get(methods,
             "get_binding_element", AXIS2_HASH_KEY_STRING);
-    endpoint_element->ops->set_address = axis2_hash_get(methods,
+    endpoint_element->ops->set_address = axutil_hash_get(methods,
             "set_address", AXIS2_HASH_KEY_STRING);
-    endpoint_element->ops->get_address = axis2_hash_get(methods,
+    endpoint_element->ops->get_address = axutil_hash_get(methods,
             "get_address", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_fault_ref_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_fault_ref_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_fault_ref_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_fault_ref_element.c Fri Mar 30 11:28:18 2007
@@ -21,38 +21,38 @@
 woden_fault_ref_element_resolve_methods(
     woden_interface_fault_ref_element_t *interface_fault_ref_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_fault_ref_element->ops->free = axis2_hash_get(methods, "free",
+    interface_fault_ref_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    interface_fault_ref_element->ops->type = axis2_hash_get(methods, "type",
+    interface_fault_ref_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->set_ref =
-        axis2_hash_get(methods, "set_ref",
+        axutil_hash_get(methods, "set_ref",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->get_ref =
-        axis2_hash_get(methods, "get_ref",
+        axutil_hash_get(methods, "get_ref",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->set_msg_label =
-        axis2_hash_get(methods, "set_msg_label",
+        axutil_hash_get(methods, "set_msg_label",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->get_msg_label =
-        axis2_hash_get(methods, "get_msg_label",
+        axutil_hash_get(methods, "get_msg_label",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->set_direction =
-        axis2_hash_get(methods, "set_direction",
+        axutil_hash_get(methods, "set_direction",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->get_direction =
-        axis2_hash_get(methods, "get_direction",
+        axutil_hash_get(methods, "get_direction",
                 AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_fault_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_fault_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_fault_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_fault_element.c Fri Mar 30 11:28:18 2007
@@ -22,34 +22,34 @@
     woden_interface_fault_element_t *interface_fault_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_fault_element->ops->free = axis2_hash_get(methods, "free",
+    interface_fault_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    interface_fault_element->ops->type = axis2_hash_get(methods, "type",
+    interface_fault_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     interface_fault_element->ops->set_qname =
-        axis2_hash_get(methods, "set_qname",
+        axutil_hash_get(methods, "set_qname",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_element->ops->get_qname =
-        axis2_hash_get(methods, "get_qname",
+        axutil_hash_get(methods, "get_qname",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_element->ops->set_element_qname =
-        axis2_hash_get(methods, "set_element_qname",
+        axutil_hash_get(methods, "set_element_qname",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_element->ops->get_element_qname =
-        axis2_hash_get(methods, "get_element_qname",
+        axutil_hash_get(methods, "get_element_qname",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_element->ops->get_element =
-        axis2_hash_get(methods, "get_element",
+        axutil_hash_get(methods, "get_element",
                 AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_fault_ref_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_fault_ref_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_fault_ref_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_fault_ref_element.c Fri Mar 30 11:28:18 2007
@@ -21,42 +21,42 @@
 woden_interface_fault_ref_element_resolve_methods(
     woden_interface_fault_ref_element_t *interface_fault_ref_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_fault_ref_element->ops->free = axis2_hash_get(methods, "free",
+    interface_fault_ref_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    interface_fault_ref_element->ops->type = axis2_hash_get(methods, "type",
+    interface_fault_ref_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->set_ref =
-        axis2_hash_get(methods, "set_ref",
+        axutil_hash_get(methods, "set_ref",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->get_ref =
-        axis2_hash_get(methods, "get_ref",
+        axutil_hash_get(methods, "get_ref",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->get_interface_fault_element =
-        axis2_hash_get(methods, "get_interface_fault_element",
+        axutil_hash_get(methods, "get_interface_fault_element",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->set_msg_label =
-        axis2_hash_get(methods, "set_msg_label",
+        axutil_hash_get(methods, "set_msg_label",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->get_msg_label =
-        axis2_hash_get(methods, "get_msg_label",
+        axutil_hash_get(methods, "get_msg_label",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->set_direction =
-        axis2_hash_get(methods, "set_direction",
+        axutil_hash_get(methods, "set_direction",
                 AXIS2_HASH_KEY_STRING);
 
     interface_fault_ref_element->ops->get_direction =
-        axis2_hash_get(methods, "get_direction",
+        axutil_hash_get(methods, "get_direction",
                 AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_msg_ref_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_msg_ref_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_msg_ref_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_interface_msg_ref_element.c Fri Mar 30 11:28:18 2007
@@ -21,52 +21,52 @@
 woden_interface_msg_ref_element_resolve_methods(
     woden_interface_msg_ref_element_t *interface_msg_ref_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_msg_ref_element->ops->free = axis2_hash_get(methods, "free",
+    interface_msg_ref_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    interface_msg_ref_element->ops->type = axis2_hash_get(methods, "type",
+    interface_msg_ref_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     interface_msg_ref_element->ops->set_msg_label =
-        axis2_hash_get(methods, "set_msg_label",
+        axutil_hash_get(methods, "set_msg_label",
                 AXIS2_HASH_KEY_STRING);
 
     interface_msg_ref_element->ops->get_msg_label =
-        axis2_hash_get(methods, "get_msg_label",
+        axutil_hash_get(methods, "get_msg_label",
                 AXIS2_HASH_KEY_STRING);
 
     interface_msg_ref_element->ops->set_msg_content_model =
-        axis2_hash_get(methods, "set_msg_content_model",
+        axutil_hash_get(methods, "set_msg_content_model",
                 AXIS2_HASH_KEY_STRING);
 
     interface_msg_ref_element->ops->get_msg_content_model =
-        axis2_hash_get(methods, "get_msg_cotent_model",
+        axutil_hash_get(methods, "get_msg_cotent_model",
                 AXIS2_HASH_KEY_STRING);
 
     interface_msg_ref_element->ops->set_element_qname =
-        axis2_hash_get(methods, "set_element_qname",
+        axutil_hash_get(methods, "set_element_qname",
                 AXIS2_HASH_KEY_STRING);
 
     interface_msg_ref_element->ops->get_element_qname =
-        axis2_hash_get(methods, "get_element_qname",
+        axutil_hash_get(methods, "get_element_qname",
                 AXIS2_HASH_KEY_STRING);
 
 
     interface_msg_ref_element->ops->get_element =
-        axis2_hash_get(methods, "get_element",
+        axutil_hash_get(methods, "get_element",
                 AXIS2_HASH_KEY_STRING);
 
 
     interface_msg_ref_element->ops->set_direction =
-        axis2_hash_get(methods, "set_direction",
+        axutil_hash_get(methods, "set_direction",
                 AXIS2_HASH_KEY_STRING);
 
     interface_msg_ref_element->ops->get_direction =
-        axis2_hash_get(methods, "get_direction",
+        axutil_hash_get(methods, "get_direction",
                 AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_svc_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_svc_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_svc_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/xml/woden_svc_element.c Fri Mar 30 11:28:18 2007
@@ -21,28 +21,28 @@
 woden_svc_element_resolve_methods(
     woden_svc_element_t *svc_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);
 
-    svc_element->ops->free = axis2_hash_get(methods, "free",
+    svc_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    svc_element->ops->type = axis2_hash_get(methods, "type",
+    svc_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
-    svc_element->ops->set_qname = axis2_hash_get(methods,
+    svc_element->ops->set_qname = axutil_hash_get(methods,
             "set_qname", AXIS2_HASH_KEY_STRING);
-    svc_element->ops->get_qname = axis2_hash_get(methods,
+    svc_element->ops->get_qname = axutil_hash_get(methods,
             "get_qname", AXIS2_HASH_KEY_STRING);
-    svc_element->ops->set_interface_qname = axis2_hash_get(methods,
+    svc_element->ops->set_interface_qname = axutil_hash_get(methods,
             "set_interface_qname", AXIS2_HASH_KEY_STRING);
-    svc_element->ops->get_interface_qname = axis2_hash_get(methods,
+    svc_element->ops->get_interface_qname = axutil_hash_get(methods,
             "get_interface_qname", AXIS2_HASH_KEY_STRING);
-    svc_element->ops->get_interface_element = axis2_hash_get(methods,
+    svc_element->ops->get_interface_element = axutil_hash_get(methods,
             "get_interface_element", AXIS2_HASH_KEY_STRING);
-    svc_element->ops->add_endpoint_element = axis2_hash_get(methods,
+    svc_element->ops->add_endpoint_element = axutil_hash_get(methods,
             "add_endpoint_element", AXIS2_HASH_KEY_STRING);
-    svc_element->ops->get_endpoint_elements = axis2_hash_get(methods,
+    svc_element->ops->get_endpoint_elements = axutil_hash_get(methods,
             "get_endpoint_elements", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/xml/woden_bool_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_bool_attr.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_bool_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_bool_attr.c Fri Mar 30 11:28:18 2007
@@ -31,7 +31,7 @@
     woden_bool_attr_t bool_attr;
     woden_xml_attr_t *xml_attr;
     woden_obj_types_t obj_type;
-    axis2_hash_t *methods;
+    axutil_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(bool_attr) \
@@ -89,19 +89,19 @@
         woden_bool_attr_convert;
 
 
-    bool_attr_impl->methods = axis2_hash_make(env);
+    bool_attr_impl->methods = axutil_hash_make(env);
     if (!bool_attr_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(bool_attr_impl->methods, "free",
+    axutil_hash_set(bool_attr_impl->methods, "free",
             AXIS2_HASH_KEY_STRING, woden_bool_attr_free);
-    axis2_hash_set(bool_attr_impl->methods, "type",
+    axutil_hash_set(bool_attr_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_bool_attr_type);
-    axis2_hash_set(bool_attr_impl->methods, "get_boolean",
+    axutil_hash_set(bool_attr_impl->methods, "get_boolean",
             AXIS2_HASH_KEY_STRING, woden_bool_attr_get_boolean);
-    axis2_hash_set(bool_attr_impl->methods, "convert",
+    axutil_hash_set(bool_attr_impl->methods, "convert",
             AXIS2_HASH_KEY_STRING, woden_bool_attr_convert);
 
     return &(bool_attr_impl->bool_attr);
@@ -152,7 +152,7 @@
 
     if (bool_attr_impl->methods)
     {
-        axis2_hash_free(bool_attr_impl->methods, env);
+        axutil_hash_free(bool_attr_impl->methods, env);
         bool_attr_impl->methods = NULL;
     }
 
@@ -192,20 +192,20 @@
 woden_bool_attr_resolve_methods(
     woden_bool_attr_t *bool_attr,
     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);
 
     bool_attr->ops->free =
-        axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
-    bool_attr->ops->to_bool_attr_free = axis2_hash_get(methods,
+        axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
+    bool_attr->ops->to_bool_attr_free = axutil_hash_get(methods,
             "to_bool_attr_free", AXIS2_HASH_KEY_STRING);
     bool_attr->ops->type =
-        axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
-    bool_attr->ops->get_boolean = axis2_hash_get(methods, "get_boolean",
+        axutil_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
+    bool_attr->ops->get_boolean = axutil_hash_get(methods, "get_boolean",
             AXIS2_HASH_KEY_STRING);
-    bool_attr->ops->convert = axis2_hash_get(methods, "convert",
+    bool_attr->ops->convert = axutil_hash_get(methods, "convert",
             AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/xml/woden_qname_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_qname_attr.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_qname_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_qname_attr.c Fri Mar 30 11:28:18 2007
@@ -31,7 +31,7 @@
     woden_qname_attr_t qname_attr;
     woden_xml_attr_t *xml_attr;
     woden_obj_types_t obj_type;
-    axis2_hash_t *methods;
+    axutil_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(qname_attr) \
@@ -102,19 +102,19 @@
         woden_qname_attr_convert;
 
 
-    qname_attr_impl->methods = axis2_hash_make(env);
+    qname_attr_impl->methods = axutil_hash_make(env);
     if (!qname_attr_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(qname_attr_impl->methods, "free",
+    axutil_hash_set(qname_attr_impl->methods, "free",
             AXIS2_HASH_KEY_STRING, woden_qname_attr_free);
-    axis2_hash_set(qname_attr_impl->methods, "type",
+    axutil_hash_set(qname_attr_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_qname_attr_type);
-    axis2_hash_set(qname_attr_impl->methods, "get_qname",
+    axutil_hash_set(qname_attr_impl->methods, "get_qname",
             AXIS2_HASH_KEY_STRING, woden_qname_attr_get_qname);
-    axis2_hash_set(qname_attr_impl->methods, "convert",
+    axutil_hash_set(qname_attr_impl->methods, "convert",
             AXIS2_HASH_KEY_STRING, woden_qname_attr_convert);
 
     qname_attr_impl->xml_attr = woden_xml_attr_create(env, owner_el,
@@ -148,7 +148,7 @@
 
     if (qname_attr_impl->methods)
     {
-        axis2_hash_free(qname_attr_impl->methods, env);
+        axutil_hash_free(qname_attr_impl->methods, env);
         qname_attr_impl->methods = NULL;
     }
 
@@ -189,20 +189,20 @@
 woden_qname_attr_resolve_methods(
     woden_qname_attr_t *qname_attr,
     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);
 
-    qname_attr->ops->free = axis2_hash_get(methods,
+    qname_attr->ops->free = axutil_hash_get(methods,
             "free", AXIS2_HASH_KEY_STRING);
-    qname_attr->ops->to_qname_attr_free = axis2_hash_get(methods,
+    qname_attr->ops->to_qname_attr_free = axutil_hash_get(methods,
             "to_qname_attr_free", AXIS2_HASH_KEY_STRING);
-    qname_attr->ops->type = axis2_hash_get(methods,
+    qname_attr->ops->type = axutil_hash_get(methods,
             "type", AXIS2_HASH_KEY_STRING);
-    qname_attr->ops->get_qname = axis2_hash_get(methods,
+    qname_attr->ops->get_qname = axutil_hash_get(methods,
             "get_qname", AXIS2_HASH_KEY_STRING);
-    qname_attr->ops->convert = axis2_hash_get(methods,
+    qname_attr->ops->convert = axutil_hash_get(methods,
             "convert", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_attr.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_attr.c Fri Mar 30 11:28:18 2007
@@ -31,7 +31,7 @@
     woden_qname_list_attr_t qname_list_attr;
     woden_xml_attr_t *xml_attr;
     woden_obj_types_t obj_type;
-    axis2_hash_t *methods;
+    axutil_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(qname_list_attr) \
@@ -102,19 +102,19 @@
         woden_qname_list_attr_convert;
 
 
-    qname_list_attr_impl->methods = axis2_hash_make(env);
+    qname_list_attr_impl->methods = axutil_hash_make(env);
     if (!qname_list_attr_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(qname_list_attr_impl->methods, "free",
+    axutil_hash_set(qname_list_attr_impl->methods, "free",
             AXIS2_HASH_KEY_STRING, woden_qname_list_attr_free);
-    axis2_hash_set(qname_list_attr_impl->methods, "type",
+    axutil_hash_set(qname_list_attr_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_qname_list_attr_type);
-    axis2_hash_set(qname_list_attr_impl->methods, "get_qnames",
+    axutil_hash_set(qname_list_attr_impl->methods, "get_qnames",
             AXIS2_HASH_KEY_STRING, woden_qname_list_attr_get_qnames);
-    axis2_hash_set(qname_list_attr_impl->methods, "convert",
+    axutil_hash_set(qname_list_attr_impl->methods, "convert",
             AXIS2_HASH_KEY_STRING, woden_qname_list_attr_convert);
 
     qname_list_attr_impl->xml_attr = woden_xml_attr_create(env, owner_el,
@@ -148,7 +148,7 @@
 
     if (qname_list_attr_impl->methods)
     {
-        axis2_hash_free(qname_list_attr_impl->methods, env);
+        axutil_hash_free(qname_list_attr_impl->methods, env);
         qname_list_attr_impl->methods = NULL;
     }
 
@@ -189,20 +189,20 @@
 woden_qname_list_attr_resolve_methods(
     woden_qname_list_attr_t *qname_list_attr,
     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);
 
-    qname_list_attr->ops->free = axis2_hash_get(methods,
+    qname_list_attr->ops->free = axutil_hash_get(methods,
             "free", AXIS2_HASH_KEY_STRING);
-    qname_list_attr->ops->to_qname_list_attr_free = axis2_hash_get(methods,
+    qname_list_attr->ops->to_qname_list_attr_free = axutil_hash_get(methods,
             "to_qname_list_attr_free", AXIS2_HASH_KEY_STRING);
-    qname_list_attr->ops->type = axis2_hash_get(methods,
+    qname_list_attr->ops->type = axutil_hash_get(methods,
             "type", AXIS2_HASH_KEY_STRING);
-    qname_list_attr->ops->get_qnames = axis2_hash_get(methods,
+    qname_list_attr->ops->get_qnames = axutil_hash_get(methods,
             "get_qnames", AXIS2_HASH_KEY_STRING);
-    qname_list_attr->ops->convert = axis2_hash_get(methods,
+    qname_list_attr->ops->convert = axutil_hash_get(methods,
             "convert", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
     woden_qname_list_or_token_any_attr_t list_token_attr;
     woden_xml_attr_t *xml_attr;
     woden_obj_types_t obj_type;
-    axis2_hash_t *methods;
+    axutil_hash_t *methods;
     axis2_bool_t is_token;
 };
 
@@ -127,29 +127,29 @@
         woden_qname_list_or_token_any_attr_convert;
 
 
-    list_token_attr_impl->methods = axis2_hash_make(env);
+    list_token_attr_impl->methods = axutil_hash_make(env);
     if (!list_token_attr_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(list_token_attr_impl->methods, "free",
+    axutil_hash_set(list_token_attr_impl->methods, "free",
             AXIS2_HASH_KEY_STRING, woden_qname_list_or_token_any_attr_free);
-    axis2_hash_set(list_token_attr_impl->methods, "type",
+    axutil_hash_set(list_token_attr_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_qname_list_or_token_any_attr_type);
-    axis2_hash_set(list_token_attr_impl->methods, "is_qname_list",
+    axutil_hash_set(list_token_attr_impl->methods, "is_qname_list",
             AXIS2_HASH_KEY_STRING,
             woden_qname_list_or_token_any_attr_is_qname_list);
-    axis2_hash_set(list_token_attr_impl->methods, "is_token",
+    axutil_hash_set(list_token_attr_impl->methods, "is_token",
             AXIS2_HASH_KEY_STRING,
             woden_qname_list_or_token_any_attr_is_token);
-    axis2_hash_set(list_token_attr_impl->methods, "get_qnames",
+    axutil_hash_set(list_token_attr_impl->methods, "get_qnames",
             AXIS2_HASH_KEY_STRING,
             woden_qname_list_or_token_any_attr_get_qnames);
-    axis2_hash_set(list_token_attr_impl->methods, "get_token",
+    axutil_hash_set(list_token_attr_impl->methods, "get_token",
             AXIS2_HASH_KEY_STRING,
             woden_qname_list_or_token_any_attr_get_token);
-    axis2_hash_set(list_token_attr_impl->methods, "convert",
+    axutil_hash_set(list_token_attr_impl->methods, "convert",
             AXIS2_HASH_KEY_STRING,
             woden_qname_list_or_token_any_attr_convert);
 
@@ -186,7 +186,7 @@
 
     if (list_token_attr_impl->methods)
     {
-        axis2_hash_free(list_token_attr_impl->methods, env);
+        axutil_hash_free(list_token_attr_impl->methods, env);
         list_token_attr_impl->methods = NULL;
     }
 
@@ -232,28 +232,28 @@
 woden_qname_list_or_token_any_attr_resolve_methods(
     woden_qname_list_or_token_any_attr_t *list_token_attr,
     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);
 
-    list_token_attr->ops->free = axis2_hash_get(methods,
+    list_token_attr->ops->free = axutil_hash_get(methods,
             "free", AXIS2_HASH_KEY_STRING);
     list_token_attr->ops->to_qname_list_or_token_any_attr_free =
-        axis2_hash_get(methods, "to_qname_list_or_token_any_attr_free",
+        axutil_hash_get(methods, "to_qname_list_or_token_any_attr_free",
                 AXIS2_HASH_KEY_STRING);
-    list_token_attr->ops->type = axis2_hash_get(methods,
+    list_token_attr->ops->type = axutil_hash_get(methods,
             "type", AXIS2_HASH_KEY_STRING);
 
-    list_token_attr->ops->is_qname_list = axis2_hash_get(methods,
+    list_token_attr->ops->is_qname_list = axutil_hash_get(methods,
             "is_qname_list", AXIS2_HASH_KEY_STRING);
-    list_token_attr->ops->is_token = axis2_hash_get(methods,
+    list_token_attr->ops->is_token = axutil_hash_get(methods,
             "is_token", AXIS2_HASH_KEY_STRING);
-    list_token_attr->ops->get_qnames = axis2_hash_get(methods,
+    list_token_attr->ops->get_qnames = axutil_hash_get(methods,
             "get_qnames", AXIS2_HASH_KEY_STRING);
-    list_token_attr->ops->get_token = axis2_hash_get(methods,
+    list_token_attr->ops->get_token = axutil_hash_get(methods,
             "get_token", AXIS2_HASH_KEY_STRING);
-    list_token_attr->ops->convert = axis2_hash_get(methods,
+    list_token_attr->ops->convert = axutil_hash_get(methods,
             "convert", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
     woden_qname_or_token_any_attr_t token_attr;
     woden_xml_attr_t *xml_attr;
     woden_obj_types_t obj_type;
-    axis2_hash_t *methods;
+    axutil_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(token_attr) \
@@ -127,30 +127,30 @@
         woden_qname_or_token_any_attr_convert;
 
 
-    token_attr_impl->methods = axis2_hash_make(env);
+    token_attr_impl->methods = axutil_hash_make(env);
     if (!token_attr_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(token_attr_impl->methods, "free",
+    axutil_hash_set(token_attr_impl->methods, "free",
             AXIS2_HASH_KEY_STRING, woden_qname_or_token_any_attr_free);
-    axis2_hash_set(token_attr_impl->methods, "type",
+    axutil_hash_set(token_attr_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_qname_or_token_any_attr_type);
 
-    axis2_hash_set(token_attr_impl->methods, "is_qname",
+    axutil_hash_set(token_attr_impl->methods, "is_qname",
             AXIS2_HASH_KEY_STRING,
             woden_qname_or_token_any_attr_is_qname);
-    axis2_hash_set(token_attr_impl->methods, "is_token",
+    axutil_hash_set(token_attr_impl->methods, "is_token",
             AXIS2_HASH_KEY_STRING,
             woden_qname_or_token_any_attr_is_token);
-    axis2_hash_set(token_attr_impl->methods, "get_qname",
+    axutil_hash_set(token_attr_impl->methods, "get_qname",
             AXIS2_HASH_KEY_STRING,
             woden_qname_or_token_any_attr_get_qname);
-    axis2_hash_set(token_attr_impl->methods, "get_token",
+    axutil_hash_set(token_attr_impl->methods, "get_token",
             AXIS2_HASH_KEY_STRING,
             woden_qname_or_token_any_attr_get_token);
-    axis2_hash_set(token_attr_impl->methods, "convert",
+    axutil_hash_set(token_attr_impl->methods, "convert",
             AXIS2_HASH_KEY_STRING,
             woden_qname_or_token_any_attr_convert);
 
@@ -187,7 +187,7 @@
 
     if (token_attr_impl->methods)
     {
-        axis2_hash_free(token_attr_impl->methods, env);
+        axutil_hash_free(token_attr_impl->methods, env);
         token_attr_impl->methods = NULL;
     }
 
@@ -234,25 +234,25 @@
     woden_qname_or_token_any_attr_t *
     token_attr,
     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);
 
-    token_attr->ops->free = axis2_hash_get(methods,
+    token_attr->ops->free = axutil_hash_get(methods,
             "free", AXIS2_HASH_KEY_STRING);
-    token_attr->ops->type = axis2_hash_get(methods,
+    token_attr->ops->type = axutil_hash_get(methods,
             "type", AXIS2_HASH_KEY_STRING);
 
-    token_attr->ops->is_qname = axis2_hash_get(methods,
+    token_attr->ops->is_qname = axutil_hash_get(methods,
             "is_qname", AXIS2_HASH_KEY_STRING);
-    token_attr->ops->is_token = axis2_hash_get(methods,
+    token_attr->ops->is_token = axutil_hash_get(methods,
             "is_token", AXIS2_HASH_KEY_STRING);
-    token_attr->ops->get_qname = axis2_hash_get(methods,
+    token_attr->ops->get_qname = axutil_hash_get(methods,
             "get_qname", AXIS2_HASH_KEY_STRING);
-    token_attr->ops->get_token = axis2_hash_get(methods,
+    token_attr->ops->get_token = axutil_hash_get(methods,
             "get_token", AXIS2_HASH_KEY_STRING);
-    token_attr->ops->convert = axis2_hash_get(methods,
+    token_attr->ops->convert = axutil_hash_get(methods,
             "convert", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
     woden_string_attr_t string_attr;
     woden_xml_attr_t *xml_attr;
     woden_obj_types_t obj_type;
-    axis2_hash_t *methods;
+    axutil_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(string_attr) \
@@ -103,19 +103,19 @@
         woden_string_attr_convert;
 
 
-    string_attr_impl->methods = axis2_hash_make(env);
+    string_attr_impl->methods = axutil_hash_make(env);
     if (!string_attr_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(string_attr_impl->methods, "free",
+    axutil_hash_set(string_attr_impl->methods, "free",
             AXIS2_HASH_KEY_STRING, woden_string_attr_free);
-    axis2_hash_set(string_attr_impl->methods, "type",
+    axutil_hash_set(string_attr_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_string_attr_type);
-    axis2_hash_set(string_attr_impl->methods, "get_string",
+    axutil_hash_set(string_attr_impl->methods, "get_string",
             AXIS2_HASH_KEY_STRING, woden_string_attr_get_string);
-    axis2_hash_set(string_attr_impl->methods, "convert",
+    axutil_hash_set(string_attr_impl->methods, "convert",
             AXIS2_HASH_KEY_STRING, woden_string_attr_convert);
 
     string_attr_impl->xml_attr = woden_xml_attr_create(env, owner_el,
@@ -136,7 +136,7 @@
 
     if (string_attr_impl->methods)
     {
-        axis2_hash_free(string_attr_impl->methods, env);
+        axutil_hash_free(string_attr_impl->methods, env);
         string_attr_impl->methods = NULL;
     }
 
@@ -190,20 +190,20 @@
 woden_string_attr_resolve_methods(
     woden_string_attr_t *string_attr,
     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);
 
     string_attr->ops->free =
-        axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
-    string_attr->ops->to_string_attr_free = axis2_hash_get(methods,
+        axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
+    string_attr->ops->to_string_attr_free = axutil_hash_get(methods,
             "to_string_attr_free", AXIS2_HASH_KEY_STRING);
-    string_attr->ops->type = axis2_hash_get(methods,
+    string_attr->ops->type = axutil_hash_get(methods,
             "type", AXIS2_HASH_KEY_STRING);
-    string_attr->ops->get_string = axis2_hash_get(methods,
+    string_attr->ops->get_string = axutil_hash_get(methods,
             "get_string", AXIS2_HASH_KEY_STRING);
-    string_attr->ops->convert = axis2_hash_get(methods,
+    string_attr->ops->convert = axutil_hash_get(methods,
             "convert", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/xml/woden_uri_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_uri_attr.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_uri_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_uri_attr.c Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
     woden_uri_attr_t uri_attr;
     woden_xml_attr_t *xml_attr;
     woden_obj_types_t obj_type;
-    axis2_hash_t *methods;
+    axutil_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(uri_attr) \
@@ -103,19 +103,19 @@
         woden_uri_attr_convert;
 
 
-    uri_attr_impl->methods = axis2_hash_make(env);
+    uri_attr_impl->methods = axutil_hash_make(env);
     if (!uri_attr_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(uri_attr_impl->methods, "free",
+    axutil_hash_set(uri_attr_impl->methods, "free",
             AXIS2_HASH_KEY_STRING, woden_uri_attr_free);
-    axis2_hash_set(uri_attr_impl->methods, "type",
+    axutil_hash_set(uri_attr_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_uri_attr_type);
-    axis2_hash_set(uri_attr_impl->methods, "get_uri",
+    axutil_hash_set(uri_attr_impl->methods, "get_uri",
             AXIS2_HASH_KEY_STRING, woden_uri_attr_get_uri);
-    axis2_hash_set(uri_attr_impl->methods, "convert",
+    axutil_hash_set(uri_attr_impl->methods, "convert",
             AXIS2_HASH_KEY_STRING, woden_uri_attr_convert);
 
     uri_attr_impl->xml_attr = woden_xml_attr_create(env, owner_el,
@@ -149,7 +149,7 @@
 
     if (uri_attr_impl->methods)
     {
-        axis2_hash_free(uri_attr_impl->methods, env);
+        axutil_hash_free(uri_attr_impl->methods, env);
         uri_attr_impl->methods = NULL;
     }
 
@@ -190,20 +190,20 @@
 woden_uri_attr_resolve_methods(
     woden_uri_attr_t *uri_attr,
     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);
 
-    uri_attr->ops->free = axis2_hash_get(methods,
+    uri_attr->ops->free = axutil_hash_get(methods,
             "free", AXIS2_HASH_KEY_STRING);
-    uri_attr->ops->to_uri_attr_free = axis2_hash_get(methods,
+    uri_attr->ops->to_uri_attr_free = axutil_hash_get(methods,
             "to_uri_attr_free", AXIS2_HASH_KEY_STRING);
-    uri_attr->ops->type = axis2_hash_get(methods,
+    uri_attr->ops->type = axutil_hash_get(methods,
             "type", AXIS2_HASH_KEY_STRING);
-    uri_attr->ops->get_uri = axis2_hash_get(methods,
+    uri_attr->ops->get_uri = axutil_hash_get(methods,
             "get_uri", AXIS2_HASH_KEY_STRING);
-    uri_attr->ops->convert = axis2_hash_get(methods,
+    uri_attr->ops->convert = axutil_hash_get(methods,
             "convert", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c Fri Mar 30 11:28:18 2007
@@ -17,7 +17,7 @@
 
 #include <woden_xml_attr.h>
 #include <axis2_uri.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
 #include <axiom_element.h>
 #include <axiom_node.h>
 
@@ -156,28 +156,28 @@
 woden_xml_attr_resolve_methods(
     woden_xml_attr_t *xml_attr,
     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);
 
     xml_attr->ops = AXIS2_MALLOC(env->allocator,
             sizeof(woden_xml_attr_ops_t));
-    xml_attr->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
-    xml_attr->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
-    xml_attr->ops->init = axis2_hash_get(methods,
+    xml_attr->ops->free = axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
+    xml_attr->ops->type = axutil_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
+    xml_attr->ops->init = axutil_hash_get(methods,
             "init", AXIS2_HASH_KEY_STRING);
-    xml_attr->ops->get_attribute_type = axis2_hash_get(methods,
+    xml_attr->ops->get_attribute_type = axutil_hash_get(methods,
             "get_attribute_type", AXIS2_HASH_KEY_STRING);
-    xml_attr->ops->get_content = axis2_hash_get(methods,
+    xml_attr->ops->get_content = axutil_hash_get(methods,
             "get_content", AXIS2_HASH_KEY_STRING);
-    xml_attr->ops->to_external_form = axis2_hash_get(methods,
+    xml_attr->ops->to_external_form = axutil_hash_get(methods,
             "to_external_form", AXIS2_HASH_KEY_STRING);
-    xml_attr->ops->is_valid = axis2_hash_get(methods,
+    xml_attr->ops->is_valid = axutil_hash_get(methods,
             "is_valid", AXIS2_HASH_KEY_STRING);
-    xml_attr->ops->convert = axis2_hash_get(methods,
+    xml_attr->ops->convert = axutil_hash_get(methods,
             "convert", AXIS2_HASH_KEY_STRING);
-    xml_attr->ops->set_valid = axis2_hash_get(methods,
+    xml_attr->ops->set_valid = axutil_hash_get(methods,
             "set_valid", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;



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