You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2007/03/30 20:28:34 UTC

svn commit: r524225 [14/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...

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c Fri Mar 30 11:28:18 2007
@@ -56,8 +56,8 @@
       woden_wsdl10_desc_t desc;
       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;
 
       axutil_array_list_t *f_all_msgs;
       axutil_array_list_t *f_all_interfaces;
@@ -69,7 +69,7 @@
       axis2_uri_t *f_doc_base_uri;
       /* <description> attributes */
       axis2_uri_t *f_target_namespc;
-      axis2_hash_t *f_namespcs;
+      axutil_hash_t *f_namespcs;
       /* <description> child elements */
       axutil_array_list_t *f_import_elements;
       axutil_array_list_t *f_include_elements;
@@ -96,7 +96,7 @@
       void *desc,
       const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_desc_super_objs(
       void *desc,
       const axutil_env_t *env);
@@ -206,7 +206,7 @@
       const axutil_env_t *env,
       axis2_char_t *prefix);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_desc_get_namespaces(
       void *desc,
       const axutil_env_t *env);
@@ -726,7 +726,7 @@
       desc_impl->desc.ops->add_to_all_msgs =
 	    woden_wsdl10_desc_add_to_all_msgs;
 
-      desc_impl->f_namespcs = axis2_hash_make(env);
+      desc_impl->f_namespcs = axutil_hash_make(env);
       if (!desc_impl->f_namespcs)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -757,191 +757,191 @@
 	    return NULL;
       }
 
-      desc_impl->methods = axis2_hash_make(env);
+      desc_impl->methods = axutil_hash_make(env);
       if (!desc_impl->methods)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(desc_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+      axutil_hash_set(desc_impl->methods, "free", AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_free);
-      axis2_hash_set(desc_impl->methods, "super_objs",
+      axutil_hash_set(desc_impl->methods, "super_objs",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_desc_super_objs);
-      axis2_hash_set(desc_impl->methods, "type",
+      axutil_hash_set(desc_impl->methods, "type",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_desc_type);
 
-      axis2_hash_set(desc_impl->methods, "get_msgs",
+      axutil_hash_set(desc_impl->methods, "get_msgs",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_msgs);
-      axis2_hash_set(desc_impl->methods, "get_interfaces",
+      axutil_hash_set(desc_impl->methods, "get_interfaces",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_interfaces);
-      axis2_hash_set(desc_impl->methods, "get_bindings",
+      axutil_hash_set(desc_impl->methods, "get_bindings",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_bindings);
-      axis2_hash_set(desc_impl->methods, "get_svcs",
+      axutil_hash_set(desc_impl->methods, "get_svcs",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_svcs);
-      axis2_hash_set(desc_impl->methods, "get_element_decls",
+      axutil_hash_set(desc_impl->methods, "get_element_decls",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_element_decls);
-      axis2_hash_set(desc_impl->methods, "get_element_decl",
+      axutil_hash_set(desc_impl->methods, "get_element_decl",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_element_decl);
-      axis2_hash_set(desc_impl->methods, "get_type_defs",
+      axutil_hash_set(desc_impl->methods, "get_type_defs",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_type_defs);
-      axis2_hash_set(desc_impl->methods, "get_type_def",
+      axutil_hash_set(desc_impl->methods, "get_type_def",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_type_def);
-      axis2_hash_set(desc_impl->methods, "to_element",
+      axutil_hash_set(desc_impl->methods, "to_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_to_element);
-      axis2_hash_set(desc_impl->methods, "set_document_base_uri",
+      axutil_hash_set(desc_impl->methods, "set_document_base_uri",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_set_document_base_uri);
-      axis2_hash_set(desc_impl->methods, "get_document_base_uri",
+      axutil_hash_set(desc_impl->methods, "get_document_base_uri",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_document_base_uri);
-      axis2_hash_set(desc_impl->methods, "set_target_namespace",
+      axutil_hash_set(desc_impl->methods, "set_target_namespace",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_set_target_namespace);
-      axis2_hash_set(desc_impl->methods, "get_target_namespace",
+      axutil_hash_set(desc_impl->methods, "get_target_namespace",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_target_namespace);
-      axis2_hash_set(desc_impl->methods, "add_namespace",
+      axutil_hash_set(desc_impl->methods, "add_namespace",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_namespace);
-      axis2_hash_set(desc_impl->methods, "remove_namespace",
+      axutil_hash_set(desc_impl->methods, "remove_namespace",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_remove_namespace);
-      axis2_hash_set(desc_impl->methods, "get_namespace",
+      axutil_hash_set(desc_impl->methods, "get_namespace",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_namespace);
-      axis2_hash_set(desc_impl->methods, "get_namespaces",
+      axutil_hash_set(desc_impl->methods, "get_namespaces",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_namespaces);
-      axis2_hash_set(desc_impl->methods, "add_import_element",
+      axutil_hash_set(desc_impl->methods, "add_import_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_import_element);
-      axis2_hash_set(desc_impl->methods, "get_import_elements",
+      axutil_hash_set(desc_impl->methods, "get_import_elements",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_import_elements);
-      axis2_hash_set(desc_impl->methods, "add_include_element",
+      axutil_hash_set(desc_impl->methods, "add_include_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_include_element);
-      axis2_hash_set(desc_impl->methods, "get_include_elements",
+      axutil_hash_set(desc_impl->methods, "get_include_elements",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_include_elements);
-      axis2_hash_set(desc_impl->methods, "set_types_element",
+      axutil_hash_set(desc_impl->methods, "set_types_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_set_types_element);
-      axis2_hash_set(desc_impl->methods, "get_types_element",
+      axutil_hash_set(desc_impl->methods, "get_types_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_types_element);
-      axis2_hash_set(desc_impl->methods, "add_msg_element",
+      axutil_hash_set(desc_impl->methods, "add_msg_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_msg_element);
-      axis2_hash_set(desc_impl->methods, "get_msg_elements",
+      axutil_hash_set(desc_impl->methods, "get_msg_elements",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_msg_elements);
-      axis2_hash_set(desc_impl->methods, "add_interface_element",
+      axutil_hash_set(desc_impl->methods, "add_interface_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_interface_element);
-      axis2_hash_set(desc_impl->methods, "get_interface_elements",
+      axutil_hash_set(desc_impl->methods, "get_interface_elements",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_interface_elements);
-      axis2_hash_set(desc_impl->methods, "add_binding_element",
+      axutil_hash_set(desc_impl->methods, "add_binding_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_binding_element);
-      axis2_hash_set(desc_impl->methods, "get_binding_elements",
+      axutil_hash_set(desc_impl->methods, "get_binding_elements",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_binding_elements);
-      axis2_hash_set(desc_impl->methods, "add_svc_element",
+      axutil_hash_set(desc_impl->methods, "add_svc_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_svc_element);
-      axis2_hash_set(desc_impl->methods, "get_svc_elements",
+      axutil_hash_set(desc_impl->methods, "get_svc_elements",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_svc_elements);
-      axis2_hash_set(desc_impl->methods, "create_documentation_element",
+      axutil_hash_set(desc_impl->methods, "create_documentation_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_documentation_element);
-      axis2_hash_set(desc_impl->methods, "create_import_element",
+      axutil_hash_set(desc_impl->methods, "create_import_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_import_element);
-      axis2_hash_set(desc_impl->methods, "create_include_element",
+      axutil_hash_set(desc_impl->methods, "create_include_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_include_element);
-      axis2_hash_set(desc_impl->methods, "create_types_element",
+      axutil_hash_set(desc_impl->methods, "create_types_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_types_element);
-      axis2_hash_set(desc_impl->methods, "create_msg_element",
+      axutil_hash_set(desc_impl->methods, "create_msg_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_msg_element);
-      axis2_hash_set(desc_impl->methods, "create_part_element",
+      axutil_hash_set(desc_impl->methods, "create_part_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_part_element);
-      axis2_hash_set(desc_impl->methods, "create_interface_element",
+      axutil_hash_set(desc_impl->methods, "create_interface_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_interface_element);
-      axis2_hash_set(desc_impl->methods, "create_interface_op_element",
+      axutil_hash_set(desc_impl->methods, "create_interface_op_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_interface_op_element);
-      axis2_hash_set(desc_impl->methods, "create_interface_fault_ref_element",
+      axutil_hash_set(desc_impl->methods, "create_interface_fault_ref_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_interface_fault_ref_element);
-      axis2_hash_set(desc_impl->methods, "create_interface_msg_ref_element",
+      axutil_hash_set(desc_impl->methods, "create_interface_msg_ref_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_interface_msg_ref_element);
-      axis2_hash_set(desc_impl->methods, "create_binding_element",
+      axutil_hash_set(desc_impl->methods, "create_binding_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_binding_element);
-      axis2_hash_set(desc_impl->methods, "create_binding_op_element",
+      axutil_hash_set(desc_impl->methods, "create_binding_op_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_binding_op_element);
-      axis2_hash_set(desc_impl->methods, "create_binding_fault_ref_element",
+      axutil_hash_set(desc_impl->methods, "create_binding_fault_ref_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_binding_fault_ref_element);
-      axis2_hash_set(desc_impl->methods, "create_binding_msg_ref_element",
+      axutil_hash_set(desc_impl->methods, "create_binding_msg_ref_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_binding_msg_ref_element);
-      axis2_hash_set(desc_impl->methods, "create_svc_element",
+      axutil_hash_set(desc_impl->methods, "create_svc_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_svc_element);
-      axis2_hash_set(desc_impl->methods, "create_endpoint_element",
+      axutil_hash_set(desc_impl->methods, "create_endpoint_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_endpoint_element);
-      axis2_hash_set(desc_impl->methods, "create_feature_element",
+      axutil_hash_set(desc_impl->methods, "create_feature_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_feature_element);
-      axis2_hash_set(desc_impl->methods, "create_property_element",
+      axutil_hash_set(desc_impl->methods, "create_property_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_create_property_element);
-      axis2_hash_set(desc_impl->methods, "set_ext_registry",
+      axutil_hash_set(desc_impl->methods, "set_ext_registry",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_set_ext_registry);
-      axis2_hash_set(desc_impl->methods, "get_ext_registry",
+      axutil_hash_set(desc_impl->methods, "get_ext_registry",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_get_ext_registry);
-      axis2_hash_set(desc_impl->methods, "to_component",
+      axutil_hash_set(desc_impl->methods, "to_component",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_to_component);
-      axis2_hash_set(desc_impl->methods, "add_to_all_msgs",
+      axutil_hash_set(desc_impl->methods, "add_to_all_msgs",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_to_all_msgs);
-      axis2_hash_set(desc_impl->methods, "add_to_all_interfaces",
+      axutil_hash_set(desc_impl->methods, "add_to_all_interfaces",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_to_all_interfaces);
-      axis2_hash_set(desc_impl->methods, "add_to_all_bindings",
+      axutil_hash_set(desc_impl->methods, "add_to_all_bindings",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_to_all_bindings);
-      axis2_hash_set(desc_impl->methods, "add_to_all_svcs",
+      axutil_hash_set(desc_impl->methods, "add_to_all_svcs",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_to_all_svcs);
-      axis2_hash_set(desc_impl->methods, "add_to_all_element_decls",
+      axutil_hash_set(desc_impl->methods, "add_to_all_element_decls",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_to_all_element_decls);
-      axis2_hash_set(desc_impl->methods, "add_to_all_type_defs",
+      axutil_hash_set(desc_impl->methods, "add_to_all_type_defs",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_desc_add_to_all_type_defs);
 
@@ -958,15 +958,15 @@
 
       desc_impl->documentable = woden_documentable_create(env);
 
-      desc_impl->super = axis2_hash_make(env);
+      desc_impl->super = axutil_hash_make(env);
       if (!desc_impl->super)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(desc_impl->super, "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING,
+      axutil_hash_set(desc_impl->super, "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING,
 		     &(desc_impl->desc));
-      axis2_hash_set(desc_impl->super, "WODEN_DOCUMENTABLE", AXIS2_HASH_KEY_STRING,
+      axutil_hash_set(desc_impl->super, "WODEN_DOCUMENTABLE", AXIS2_HASH_KEY_STRING,
 		     desc_impl->documentable);
 
       return &(desc_impl->desc);
@@ -1084,30 +1084,30 @@
       /* TODO free f_namespcs */
       if (desc_impl->f_namespcs)
       {
-	    axis2_hash_index_t *i = NULL;
+	    axutil_hash_index_t *i = NULL;
 	    axis2_uri_t *namespc = NULL;
 	    void *v = NULL;
 
-	    for (i = axis2_hash_first(desc_impl->f_namespcs, env); i; i =
-		       axis2_hash_next(env, i))
+	    for (i = axutil_hash_first(desc_impl->f_namespcs, env); i; i =
+		       axutil_hash_next(env, i))
 	    {
-		  axis2_hash_this(i, NULL, NULL, &v);
+		  axutil_hash_this(i, NULL, NULL, &v);
 		  namespc = (axis2_uri_t *) v;
 		  axis2_uri_free(namespc, env);
 	    }
-	    axis2_hash_free(desc_impl->f_namespcs, env);
+	    axutil_hash_free(desc_impl->f_namespcs, env);
 	    desc_impl->f_namespcs = NULL;
       }
 
       if (desc_impl->super)
       {
-	    axis2_hash_free(desc_impl->super, env);
+	    axutil_hash_free(desc_impl->super, env);
 	    desc_impl->super = NULL;
       }
 
       if (desc_impl->methods)
       {
-	    axis2_hash_free(desc_impl->methods, env);
+	    axutil_hash_free(desc_impl->methods, env);
 	    desc_impl->methods = NULL;
       }
 
@@ -1133,7 +1133,7 @@
       return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_desc_super_objs(
       void *desc,
       const axutil_env_t *env)
@@ -1177,7 +1177,7 @@
       woden_wsdl10_desc_t *desc,
       const axutil_env_t *env,
       woden_wsdl10_desc_t *desc_impl,
-      axis2_hash_t *methods)
+      axutil_hash_t *methods)
 {
       woden_wsdl10_desc_impl_t *desc_impl_l = NULL;
 
@@ -1185,98 +1185,98 @@
       AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
       desc_impl_l = INTF_TO_IMPL(desc_impl);
 
-      desc->ops->free = axis2_hash_get(methods, "free",
+      desc->ops->free = axutil_hash_get(methods, "free",
 				       AXIS2_HASH_KEY_STRING);
-      desc->ops->super_objs = axis2_hash_get(methods, "super_objs",
+      desc->ops->super_objs = axutil_hash_get(methods, "super_objs",
 					     AXIS2_HASH_KEY_STRING);
-      desc->ops->type = axis2_hash_get(methods, "type",
+      desc->ops->type = axutil_hash_get(methods, "type",
 				       AXIS2_HASH_KEY_STRING);
 
-      desc->ops->get_msgs = axis2_hash_get(methods,
+      desc->ops->get_msgs = axutil_hash_get(methods,
 					   "get_msgs", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->get_msgs && desc_impl_l)
 	    desc->ops->get_msgs =
 		  desc_impl_l->desc.ops->get_msgs;
 
-      desc->ops->get_interfaces = axis2_hash_get(methods,
+      desc->ops->get_interfaces = axutil_hash_get(methods,
 						 "get_interfaces", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->get_interfaces && desc_impl_l)
 	    desc->ops->get_interfaces =
 		  desc_impl_l->desc.ops->get_interfaces;
 
-      desc->ops->get_bindings = axis2_hash_get(methods,
+      desc->ops->get_bindings = axutil_hash_get(methods,
 					       "get_bindings", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->get_bindings && desc_impl_l)
 	    desc->ops->get_bindings =
 		  desc_impl_l->desc.ops->get_bindings;
 
-      desc->ops->get_svcs = axis2_hash_get(methods,
+      desc->ops->get_svcs = axutil_hash_get(methods,
 					   "get_svcs", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->get_svcs && desc_impl_l)
 	    desc->ops->get_svcs =
 		  desc_impl_l->desc.ops->get_svcs;
 
-      desc->ops->get_element_decls = axis2_hash_get(methods,
+      desc->ops->get_element_decls = axutil_hash_get(methods,
 						    "get_element_decls", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->get_element_decls && desc_impl_l)
 	    desc->ops->get_element_decls =
 		  desc_impl_l->desc.ops->get_element_decls;
 
-      desc->ops->get_element_decl = axis2_hash_get(methods,
+      desc->ops->get_element_decl = axutil_hash_get(methods,
 						   "get_element_decl", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->get_element_decl && desc_impl_l)
 	    desc->ops->get_element_decl =
 		  desc_impl_l->desc.ops->get_element_decl;
 
-      desc->ops->get_type_defs = axis2_hash_get(methods,
+      desc->ops->get_type_defs = axutil_hash_get(methods,
 						"get_type_defs", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->get_type_defs && desc_impl_l)
 	    desc->ops->get_type_defs =
 		  desc_impl_l->desc.ops->get_type_defs;
 
-      desc->ops->get_type_def = axis2_hash_get(methods,
+      desc->ops->get_type_def = axutil_hash_get(methods,
 					       "get_type_def", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->get_type_def && desc_impl_l)
 	    desc->ops->get_type_def =
 		  desc_impl_l->desc.ops->get_type_def;
 
-      desc->ops->to_element = axis2_hash_get(methods,
+      desc->ops->to_element = axutil_hash_get(methods,
 					     "to_element", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->to_element && desc_impl_l)
 	    desc->ops->to_element =
 		  desc_impl_l->desc.ops->to_element;
 
-      desc->ops->add_to_all_msgs = axis2_hash_get(methods,
+      desc->ops->add_to_all_msgs = axutil_hash_get(methods,
 						  "add_to_all_msgs", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->add_to_all_msgs && desc_impl_l)
 	    desc->ops->add_to_all_msgs =
 		  desc_impl_l->desc.ops->add_to_all_msgs;
 
-      desc->ops->add_to_all_interfaces = axis2_hash_get(methods,
+      desc->ops->add_to_all_interfaces = axutil_hash_get(methods,
 							"add_to_all_interfaces", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->add_to_all_interfaces && desc_impl_l)
 	    desc->ops->add_to_all_interfaces =
 		  desc_impl_l->desc.ops->add_to_all_interfaces;
 
-      desc->ops->add_to_all_bindings = axis2_hash_get(methods,
+      desc->ops->add_to_all_bindings = axutil_hash_get(methods,
 						      "add_to_all_bindings", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->add_to_all_bindings && desc_impl_l)
 	    desc->ops->add_to_all_bindings =
 		  desc_impl_l->desc.ops->add_to_all_bindings;
 
-      desc->ops->add_to_all_svcs = axis2_hash_get(methods,
+      desc->ops->add_to_all_svcs = axutil_hash_get(methods,
 						  "add_to_all_svcs", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->add_to_all_svcs && desc_impl_l)
 	    desc->ops->add_to_all_svcs =
 		  desc_impl_l->desc.ops->add_to_all_svcs;
 
-      desc->ops->add_to_all_element_decls = axis2_hash_get(methods,
+      desc->ops->add_to_all_element_decls = axutil_hash_get(methods,
 							   "add_to_all_element_decls", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->add_to_all_element_decls && desc_impl_l)
 	    desc->ops->add_to_all_element_decls =
 		  desc_impl_l->desc.ops->add_to_all_element_decls;
 
-      desc->ops->add_to_all_type_defs = axis2_hash_get(methods,
+      desc->ops->add_to_all_type_defs = axutil_hash_get(methods,
 						       "add_to_all_type_defs", AXIS2_HASH_KEY_STRING);
       if (!desc->ops->add_to_all_type_defs && desc_impl_l)
 	    desc->ops->add_to_all_type_defs =
@@ -1294,11 +1294,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       if (AXIS2_TRUE != desc_impl->f_component_initialized)
@@ -1312,11 +1312,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       if (AXIS2_TRUE != desc_impl->f_component_initialized)
@@ -1330,11 +1330,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       if (AXIS2_TRUE != desc_impl->f_component_initialized)
@@ -1348,11 +1348,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       if (AXIS2_TRUE != desc_impl->f_component_initialized)
@@ -1366,11 +1366,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       if (AXIS2_TRUE != desc_impl->f_component_initialized)
@@ -1385,14 +1385,14 @@
       axis2_qname_t *qname)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
       void *el_decl = NULL;
       int i = 0, size = 0;
 
       AXIS2_ENV_CHECK(env, NULL);
       AXIS2_PARAM_CHECK(env->error, qname, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       if (AXIS2_TRUE != desc_impl->f_component_initialized)
@@ -1419,11 +1419,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       if (AXIS2_TRUE != desc_impl->f_component_initialized)
@@ -1438,14 +1438,14 @@
       axis2_qname_t *qname)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
       void *type_def = NULL;
       int i = 0, size = 0;
 
       AXIS2_ENV_CHECK(env, NULL);
       AXIS2_PARAM_CHECK(env->error, qname, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       if (AXIS2_TRUE != desc_impl->f_component_initialized)
@@ -1471,11 +1471,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return &(desc_impl->desc);
@@ -1492,12 +1492,12 @@
       axis2_uri_t *doc_base_uri)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, doc_base_uri, AXIS2_FAILURE);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
       if (desc_impl->f_doc_base_uri)
       {
@@ -1515,11 +1515,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return desc_impl->f_doc_base_uri;
@@ -1533,12 +1533,12 @@
       axis2_uri_t *namespc)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
       if (desc_impl->f_target_namespc)
       {
@@ -1556,11 +1556,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return desc_impl->f_target_namespc;
@@ -1574,20 +1574,20 @@
       axis2_uri_t *namespc)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
       axis2_char_t *pfx = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       pfx = (prefix) ? prefix : "";
       if (namespc)
-	    axis2_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING,
+	    axutil_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING,
 			   axis2_uri_clone(namespc, env));
       else
-	    axis2_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING, NULL);
+	    axutil_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING, NULL);
       return AXIS2_SUCCESS;
 }
 
@@ -1598,16 +1598,16 @@
       axis2_char_t *prefix)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
       axis2_char_t *pfx = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       pfx = (prefix) ? prefix : "";
-      axis2_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING, NULL);
+      axutil_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING, NULL);
       return AXIS2_SUCCESS;
 }
 
@@ -1618,29 +1618,29 @@
       axis2_char_t *prefix)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
       axis2_char_t *pfx = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       pfx = (prefix) ? prefix : "";
-      return axis2_hash_get(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING);
+      return axutil_hash_get(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING);
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_desc_get_namespaces(
       void *desc,
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return desc_impl->f_namespcs;
@@ -1653,12 +1653,12 @@
       void *import_el)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, import_el, AXIS2_FAILURE);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return axutil_array_list_add(desc_impl->f_import_elements, env, import_el);
@@ -1670,11 +1670,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return desc_impl->f_import_elements;
@@ -1687,12 +1687,12 @@
       void *include_el)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, include_el, AXIS2_FAILURE);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return axutil_array_list_add(desc_impl->f_include_elements, env, include_el);
@@ -1704,11 +1704,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return desc_impl->f_include_elements;
@@ -1721,12 +1721,12 @@
       void *types_el)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, types_el, AXIS2_FAILURE);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
       if (desc_impl->f_types_element)
       {
@@ -1743,11 +1743,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return desc_impl->f_types_element;
@@ -1760,12 +1760,12 @@
       void *intface)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, intface, AXIS2_FAILURE);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return axutil_array_list_add(desc_impl->f_msg_elements, env, intface);
@@ -1777,11 +1777,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return desc_impl->f_msg_elements;
@@ -1795,12 +1795,12 @@
       void *intface)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, intface, AXIS2_FAILURE);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return axutil_array_list_add(desc_impl->f_interface_elements, env, intface);
@@ -1812,11 +1812,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return desc_impl->f_interface_elements;
@@ -1829,12 +1829,12 @@
       void *binding)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, binding, AXIS2_FAILURE);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return axutil_array_list_add(desc_impl->f_binding_elements, env, binding);
@@ -1846,11 +1846,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return desc_impl->f_binding_elements;
@@ -1863,12 +1863,12 @@
       void *svc_el)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, svc_el, AXIS2_FAILURE);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return axutil_array_list_add(desc_impl->f_svc_elements, env, svc_el);
@@ -1880,11 +1880,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-      desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
       return desc_impl->f_svc_elements;
@@ -2043,12 +2043,12 @@
     void *ext_reg)
 {
     woden_wsdl10_desc_impl_t *desc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, ext_reg, AXIS2_FAILURE);
     super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-    desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
     if (desc_impl->f_ext_reg)
     {
@@ -2065,11 +2065,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_desc_impl_t *desc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-    desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
     return desc_impl->f_ext_reg;
@@ -2081,11 +2081,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_desc_impl_t *desc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-    desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
     if (AXIS2_TRUE != desc_impl->f_component_initialized)
@@ -2113,12 +2113,12 @@
     void *msg)
 {
     woden_wsdl10_desc_impl_t *desc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg, AXIS2_FAILURE);
     super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-    desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
     return axutil_array_list_add(desc_impl->f_all_msgs, env, msg);
@@ -2131,12 +2131,12 @@
     void *interface)
 {
     woden_wsdl10_desc_impl_t *desc_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_WSDL10_DESC_SUPER_OBJS(desc, env);
-    desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
     return axutil_array_list_add(desc_impl->f_all_interfaces, env, interface);
@@ -2149,12 +2149,12 @@
     void *binding)
 {
     woden_wsdl10_desc_impl_t *desc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, binding, AXIS2_FAILURE);
     super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-    desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
     return axutil_array_list_add(desc_impl->f_all_bindings, env, binding);
@@ -2167,12 +2167,12 @@
     void *svc)
 {
     woden_wsdl10_desc_impl_t *desc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, svc, AXIS2_FAILURE);
     super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-    desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
     return axutil_array_list_add(desc_impl->f_all_svcs, env, svc);
@@ -2185,12 +2185,12 @@
     void *element_decl)
 {
     woden_wsdl10_desc_impl_t *desc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, element_decl, AXIS2_FAILURE);
     super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-    desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
     if (!desc_impl->f_all_element_decls)
@@ -2212,12 +2212,12 @@
     void *type_def)
 {
     woden_wsdl10_desc_impl_t *desc_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_WSDL10_DESC_SUPER_OBJS(desc, env);
-    desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
     return axutil_array_list_add(desc_impl->f_all_type_defs, env, type_def);
@@ -2229,11 +2229,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_desc_impl_t *desc_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL10_DESC_SUPER_OBJS(desc, env);
-    desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    desc_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
 
     desc_impl->f_component_initialized = AXIS2_TRUE;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c Fri Mar 30 11:28:18 2007
@@ -35,8 +35,8 @@
       woden_wsdl10_endpoint_t endpoint;
       woden_obj_types_t obj_type;
       woden_nested_configurable_t *nested_configurable;
-      axis2_hash_t *super;
-      axis2_hash_t *methods;
+      axutil_hash_t *super;
+      axutil_hash_t *methods;
       woden_nc_name_t *f_name;
       axis2_qname_t *f_binding_qname;
       void *f_binding;
@@ -50,7 +50,7 @@
       void *endpoint,
       const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_endpoint_super_objs(
       void *endpoint,
       const axutil_env_t *env);
@@ -546,44 +546,44 @@
       endpoint_impl->endpoint.ops->set_binding_element =
 	    woden_wsdl10_endpoint_set_binding_element;
 
-      endpoint_impl->methods = axis2_hash_make(env);
+      endpoint_impl->methods = axutil_hash_make(env);
       if (!endpoint_impl->methods)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(endpoint_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+      axutil_hash_set(endpoint_impl->methods, "free", AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_endpoint_free);
-      axis2_hash_set(endpoint_impl->methods, "super_objs",
+      axutil_hash_set(endpoint_impl->methods, "super_objs",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_endpoint_super_objs);
-      axis2_hash_set(endpoint_impl->methods, "type",
+      axutil_hash_set(endpoint_impl->methods, "type",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_endpoint_type);
 
-      axis2_hash_set(endpoint_impl->methods, "get_name",
+      axutil_hash_set(endpoint_impl->methods, "get_name",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_endpoint_get_name);
-      axis2_hash_set(endpoint_impl->methods, "get_binding",
+      axutil_hash_set(endpoint_impl->methods, "get_binding",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_endpoint_get_binding);
-      axis2_hash_set(endpoint_impl->methods, "get_address",
+      axutil_hash_set(endpoint_impl->methods, "get_address",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_endpoint_get_address);
-      axis2_hash_set(endpoint_impl->methods, "set_name",
+      axutil_hash_set(endpoint_impl->methods, "set_name",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_endpoint_set_name);
-      axis2_hash_set(endpoint_impl->methods, "set_binding_qname",
+      axutil_hash_set(endpoint_impl->methods, "set_binding_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_endpoint_set_binding_qname);
-      axis2_hash_set(endpoint_impl->methods, "get_binding_qname",
+      axutil_hash_set(endpoint_impl->methods, "get_binding_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_endpoint_get_binding_qname);
-      axis2_hash_set(endpoint_impl->methods, "get_binding_element",
+      axutil_hash_set(endpoint_impl->methods, "get_binding_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_endpoint_get_binding_element);
-      axis2_hash_set(endpoint_impl->methods, "set_address",
+      axutil_hash_set(endpoint_impl->methods, "set_address",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_endpoint_set_address);
-      axis2_hash_set(endpoint_impl->methods, "set_binding_element",
+      axutil_hash_set(endpoint_impl->methods, "set_binding_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_endpoint_set_binding_element);
 
@@ -606,19 +606,19 @@
 
       endpoint_impl->nested_configurable = woden_nested_configurable_create(env);
 
-      endpoint_impl->super = axis2_hash_make(env);
+      endpoint_impl->super = axutil_hash_make(env);
       if (!endpoint_impl->super)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(endpoint_impl->super, "WODEN_WSDL10_ENDPOINT",
+      axutil_hash_set(endpoint_impl->super, "WODEN_WSDL10_ENDPOINT",
 		     AXIS2_HASH_KEY_STRING, &(endpoint_impl->endpoint));
-      axis2_hash_set(endpoint_impl->super, "WODEN_NESTED_CONFIGURABLE",
+      axutil_hash_set(endpoint_impl->super, "WODEN_NESTED_CONFIGURABLE",
 		     AXIS2_HASH_KEY_STRING, endpoint_impl->nested_configurable);
       configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
 	    endpoint_impl->nested_configurable, env);
-      axis2_hash_set(endpoint_impl->super, "WODEN_CONFIGURABLE",
+      axutil_hash_set(endpoint_impl->super, "WODEN_CONFIGURABLE",
 		     AXIS2_HASH_KEY_STRING, configurable);
 
       documentable = WODEN_CONFIGURABLE_GET_BASE_IMPL(configurable, env);
@@ -626,15 +626,15 @@
       wsdl_el = WODEN_WSDL_OBJ_GET_BASE_IMPL(wsdl_obj, env);
       element_extensible = WODEN_WSDL_ELEMENT_GET_ELEMENT_EXTENSIBLE(wsdl_el, env);
       attr_extensible = WODEN_WSDL_ELEMENT_GET_ATTR_EXTENSIBLE(wsdl_el, env);
-      axis2_hash_set(endpoint_impl->super, "WODEN_DOCUMENTABLE",
+      axutil_hash_set(endpoint_impl->super, "WODEN_DOCUMENTABLE",
 		     AXIS2_HASH_KEY_STRING, documentable);
-      axis2_hash_set(endpoint_impl->super, "WODEN_WSDL_OBJ",
+      axutil_hash_set(endpoint_impl->super, "WODEN_WSDL_OBJ",
 		     AXIS2_HASH_KEY_STRING, wsdl_obj);
-      axis2_hash_set(endpoint_impl->super, "WODEN_WSDL_ELEMENT",
+      axutil_hash_set(endpoint_impl->super, "WODEN_WSDL_ELEMENT",
 		     AXIS2_HASH_KEY_STRING, wsdl_el);
-      axis2_hash_set(endpoint_impl->super, "WODEN_ELEMENT_EXTENSIBLE",
+      axutil_hash_set(endpoint_impl->super, "WODEN_ELEMENT_EXTENSIBLE",
 		     AXIS2_HASH_KEY_STRING, element_extensible);
-      axis2_hash_set(endpoint_impl->super, "WODEN_ATTR_EXTENSIBLE",
+      axutil_hash_set(endpoint_impl->super, "WODEN_ATTR_EXTENSIBLE",
 		     AXIS2_HASH_KEY_STRING, attr_extensible);
 
 
@@ -791,13 +791,13 @@
 
       if (endpoint_impl->super)
       {
-	    axis2_hash_free(endpoint_impl->super, env);
+	    axutil_hash_free(endpoint_impl->super, env);
 	    endpoint_impl->super = NULL;
       }
 
       if (endpoint_impl->methods)
       {
-	    axis2_hash_free(endpoint_impl->methods, env);
+	    axutil_hash_free(endpoint_impl->methods, env);
 	    endpoint_impl->methods = NULL;
       }
 
@@ -823,7 +823,7 @@
       return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_endpoint_super_objs(
       void *endpoint,
       const axutil_env_t *env)
@@ -867,7 +867,7 @@
       woden_wsdl10_endpoint_t *endpoint,
       const axutil_env_t *env,
       woden_wsdl10_endpoint_t *endpoint_impl,
-      axis2_hash_t *methods)
+      axutil_hash_t *methods)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl_l = NULL;
 
@@ -875,32 +875,32 @@
       AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
       endpoint_impl_l = INTF_TO_IMPL(endpoint_impl);
 
-      endpoint->ops->free = axis2_hash_get(methods, "free",
+      endpoint->ops->free = axutil_hash_get(methods, "free",
 					   AXIS2_HASH_KEY_STRING);
-      endpoint->ops->super_objs = axis2_hash_get(methods, "super_objs",
+      endpoint->ops->super_objs = axutil_hash_get(methods, "super_objs",
 						 AXIS2_HASH_KEY_STRING);
-      endpoint->ops->type = axis2_hash_get(methods, "type",
+      endpoint->ops->type = axutil_hash_get(methods, "type",
 					   AXIS2_HASH_KEY_STRING);
 
-      endpoint->ops->get_name = axis2_hash_get(methods,
+      endpoint->ops->get_name = axutil_hash_get(methods,
 					       "get_name", AXIS2_HASH_KEY_STRING);
       if (!endpoint->ops->get_name && endpoint_impl_l)
 	    endpoint->ops->get_name =
 		  endpoint_impl_l->endpoint.ops->get_name;
 
-      endpoint->ops->get_binding = axis2_hash_get(methods,
+      endpoint->ops->get_binding = axutil_hash_get(methods,
 						  "get_binding", AXIS2_HASH_KEY_STRING);
       if (!endpoint->ops->get_binding && endpoint_impl_l)
 	    endpoint->ops->get_binding =
 		  endpoint_impl_l->endpoint.ops->get_binding;
 
-      endpoint->ops->get_address = axis2_hash_get(methods,
+      endpoint->ops->get_address = axutil_hash_get(methods,
 						  "get_address", AXIS2_HASH_KEY_STRING);
       if (!endpoint->ops->get_address && endpoint_impl_l)
 	    endpoint->ops->get_address =
 		  endpoint_impl_l->endpoint.ops->get_address;
 
-      endpoint->ops->set_binding_element = axis2_hash_get(methods,
+      endpoint->ops->set_binding_element = axutil_hash_get(methods,
 							  "set_binding_element", AXIS2_HASH_KEY_STRING);
       if (!endpoint->ops->set_binding_element && endpoint_impl_l)
 	    endpoint->ops->set_binding_element =
@@ -918,11 +918,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_ENDPOINT_SUPER_OBJS(endpoint, env);
-      endpoint_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      endpoint_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						  "WODEN_WSDL10_ENDPOINT", AXIS2_HASH_KEY_STRING));
 
       return endpoint_impl->f_name;
@@ -934,11 +934,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_ENDPOINT_SUPER_OBJS(endpoint, env);
-      endpoint_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      endpoint_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						  "WODEN_WSDL10_ENDPOINT", AXIS2_HASH_KEY_STRING));
 
       return endpoint_impl->f_binding;
@@ -950,11 +950,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_ENDPOINT_SUPER_OBJS(endpoint, env);
-      endpoint_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      endpoint_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						  "WODEN_WSDL10_ENDPOINT", AXIS2_HASH_KEY_STRING));
 
       return endpoint_impl->f_address;
@@ -970,11 +970,11 @@
       woden_nc_name_t *name)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       super = WODEN_WSDL10_ENDPOINT_SUPER_OBJS(endpoint, env);
-      endpoint_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      endpoint_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						  "WODEN_WSDL10_ENDPOINT", AXIS2_HASH_KEY_STRING));
 
       if (endpoint_impl->f_name)
@@ -992,11 +992,11 @@
       axis2_qname_t *binding_qname)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       super = WODEN_WSDL10_ENDPOINT_SUPER_OBJS(endpoint, env);
-      endpoint_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      endpoint_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						  "WODEN_WSDL10_ENDPOINT", AXIS2_HASH_KEY_STRING));
 
       if (endpoint_impl->f_binding_qname)
@@ -1014,11 +1014,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_ENDPOINT_SUPER_OBJS(endpoint, env);
-      endpoint_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      endpoint_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						  "WODEN_WSDL10_ENDPOINT", AXIS2_HASH_KEY_STRING));
 
       return endpoint_impl->f_binding_qname;
@@ -1030,11 +1030,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_ENDPOINT_SUPER_OBJS(endpoint, env);
-      endpoint_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      endpoint_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						  "WODEN_WSDL10_ENDPOINT", AXIS2_HASH_KEY_STRING));
 
       return endpoint_impl->f_binding;
@@ -1047,11 +1047,11 @@
       axis2_uri_t *uri)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       super = WODEN_WSDL10_ENDPOINT_SUPER_OBJS(endpoint, env);
-      endpoint_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      endpoint_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						  "WODEN_WSDL10_ENDPOINT", AXIS2_HASH_KEY_STRING));
 
       if (endpoint_impl->f_address)
@@ -1075,11 +1075,11 @@
       void *binding)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       super = WODEN_WSDL10_ENDPOINT_SUPER_OBJS(endpoint, env);
-      endpoint_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      endpoint_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						  "WODEN_WSDL10_ENDPOINT", AXIS2_HASH_KEY_STRING));
 
       if (endpoint_impl->f_binding)

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c Fri Mar 30 11:28:18 2007
@@ -38,8 +38,8 @@
     woden_wsdl10_interface_fault_ref_t interface_fault_ref;
     woden_nested_configurable_t *nested_configurable;
     woden_obj_types_t obj_type;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
 
     void *f_direction;
     axis2_qname_t *f_msg_qname;
@@ -53,7 +53,7 @@
     void *interface_fault_ref,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_interface_fault_ref_super_objs(
     void *interface_fault_ref,
     const axutil_env_t *env);
@@ -426,38 +426,38 @@
     interface_fault_ref_impl->interface_fault_ref.ops->to_element =
         woden_wsdl10_interface_fault_ref_to_element;
 
-    interface_fault_ref_impl->methods = axis2_hash_make(env);
+    interface_fault_ref_impl->methods = axutil_hash_make(env);
     if (!interface_fault_ref_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(interface_fault_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(interface_fault_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_interface_fault_ref_free);
-    axis2_hash_set(interface_fault_ref_impl->methods, "super_objs",
+    axutil_hash_set(interface_fault_ref_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_interface_fault_ref_super_objs);
-    axis2_hash_set(interface_fault_ref_impl->methods, "type",
+    axutil_hash_set(interface_fault_ref_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_interface_fault_ref_type);
 
-    axis2_hash_set(interface_fault_ref_impl->methods, "get_direction",
+    axutil_hash_set(interface_fault_ref_impl->methods, "get_direction",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_interface_fault_ref_get_direction);
-    axis2_hash_set(interface_fault_ref_impl->methods, "to_element",
+    axutil_hash_set(interface_fault_ref_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_interface_fault_ref_to_element);
-    axis2_hash_set(interface_fault_ref_impl->methods, "set_qname",
+    axutil_hash_set(interface_fault_ref_impl->methods, "set_qname",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_interface_fault_ref_set_qname);
-    axis2_hash_set(interface_fault_ref_impl->methods, "get_qname",
+    axutil_hash_set(interface_fault_ref_impl->methods, "get_qname",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_interface_fault_ref_get_qname);
-    axis2_hash_set(interface_fault_ref_impl->methods, "set_msg_qname",
+    axutil_hash_set(interface_fault_ref_impl->methods, "set_msg_qname",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_interface_fault_ref_set_msg_qname);
-    axis2_hash_set(interface_fault_ref_impl->methods, "get_msg_qname",
+    axutil_hash_set(interface_fault_ref_impl->methods, "get_msg_qname",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_interface_fault_ref_get_msg_qname);
-    axis2_hash_set(interface_fault_ref_impl->methods, "set_direction",
+    axutil_hash_set(interface_fault_ref_impl->methods, "set_direction",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_interface_fault_ref_set_direction);
 
@@ -475,21 +475,21 @@
 
     interface_fault_ref_impl->nested_configurable = woden_nested_configurable_create(env);
 
-    interface_fault_ref_impl->super = axis2_hash_make(env);
+    interface_fault_ref_impl->super = axutil_hash_make(env);
     if (!interface_fault_ref_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(interface_fault_ref_impl->super, "WODEN_WSDL10_INTERFACE_FAULT_REF",
+    axutil_hash_set(interface_fault_ref_impl->super, "WODEN_WSDL10_INTERFACE_FAULT_REF",
             AXIS2_HASH_KEY_STRING,
             &(interface_fault_ref_impl->interface_fault_ref));
-    axis2_hash_set(interface_fault_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
+    axutil_hash_set(interface_fault_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING,
             interface_fault_ref_impl->nested_configurable);
     configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
                 interface_fault_ref_impl->nested_configurable, env);
-    axis2_hash_set(interface_fault_ref_impl->super, "WODEN_CONFIGURABLE",
+    axutil_hash_set(interface_fault_ref_impl->super, "WODEN_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING, configurable);
 
     return &(interface_fault_ref_impl->interface_fault_ref);
@@ -617,13 +617,13 @@
 
     if (interface_fault_ref_impl->super)
     {
-        axis2_hash_free(interface_fault_ref_impl->super, env);
+        axutil_hash_free(interface_fault_ref_impl->super, env);
         interface_fault_ref_impl->super = NULL;
     }
 
     if (interface_fault_ref_impl->methods)
     {
-        axis2_hash_free(interface_fault_ref_impl->methods, env);
+        axutil_hash_free(interface_fault_ref_impl->methods, env);
         interface_fault_ref_impl->methods = NULL;
     }
 
@@ -650,7 +650,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_interface_fault_ref_super_objs(
     void *interface_fault_ref,
     const axutil_env_t *env)
@@ -694,7 +694,7 @@
     woden_wsdl10_interface_fault_ref_t *interface_fault_ref,
     const axutil_env_t *env,
     woden_wsdl10_interface_fault_ref_t *interface_fault_ref_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl10_interface_fault_ref_impl_t *interface_fault_ref_impl_l = NULL;
 
@@ -702,20 +702,20 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     interface_fault_ref_impl_l = INTF_TO_IMPL(interface_fault_ref_impl);
 
-    interface_fault_ref->ops->free = axis2_hash_get(methods, "free",
+    interface_fault_ref->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    interface_fault_ref->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    interface_fault_ref->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    interface_fault_ref->ops->type = axis2_hash_get(methods, "type",
+    interface_fault_ref->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    interface_fault_ref->ops->get_direction = axis2_hash_get(methods,
+    interface_fault_ref->ops->get_direction = axutil_hash_get(methods,
             "get_direction", AXIS2_HASH_KEY_STRING);
     if (!interface_fault_ref->ops->get_direction && interface_fault_ref_impl_l)
         interface_fault_ref->ops->get_direction =
             interface_fault_ref_impl_l->interface_fault_ref.ops->get_direction;
 
-    interface_fault_ref->ops->to_element = axis2_hash_get(methods,
+    interface_fault_ref->ops->to_element = axutil_hash_get(methods,
             "to_element", AXIS2_HASH_KEY_STRING);
     if (!interface_fault_ref->ops->to_element && interface_fault_ref_impl_l)
         interface_fault_ref->ops->to_element =
@@ -734,11 +734,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_interface_fault_ref_impl_t *interface_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_INTERFACE_FAULT_REF_SUPER_OBJS(interface_fault_ref, env);
-    interface_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_INTERFACE_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     return interface_fault_ref_impl->f_direction;
@@ -750,11 +750,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_interface_fault_ref_impl_t *interface_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_INTERFACE_FAULT_REF_SUPER_OBJS(interface_fault_ref, env);
-    interface_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_INTERFACE_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     return &(interface_fault_ref_impl->interface_fault_ref);
@@ -771,12 +771,12 @@
     void *dir)
 {
     woden_wsdl10_interface_fault_ref_impl_t *interface_fault_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_WSDL10_INTERFACE_FAULT_REF_SUPER_OBJS(interface_fault_ref, env);
-    interface_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_INTERFACE_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     if (!interface_fault_ref_impl->f_direction)
@@ -796,12 +796,12 @@
     axis2_qname_t *qname)
 {
     woden_wsdl10_interface_fault_ref_impl_t *interface_fault_ref_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_WSDL10_INTERFACE_FAULT_REF_SUPER_OBJS(interface_fault_ref, env);
-    interface_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_INTERFACE_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     if (interface_fault_ref_impl->f_qname)
@@ -818,11 +818,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_interface_fault_ref_impl_t *interface_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_INTERFACE_FAULT_REF_SUPER_OBJS(interface_fault_ref, env);
-    interface_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_INTERFACE_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     return interface_fault_ref_impl->f_qname;
@@ -836,12 +836,12 @@
     axis2_qname_t *element)
 {
     woden_wsdl10_interface_fault_ref_impl_t *interface_fault_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_WSDL10_INTERFACE_FAULT_REF_SUPER_OBJS(interface_fault_ref, env);
-    interface_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_INTERFACE_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     if (interface_fault_ref_impl->f_msg_qname)
@@ -858,11 +858,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_interface_fault_ref_impl_t *interface_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_INTERFACE_FAULT_REF_SUPER_OBJS(interface_fault_ref, env);
-    interface_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    interface_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_INTERFACE_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     return interface_fault_ref_impl->f_msg_qname;



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