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

svn commit: r524225 [12/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/extensions/soap/woden_wsdl10_soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c Fri Mar 30 11:28:18 2007
@@ -32,8 +32,8 @@
 struct woden_wsdl10_soap_header_block_impl
 {
     woden_wsdl10_soap_header_block_t header_block;
-    axis2_hash_t *methods;
-    axis2_hash_t *super;
+    axutil_hash_t *methods;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
     void *f_parent;
@@ -55,7 +55,7 @@
     void *header_block,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_header_block_super_objs(
     void *header_block,
     const axutil_env_t *env);
@@ -403,128 +403,128 @@
     header_block_impl->header_block.ops->set_types =
         woden_wsdl10_soap_header_block_set_types;
 
-    header_block_impl->methods = axis2_hash_make(env);
+    header_block_impl->methods = axutil_hash_make(env);
     if (!header_block_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(header_block_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(header_block_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_free);
-    axis2_hash_set(header_block_impl->methods, "super_objs",
+    axutil_hash_set(header_block_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_header_block_super_objs);
-    axis2_hash_set(header_block_impl->methods, "type",
+    axutil_hash_set(header_block_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_header_block_type);
 
-    axis2_hash_set(header_block_impl->methods, "get_element_decl",
+    axutil_hash_set(header_block_impl->methods, "get_element_decl",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_element_decl);
 
-    axis2_hash_set(header_block_impl->methods, "must_understand",
+    axutil_hash_set(header_block_impl->methods, "must_understand",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_must_understand);
 
-    axis2_hash_set(header_block_impl->methods, "is_required",
+    axutil_hash_set(header_block_impl->methods, "is_required",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_is_required);
 
-    axis2_hash_set(header_block_impl->methods, "get_parent",
+    axutil_hash_set(header_block_impl->methods, "get_parent",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_parent);
 
-    axis2_hash_set(header_block_impl->methods, "to_element",
+    axutil_hash_set(header_block_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_to_element);
 
-    axis2_hash_set(header_block_impl->methods, "set_element_qname",
+    axutil_hash_set(header_block_impl->methods, "set_element_qname",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_set_element_qname);
 
-    axis2_hash_set(header_block_impl->methods, "get_element_qname",
+    axutil_hash_set(header_block_impl->methods, "get_element_qname",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_element_qname);
 
-    axis2_hash_set(header_block_impl->methods, "get_element",
+    axutil_hash_set(header_block_impl->methods, "get_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_element);
 
-    axis2_hash_set(header_block_impl->methods, "set_must_understand",
+    axutil_hash_set(header_block_impl->methods, "set_must_understand",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_set_must_understand);
 
-    axis2_hash_set(header_block_impl->methods, "set_parent_element",
+    axutil_hash_set(header_block_impl->methods, "set_parent_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_set_parent_element);
 
-    axis2_hash_set(header_block_impl->methods, "get_parent_element",
+    axutil_hash_set(header_block_impl->methods, "get_parent_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_parent_element);
 
-    axis2_hash_set(header_block_impl->methods, "add_documentation_element",
+    axutil_hash_set(header_block_impl->methods, "add_documentation_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_add_documentation_element);
 
-    axis2_hash_set(header_block_impl->methods, "get_documentation_elements",
+    axutil_hash_set(header_block_impl->methods, "get_documentation_elements",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_documentation_elements);
 
-    axis2_hash_set(header_block_impl->methods, "set_extension_type",
+    axutil_hash_set(header_block_impl->methods, "set_extension_type",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_set_extension_type);
 
-    axis2_hash_set(header_block_impl->methods, "get_extension_type",
+    axutil_hash_set(header_block_impl->methods, "get_extension_type",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_extension_type);
 
-    axis2_hash_set(header_block_impl->methods, "set_required",
+    axutil_hash_set(header_block_impl->methods, "set_required",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_set_required);
 
-    axis2_hash_set(header_block_impl->methods, "set_ext_attr",
+    axutil_hash_set(header_block_impl->methods, "set_ext_attr",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_set_ext_attr);
 
-    axis2_hash_set(header_block_impl->methods, "get_ext_attr",
+    axutil_hash_set(header_block_impl->methods, "get_ext_attr",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_ext_attr);
 
-    axis2_hash_set(header_block_impl->methods, "get_ext_attrs_for_namespace",
+    axutil_hash_set(header_block_impl->methods, "get_ext_attrs_for_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_ext_attrs_for_namespace);
 
-    axis2_hash_set(header_block_impl->methods, "get_ext_attrs",
+    axutil_hash_set(header_block_impl->methods, "get_ext_attrs",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_ext_attrs);
 
-    axis2_hash_set(header_block_impl->methods, "has_ext_attrs_for_namespace",
+    axutil_hash_set(header_block_impl->methods, "has_ext_attrs_for_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_has_ext_attrs_for_namespace);
 
-    axis2_hash_set(header_block_impl->methods, "add_ext_element",
+    axutil_hash_set(header_block_impl->methods, "add_ext_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_add_ext_element);
 
-    axis2_hash_set(header_block_impl->methods, "remove_ext_element",
+    axutil_hash_set(header_block_impl->methods, "remove_ext_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_remove_ext_element);
 
-    axis2_hash_set(header_block_impl->methods, "get_ext_elements",
+    axutil_hash_set(header_block_impl->methods, "get_ext_elements",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_ext_elements);
 
-    axis2_hash_set(header_block_impl->methods, "get_ext_elements_of_type",
+    axutil_hash_set(header_block_impl->methods, "get_ext_elements_of_type",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_get_ext_elements_of_type);
 
-    axis2_hash_set(header_block_impl->methods, "has_ext_elements_for_namespace",
+    axutil_hash_set(header_block_impl->methods, "has_ext_elements_for_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_has_ext_elements_for_namespace);
 
-    axis2_hash_set(header_block_impl->methods, "set_element_decl",
+    axutil_hash_set(header_block_impl->methods, "set_element_decl",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_set_element_decl);
 
-    axis2_hash_set(header_block_impl->methods, "set_types",
+    axutil_hash_set(header_block_impl->methods, "set_types",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_set_types);
 
@@ -539,13 +539,13 @@
     AXIS2_ENV_CHECK(env, NULL);
     header_block_impl = (woden_wsdl10_soap_header_block_impl_t *) create(env);
 
-    header_block_impl->super = axis2_hash_make(env);
+    header_block_impl->super = axutil_hash_make(env);
     if (!header_block_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(header_block_impl->super, "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(header_block_impl->super, "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING,
             &(header_block_impl->header_block));
 
     return &(header_block_impl->header_block);
@@ -604,13 +604,13 @@
 
     if (header_block_impl->super)
     {
-        axis2_hash_free(header_block_impl->super, env);
+        axutil_hash_free(header_block_impl->super, env);
         header_block_impl->super = NULL;
     }
 
     if (header_block_impl->methods)
     {
-        axis2_hash_free(header_block_impl->methods, env);
+        axutil_hash_free(header_block_impl->methods, env);
         header_block_impl->methods = NULL;
     }
 
@@ -678,7 +678,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_header_block_super_objs(
     void *header_block,
     const axutil_env_t *env)
@@ -709,7 +709,7 @@
     woden_wsdl10_soap_header_block_t *header_block,
     const axutil_env_t *env,
     woden_wsdl10_soap_header_block_t *header_block_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl_l = NULL;
 
@@ -717,50 +717,50 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     header_block_impl_l = INTF_TO_IMPL(header_block_impl);
 
-    header_block->ops->free = axis2_hash_get(methods, "free",
+    header_block->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    header_block->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    header_block->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    header_block->ops->type = axis2_hash_get(methods, "type",
+    header_block->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    header_block->ops->get_element_decl = axis2_hash_get(methods,
+    header_block->ops->get_element_decl = axutil_hash_get(methods,
             "get_element_decl", AXIS2_HASH_KEY_STRING);
     if (!header_block->ops->get_element_decl && header_block_impl_l)
         header_block->ops->get_element_decl =
             header_block_impl_l->header_block.ops->get_element_decl;
 
-    header_block->ops->must_understand = axis2_hash_get(methods,
+    header_block->ops->must_understand = axutil_hash_get(methods,
             "must_understand", AXIS2_HASH_KEY_STRING);
     if (!header_block->ops->must_understand && header_block_impl_l)
         header_block->ops->must_understand =
             header_block_impl_l->header_block.ops->must_understand;
 
-    header_block->ops->is_required = axis2_hash_get(methods,
+    header_block->ops->is_required = axutil_hash_get(methods,
             "is_required", AXIS2_HASH_KEY_STRING);
     if (!header_block->ops->is_required && header_block_impl_l)
         header_block->ops->is_required =
             header_block_impl_l->header_block.ops->is_required;
 
-    header_block->ops->get_parent = axis2_hash_get(methods,
+    header_block->ops->get_parent = axutil_hash_get(methods,
             "get_parent", AXIS2_HASH_KEY_STRING);
     if (!header_block->ops->get_parent && header_block_impl_l)
         header_block->ops->get_parent =
             header_block_impl_l->header_block.ops->get_parent;
 
-    header_block->ops->to_element = axis2_hash_get(methods,
+    header_block->ops->to_element = axutil_hash_get(methods,
             "to_element", AXIS2_HASH_KEY_STRING);
     if (!header_block->ops->to_element && header_block_impl_l)
         header_block->ops->to_element =
             header_block_impl_l->header_block.ops->to_element;
 
-    header_block->ops->set_element_decl = axis2_hash_get(methods,
+    header_block->ops->set_element_decl = axutil_hash_get(methods,
             "set_element_decl", AXIS2_HASH_KEY_STRING);
     if (!header_block->ops->set_element_decl && header_block_impl_l)
         header_block->ops->set_element_decl =
             header_block_impl_l->header_block.ops->set_element_decl;
 
-    header_block->ops->set_types = axis2_hash_get(methods,
+    header_block->ops->set_types = axutil_hash_get(methods,
             "set_types", AXIS2_HASH_KEY_STRING);
     if (!header_block->ops->set_types && header_block_impl_l)
         header_block->ops->set_types =
@@ -781,11 +781,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return header_block_impl->f_element_decl;
@@ -797,11 +797,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return header_block_impl->f_must_understand;
@@ -813,11 +813,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return header_block_impl->f_required;
@@ -829,11 +829,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return header_block_impl->f_parent;
@@ -845,11 +845,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return &(header_block_impl->header_block);
@@ -867,11 +867,11 @@
     axis2_qname_t *qname)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     if (header_block_impl->f_element_decl_qn)
@@ -892,11 +892,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return header_block_impl->f_element_decl_qn;
@@ -908,12 +908,12 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
     void *xse = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     if (header_block_impl->f_types)
@@ -932,11 +932,11 @@
     axis2_bool_t understood)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     header_block_impl->f_must_understand = understood;
@@ -952,11 +952,11 @@
     void *wsdl_el)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     if (header_block_impl->f_parent)
@@ -975,11 +975,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return header_block_impl->f_parent;
@@ -992,12 +992,12 @@
     void *doc_el)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, doc_el, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     if (!header_block_impl->f_documentation_elements)
@@ -1020,11 +1020,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return header_block_impl->f_documentation_elements;
@@ -1037,11 +1037,11 @@
     axis2_qname_t *qname)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     if (header_block_impl->f_ext_element_type)
@@ -1061,11 +1061,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return header_block_impl->f_ext_element_type;
@@ -1078,11 +1078,11 @@
     axis2_bool_t required)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     header_block_impl->f_required = required;
@@ -1102,13 +1102,13 @@
     void *attr)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, attr_type, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, attr, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_SET_EXT_ATTR(
@@ -1122,12 +1122,12 @@
     axis2_qname_t *attr_type)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, attr_type, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(
@@ -1141,12 +1141,12 @@
     axis2_uri_t *namespc)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, namespc, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTRS_FOR_NAMESPACE(
@@ -1159,11 +1159,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTRS(
@@ -1177,12 +1177,12 @@
     axis2_uri_t *namespc)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -1196,12 +1196,12 @@
     void *ext_el)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, ext_el, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_ADD_EXT_ELEMENT(
@@ -1215,12 +1215,12 @@
     void *ext_el)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, ext_el, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_REMOVE_EXT_ELEMENT(
@@ -1235,11 +1235,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(
@@ -1253,12 +1253,12 @@
     axis2_qname_t *ext_type)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, ext_type, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
@@ -1272,12 +1272,12 @@
     axis2_uri_t *namespc)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_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_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ELEMENTS_FOR_NAMESPACE(
@@ -1295,12 +1295,12 @@
     void *element_decl)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_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_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     if (header_block_impl->f_element_decl)
@@ -1321,12 +1321,12 @@
     void *types)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_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_WSDL10_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
-    header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
 
     if (header_block_impl->f_types)

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c Fri Mar 30 11:28:18 2007
@@ -42,8 +42,8 @@
 {
     woden_wsdl10_soap_header_block_deserializer_t header_deser;
     woden_obj_types_t obj_type;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(header_deser) \
@@ -59,7 +59,7 @@
     void *header_deser,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_header_block_deserializer_super_objs(
     void *header_deser,
     const axutil_env_t *env);
@@ -148,20 +148,20 @@
     header_deser_impl->header_deser.ops->marshall =
         woden_wsdl10_soap_header_block_deserializer_marshall;
 
-    header_deser_impl->methods = axis2_hash_make(env);
+    header_deser_impl->methods = axutil_hash_make(env);
     if (!header_deser_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(header_deser_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(header_deser_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_deserializer_free);
-    axis2_hash_set(header_deser_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(header_deser_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_deserializer_super_objs);
-    axis2_hash_set(header_deser_impl->methods, "type",
+    axutil_hash_set(header_deser_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_header_block_deserializer_type);
 
-    axis2_hash_set(header_deser_impl->methods, "marshall",
+    axutil_hash_set(header_deser_impl->methods, "marshall",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_header_block_deserializer_marshall);
 
@@ -176,13 +176,13 @@
     AXIS2_ENV_CHECK(env, NULL);
     header_deser_impl = (woden_wsdl10_soap_header_block_deserializer_impl_t *) create(env);
 
-    header_deser_impl->super = axis2_hash_make(env);
+    header_deser_impl->super = axutil_hash_make(env);
     if (!header_deser_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(header_deser_impl->super, "WODEN_WSDL10_SOAP_HEADER_BLOCK_DESERIALIZER",
+    axutil_hash_set(header_deser_impl->super, "WODEN_WSDL10_SOAP_HEADER_BLOCK_DESERIALIZER",
             AXIS2_HASH_KEY_STRING, &(header_deser_impl->header_deser));
 
     return &(header_deser_impl->header_deser);
@@ -222,13 +222,13 @@
 
     if (header_deser_impl->super)
     {
-        axis2_hash_free(header_deser_impl->super, env);
+        axutil_hash_free(header_deser_impl->super, env);
         header_deser_impl->super = NULL;
     }
 
     if (header_deser_impl->methods)
     {
-        axis2_hash_free(header_deser_impl->methods, env);
+        axutil_hash_free(header_deser_impl->methods, env);
         header_deser_impl->methods = NULL;
     }
 
@@ -248,7 +248,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_header_block_deserializer_super_objs(
     void *header_deser,
     const axutil_env_t *env)
@@ -279,7 +279,7 @@
     woden_wsdl10_soap_header_block_deserializer_t *header_deser,
     const axutil_env_t *env,
     woden_wsdl10_soap_header_block_deserializer_t *header_deser_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl10_soap_header_block_deserializer_impl_t *header_deser_impl_l = NULL;
 
@@ -287,14 +287,14 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     header_deser_impl_l = INTF_TO_IMPL(header_deser_impl);
 
-    header_deser->ops->free = axis2_hash_get(methods, "free",
+    header_deser->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    header_deser->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    header_deser->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    header_deser->ops->type = axis2_hash_get(methods, "type",
+    header_deser->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    header_deser->ops->marshall = axis2_hash_get(methods,
+    header_deser->ops->marshall = axutil_hash_get(methods,
             "marshall", AXIS2_HASH_KEY_STRING);
     if (!header_deser->ops->marshall && header_deser_impl_l)
         header_deser->ops->marshall =
@@ -315,7 +315,7 @@
     woden_wsdl10_ext_registry_t *ext_reg)
 {
     woden_wsdl10_soap_header_block_deserializer_impl_t *header_deser_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
     void *soap_hdr = NULL;
     axis2_char_t *element_decl_qn = NULL;
     axis2_char_t *must_understand = NULL;
@@ -329,7 +329,7 @@
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_HEADER_BLOCK_DESERIALIZER_SUPER_OBJS(header_deser, env);
-    header_deser_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    header_deser_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_HEADER_BLOCK_DESERIALIZER", AXIS2_HASH_KEY_STRING));
 
     soap_hdr = WODEN_WSDL10_EXT_REGISTRY_QUERY_EXT_ELEMENT_TYPE(ext_reg, env,
@@ -345,7 +345,7 @@
     if (element_decl_qn)
     {
         axis2_qname_t *qname = NULL;
-        axis2_hash_t *namespcs = NULL;
+        axutil_hash_t *namespcs = NULL;
 
         desc = woden_wsdl10_desc_to_desc_element(desc, env);
         namespcs = WODEN_WSDL10_DESC_ELEMENT_GET_NAMESPACES(desc, env);

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_element.c Fri Mar 30 11:28:18 2007
@@ -21,50 +21,50 @@
 woden_wsdl10_soap_header_block_element_resolve_methods(
     woden_wsdl10_soap_header_block_element_t *soap_header_block_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);
 
-    soap_header_block_element->ops->free = axis2_hash_get(methods, "free",
+    soap_header_block_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    soap_header_block_element->ops->type = axis2_hash_get(methods, "type",
+    soap_header_block_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     soap_header_block_element->ops->set_element_qname =
-        axis2_hash_get(methods, "set_element_qname",
+        axutil_hash_get(methods, "set_element_qname",
                 AXIS2_HASH_KEY_STRING);
 
     soap_header_block_element->ops->get_element_qname =
-        axis2_hash_get(methods, "get_element_qname",
+        axutil_hash_get(methods, "get_element_qname",
                 AXIS2_HASH_KEY_STRING);
 
     soap_header_block_element->ops->get_element =
-        axis2_hash_get(methods, "get_element",
+        axutil_hash_get(methods, "get_element",
                 AXIS2_HASH_KEY_STRING);
 
     soap_header_block_element->ops->set_must_understand =
-        axis2_hash_get(methods, "set_must understand",
+        axutil_hash_get(methods, "set_must understand",
                 AXIS2_HASH_KEY_STRING);
 
     soap_header_block_element->ops->must_understand =
-        axis2_hash_get(methods, "must_understand",
+        axutil_hash_get(methods, "must_understand",
                 AXIS2_HASH_KEY_STRING);
 
     soap_header_block_element->ops->set_parent_element =
-        axis2_hash_get(methods, "set_parent_element",
+        axutil_hash_get(methods, "set_parent_element",
                 AXIS2_HASH_KEY_STRING);
 
     soap_header_block_element->ops->get_parent_element =
-        axis2_hash_get(methods, "get_parent_element",
+        axutil_hash_get(methods, "get_parent_element",
                 AXIS2_HASH_KEY_STRING);
 
     soap_header_block_element->ops->add_documentation_element =
-        axis2_hash_get(methods, "add_documentation_element",
+        axutil_hash_get(methods, "add_documentation_element",
                 AXIS2_HASH_KEY_STRING);
 
     soap_header_block_element->ops->get_documentation_elements =
-        axis2_hash_get(methods, "get_documentation_elements",
+        axutil_hash_get(methods, "get_documentation_elements",
                 AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c Fri Mar 30 11:28:18 2007
@@ -33,8 +33,8 @@
 struct woden_wsdl10_soap_module_impl
 {
     woden_wsdl10_soap_module_t module;
-    axis2_hash_t *methods;
-    axis2_hash_t *super;
+    axutil_hash_t *methods;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
     void *f_parent;
@@ -55,7 +55,7 @@
     void *module,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_module_super_objs(
     void *module,
     const axutil_env_t *env);
@@ -378,121 +378,121 @@
     module_impl->module.ops->to_element =
         woden_wsdl10_soap_module_to_element;
 
-    module_impl->methods = axis2_hash_make(env);
+    module_impl->methods = axutil_hash_make(env);
     if (!module_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(module_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(module_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_free);
-    axis2_hash_set(module_impl->methods, "super_objs",
+    axutil_hash_set(module_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_module_super_objs);
-    axis2_hash_set(module_impl->methods, "type",
+    axutil_hash_set(module_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_module_type);
 
-    axis2_hash_set(module_impl->methods, "get_ref",
+    axutil_hash_set(module_impl->methods, "get_ref",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_ref);
 
-    axis2_hash_set(module_impl->methods, "is_required",
+    axutil_hash_set(module_impl->methods, "is_required",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_is_required);
 
-    axis2_hash_set(module_impl->methods, "get_parent",
+    axutil_hash_set(module_impl->methods, "get_parent",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_parent);
 
-    axis2_hash_set(module_impl->methods, "to_element",
+    axutil_hash_set(module_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_to_element);
 
-    axis2_hash_set(module_impl->methods, "set_ref",
+    axutil_hash_set(module_impl->methods, "set_ref",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_set_ref);
 
-    axis2_hash_set(module_impl->methods, "set_parent_element",
+    axutil_hash_set(module_impl->methods, "set_parent_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_set_parent_element);
 
-    axis2_hash_set(module_impl->methods, "get_parent_element",
+    axutil_hash_set(module_impl->methods, "get_parent_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_parent_element);
 
-    axis2_hash_set(module_impl->methods, "set_soap_binding_op_exts",
+    axutil_hash_set(module_impl->methods, "set_soap_binding_op_exts",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_set_soap_binding_op_exts);
 
-    axis2_hash_set(module_impl->methods, "get_soap_binding_op_exts",
+    axutil_hash_set(module_impl->methods, "get_soap_binding_op_exts",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_soap_binding_op_exts);
 
-    axis2_hash_set(module_impl->methods, "set_soap_address_exts",
+    axutil_hash_set(module_impl->methods, "set_soap_address_exts",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_set_soap_address_exts);
 
-    axis2_hash_set(module_impl->methods, "get_soap_address_exts",
+    axutil_hash_set(module_impl->methods, "get_soap_address_exts",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_soap_address_exts);
 
 
-    axis2_hash_set(module_impl->methods, "add_documentation_element",
+    axutil_hash_set(module_impl->methods, "add_documentation_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_add_documentation_element);
 
-    axis2_hash_set(module_impl->methods, "get_documentation_elements",
+    axutil_hash_set(module_impl->methods, "get_documentation_elements",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_documentation_elements);
 
-    axis2_hash_set(module_impl->methods, "set_ext_type",
+    axutil_hash_set(module_impl->methods, "set_ext_type",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_set_ext_type);
 
-    axis2_hash_set(module_impl->methods, "get_ext_type",
+    axutil_hash_set(module_impl->methods, "get_ext_type",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_ext_type);
 
-    axis2_hash_set(module_impl->methods, "set_required",
+    axutil_hash_set(module_impl->methods, "set_required",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_set_required);
 
-    axis2_hash_set(module_impl->methods, "set_ext_attr",
+    axutil_hash_set(module_impl->methods, "set_ext_attr",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_set_ext_attr);
 
-    axis2_hash_set(module_impl->methods, "get_ext_attr",
+    axutil_hash_set(module_impl->methods, "get_ext_attr",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_ext_attr);
 
-    axis2_hash_set(module_impl->methods, "get_ext_attrs_for_namespace",
+    axutil_hash_set(module_impl->methods, "get_ext_attrs_for_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_ext_attrs_for_namespace);
 
-    axis2_hash_set(module_impl->methods, "get_ext_attrs",
+    axutil_hash_set(module_impl->methods, "get_ext_attrs",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_ext_attrs);
 
-    axis2_hash_set(module_impl->methods, "has_ext_attrs_for_namespace",
+    axutil_hash_set(module_impl->methods, "has_ext_attrs_for_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_has_ext_attrs_for_namespace);
 
-    axis2_hash_set(module_impl->methods, "add_ext_element",
+    axutil_hash_set(module_impl->methods, "add_ext_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_add_ext_element);
 
-    axis2_hash_set(module_impl->methods, "remove_ext_element",
+    axutil_hash_set(module_impl->methods, "remove_ext_element",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_remove_ext_element);
 
-    axis2_hash_set(module_impl->methods, "get_ext_elements",
+    axutil_hash_set(module_impl->methods, "get_ext_elements",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_ext_elements);
 
-    axis2_hash_set(module_impl->methods, "get_ext_elements_of_type",
+    axutil_hash_set(module_impl->methods, "get_ext_elements_of_type",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_get_ext_elements_of_type);
 
-    axis2_hash_set(module_impl->methods, "has_ext_elements_for_namespace",
+    axutil_hash_set(module_impl->methods, "has_ext_elements_for_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_has_ext_elements_for_namespace);
 
@@ -507,13 +507,13 @@
     AXIS2_ENV_CHECK(env, NULL);
     module_impl = (woden_wsdl10_soap_module_impl_t *) create(env);
 
-    module_impl->super = axis2_hash_make(env);
+    module_impl->super = axutil_hash_make(env);
     if (!module_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(module_impl->super, "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(module_impl->super, "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING,
             &(module_impl->module));
 
     return &(module_impl->module);
@@ -572,13 +572,13 @@
 
     if (module_impl->super)
     {
-        axis2_hash_free(module_impl->super, env);
+        axutil_hash_free(module_impl->super, env);
         module_impl->super = NULL;
     }
 
     if (module_impl->methods)
     {
-        axis2_hash_free(module_impl->methods, env);
+        axutil_hash_free(module_impl->methods, env);
         module_impl->methods = NULL;
     }
 
@@ -649,7 +649,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_module_super_objs(
     void *module,
     const axutil_env_t *env)
@@ -680,7 +680,7 @@
     woden_wsdl10_soap_module_t *module,
     const axutil_env_t *env,
     woden_wsdl10_soap_module_t *module_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl10_soap_module_impl_t *module_impl_l = NULL;
 
@@ -688,32 +688,32 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     module_impl_l = INTF_TO_IMPL(module_impl);
 
-    module->ops->free = axis2_hash_get(methods, "free",
+    module->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    module->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    module->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    module->ops->type = axis2_hash_get(methods, "type",
+    module->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    module->ops->get_ref = axis2_hash_get(methods,
+    module->ops->get_ref = axutil_hash_get(methods,
             "get_ref", AXIS2_HASH_KEY_STRING);
     if (!module->ops->get_ref && module_impl_l)
         module->ops->get_ref =
             module_impl_l->module.ops->get_ref;
 
-    module->ops->is_required = axis2_hash_get(methods,
+    module->ops->is_required = axutil_hash_get(methods,
             "is_required", AXIS2_HASH_KEY_STRING);
     if (!module->ops->is_required && module_impl_l)
         module->ops->is_required =
             module_impl_l->module.ops->is_required;
 
-    module->ops->get_parent = axis2_hash_get(methods,
+    module->ops->get_parent = axutil_hash_get(methods,
             "get_parent", AXIS2_HASH_KEY_STRING);
     if (!module->ops->get_parent && module_impl_l)
         module->ops->get_parent =
             module_impl_l->module.ops->get_parent;
 
-    module->ops->to_element = axis2_hash_get(methods,
+    module->ops->to_element = axutil_hash_get(methods,
             "to_element", AXIS2_HASH_KEY_STRING);
     if (!module->ops->to_element && module_impl_l)
         module->ops->to_element =
@@ -732,11 +732,11 @@
     axutil_env_t *env)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return module_impl->f_ref;
@@ -748,11 +748,11 @@
     axutil_env_t *env)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return module_impl->f_required;
@@ -764,11 +764,11 @@
     axutil_env_t *env)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return module_impl->f_parent;
@@ -780,11 +780,11 @@
     axutil_env_t *env)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return &(module_impl->module);
@@ -802,12 +802,12 @@
     axis2_uri_t *uri)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, uri, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     if (module_impl->f_ref)
@@ -829,11 +829,11 @@
     void *wsdl_el)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     if (module_impl->f_parent)
@@ -852,11 +852,11 @@
     axutil_env_t *env)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return module_impl->f_parent;
@@ -869,12 +869,12 @@
     void *doc_el)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, doc_el, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     if (!module_impl->f_documentation_elements)
@@ -897,11 +897,11 @@
     axutil_env_t *env)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return module_impl->f_documentation_elements;
@@ -914,12 +914,12 @@
     void *binding_op_exts)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, binding_op_exts, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     module_impl->f_binding_op_exts = binding_op_exts;
@@ -932,11 +932,11 @@
     axutil_env_t *env)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return module_impl->f_binding_op_exts;
@@ -949,12 +949,12 @@
     void *address_exts)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, address_exts, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     module_impl->f_address_exts = address_exts;
@@ -967,11 +967,11 @@
     axutil_env_t *env)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return module_impl->f_address_exts;
@@ -986,11 +986,11 @@
     axis2_qname_t *qname)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     if (module_impl->f_ext_element_type)
@@ -1010,11 +1010,11 @@
     axutil_env_t *env)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return module_impl->f_ext_element_type;
@@ -1027,11 +1027,11 @@
     axis2_bool_t required)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     module_impl->f_required = required;
@@ -1051,13 +1051,13 @@
     void *attr)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, attr_type, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, attr, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_SET_EXT_ATTR(
@@ -1071,12 +1071,12 @@
     axis2_qname_t *attr_type)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, attr_type, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(
@@ -1090,12 +1090,12 @@
     axis2_uri_t *namespc)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, namespc, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTRS_FOR_NAMESPACE(
@@ -1108,11 +1108,11 @@
     axutil_env_t *env)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTRS(
@@ -1126,12 +1126,12 @@
     axis2_uri_t *namespc)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -1145,12 +1145,12 @@
     void *ext_el)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, ext_el, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_ADD_EXT_ELEMENT(
@@ -1164,12 +1164,12 @@
     void *ext_el)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, ext_el, AXIS2_FAILURE);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_REMOVE_EXT_ELEMENT(
@@ -1184,11 +1184,11 @@
     axutil_env_t *env)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(
@@ -1202,12 +1202,12 @@
     axis2_qname_t *ext_type)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, ext_type, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
@@ -1221,12 +1221,12 @@
     axis2_uri_t *namespc)
 {
     woden_wsdl10_soap_module_impl_t *module_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_SOAP_MODULE_SUPER_OBJS(module, env);
-    module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    module_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ELEMENTS_FOR_NAMESPACE(

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c Fri Mar 30 11:28:18 2007
@@ -43,8 +43,8 @@
 {
     woden_wsdl10_soap_module_deserializer_t mod_deser;
     woden_obj_types_t obj_type;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
 };
 
 #define INTF_TO_IMPL(mod_deser) \
@@ -60,7 +60,7 @@
     void *mod_deser,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_module_deserializer_super_objs(
     void *mod_deser,
     const axutil_env_t *env);
@@ -149,20 +149,20 @@
     mod_deser_impl->mod_deser.ops->unmarshall =
         woden_wsdl10_soap_module_deserializer_unmarshall;
 
-    mod_deser_impl->methods = axis2_hash_make(env);
+    mod_deser_impl->methods = axutil_hash_make(env);
     if (!mod_deser_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(mod_deser_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(mod_deser_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_deserializer_free);
-    axis2_hash_set(mod_deser_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(mod_deser_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_deserializer_super_objs);
-    axis2_hash_set(mod_deser_impl->methods, "type",
+    axutil_hash_set(mod_deser_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_module_deserializer_type);
 
-    axis2_hash_set(mod_deser_impl->methods, "unmarshall",
+    axutil_hash_set(mod_deser_impl->methods, "unmarshall",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_module_deserializer_unmarshall);
 
@@ -177,13 +177,13 @@
     AXIS2_ENV_CHECK(env, NULL);
     mod_deser_impl = (woden_wsdl10_soap_module_deserializer_impl_t *) create(env);
 
-    mod_deser_impl->super = axis2_hash_make(env);
+    mod_deser_impl->super = axutil_hash_make(env);
     if (!mod_deser_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(mod_deser_impl->super, "WODEN_WSDL10_SOAP_MODULE_DESERIALIZER",
+    axutil_hash_set(mod_deser_impl->super, "WODEN_WSDL10_SOAP_MODULE_DESERIALIZER",
             AXIS2_HASH_KEY_STRING, &(mod_deser_impl->mod_deser));
 
     return &(mod_deser_impl->mod_deser);
@@ -223,13 +223,13 @@
 
     if (mod_deser_impl->super)
     {
-        axis2_hash_free(mod_deser_impl->super, env);
+        axutil_hash_free(mod_deser_impl->super, env);
         mod_deser_impl->super = NULL;
     }
 
     if (mod_deser_impl->methods)
     {
-        axis2_hash_free(mod_deser_impl->methods, env);
+        axutil_hash_free(mod_deser_impl->methods, env);
         mod_deser_impl->methods = NULL;
     }
 
@@ -249,7 +249,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_module_deserializer_super_objs(
     void *mod_deser,
     const axutil_env_t *env)
@@ -280,7 +280,7 @@
     woden_wsdl10_soap_module_deserializer_t *mod_deser,
     const axutil_env_t *env,
     woden_wsdl10_soap_module_deserializer_t *mod_deser_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl10_soap_module_deserializer_impl_t *mod_deser_impl_l = NULL;
 
@@ -288,14 +288,14 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     mod_deser_impl_l = INTF_TO_IMPL(mod_deser_impl);
 
-    mod_deser->ops->free = axis2_hash_get(methods, "free",
+    mod_deser->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    mod_deser->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    mod_deser->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    mod_deser->ops->type = axis2_hash_get(methods, "type",
+    mod_deser->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    mod_deser->ops->unmarshall = axis2_hash_get(methods,
+    mod_deser->ops->unmarshall = axutil_hash_get(methods,
             "unmarshall", AXIS2_HASH_KEY_STRING);
     if (!mod_deser->ops->unmarshall && mod_deser_impl_l)
         mod_deser->ops->unmarshall =
@@ -316,7 +316,7 @@
     woden_wsdl10_ext_registry_t *ext_reg)
 {
     woden_wsdl10_soap_module_deserializer_impl_t *mod_deser_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
     void *soap_mod = NULL;
     axis2_char_t *ref = NULL;
     axis2_char_t *req = NULL;
@@ -328,7 +328,7 @@
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_DESERIALIZER_SUPER_OBJS(mod_deser, env);
-    mod_deser_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    mod_deser_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL10_SOAP_MODULE_DESERIALIZER", AXIS2_HASH_KEY_STRING));
 
     /*soap_mod = WODEN_WSDL10_EXT_REGISTRY_QUERY_EXT_ELEMENT_TYPE(ext_reg, env,

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_element.c Fri Mar 30 11:28:18 2007
@@ -21,55 +21,55 @@
 woden_wsdl10_soap_module_element_resolve_methods(
     woden_wsdl10_soap_module_element_t *soap_module_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);
 
-    soap_module_element->ops->free = axis2_hash_get(methods, "free",
+    soap_module_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    soap_module_element->ops->type = axis2_hash_get(methods, "type",
+    soap_module_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     soap_module_element->ops->set_ref =
-        axis2_hash_get(methods, "set_ref",
+        axutil_hash_get(methods, "set_ref",
                 AXIS2_HASH_KEY_STRING);
 
     soap_module_element->ops->get_ref =
-        axis2_hash_get(methods, "get_ref",
+        axutil_hash_get(methods, "get_ref",
                 AXIS2_HASH_KEY_STRING);
 
     soap_module_element->ops->set_parent_element =
-        axis2_hash_get(methods, "set_parent_element",
+        axutil_hash_get(methods, "set_parent_element",
                 AXIS2_HASH_KEY_STRING);
 
     soap_module_element->ops->get_parent_element =
-        axis2_hash_get(methods, "get_parent_element",
+        axutil_hash_get(methods, "get_parent_element",
                 AXIS2_HASH_KEY_STRING);
 
     soap_module_element->ops->set_soap_binding_op_exts =
-        axis2_hash_get(methods, "set_soap_binding_op_exts",
+        axutil_hash_get(methods, "set_soap_binding_op_exts",
                 AXIS2_HASH_KEY_STRING);
 
     soap_module_element->ops->get_soap_binding_op_exts =
-        axis2_hash_get(methods, "get_soap_binding_op_exts",
+        axutil_hash_get(methods, "get_soap_binding_op_exts",
                 AXIS2_HASH_KEY_STRING);
 
     soap_module_element->ops->set_soap_address_exts =
-        axis2_hash_get(methods, "set_soap_address_exts",
+        axutil_hash_get(methods, "set_soap_address_exts",
                 AXIS2_HASH_KEY_STRING);
 
     soap_module_element->ops->get_soap_address_exts =
-        axis2_hash_get(methods, "get_soap_address_exts",
+        axutil_hash_get(methods, "get_soap_address_exts",
                 AXIS2_HASH_KEY_STRING);
 
 
     soap_module_element->ops->add_documentation_element =
-        axis2_hash_get(methods, "add_documentation_element",
+        axutil_hash_get(methods, "add_documentation_element",
                 AXIS2_HASH_KEY_STRING);
 
     soap_module_element->ops->get_documentation_elements =
-        axis2_hash_get(methods, "get_documentation_elements",
+        axutil_hash_get(methods, "get_documentation_elements",
                 AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_deserializer.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_deserializer.c Fri Mar 30 11:28:18 2007
@@ -21,18 +21,18 @@
 woden_wsdl10_ext_deserializer_resolve_methods(
     woden_wsdl10_ext_deserializer_t *ext_deserializer,
     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);
 
-    ext_deserializer->ops->free = axis2_hash_get(methods, "free",
+    ext_deserializer->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
 
-    ext_deserializer->ops->type = axis2_hash_get(methods, "type",
+    ext_deserializer->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    ext_deserializer->ops->unmarshall = axis2_hash_get(methods, "unmarshall",
+    ext_deserializer->ops->unmarshall = axutil_hash_get(methods, "unmarshall",
             AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c Fri Mar 30 11:28:18 2007
@@ -37,7 +37,7 @@
 #include <woden_qname_or_token_any_attr.h>
 #include <woden_qname_list_or_token_any_attr.h>
 #include <axis2_uri.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
 
 typedef struct woden_wsdl10_ext_registry_impl woden_wsdl10_ext_registry_impl_t;
 
@@ -52,24 +52,24 @@
     This is a Map of Maps. The top-level Map is keyed by parent type,
     and the inner Maps are keyed by element QN.
     */
-    axis2_hash_t *deserializer_reg;
+    axutil_hash_t *deserializer_reg;
     /*
     This is a Map of Maps. The top-level Map is keyed by parent type,
     and the inner Maps are keyed by element QN.
     */
-    axis2_hash_t *ext_element_reg;
+    axutil_hash_t *ext_element_reg;
     /*
     This is a Map of Maps. The top-level Map is keyed by parent type,
     and the inner Maps are keyed by attr qname.
     */
-    axis2_hash_t *ext_attr_reg;
+    axutil_hash_t *ext_attr_reg;
 
     /*
     * This is a Map of Maps. The top-level Map is keyed by parent component
     * and the inner Map is keyed by (URI)extension namespace with a value of
     * component extensions.
     */
-    axis2_hash_t *comp_ext_reg;
+    axutil_hash_t *comp_ext_reg;
 
     axutil_array_list_t *key_set;
 
@@ -228,25 +228,25 @@
     registry_impl->registry.ops->query_component_ext_namespaces =
         woden_wsdl10_ext_registry_query_component_ext_namespaces;
 
-    registry_impl->ext_attr_reg = axis2_hash_make(env);
+    registry_impl->ext_attr_reg = axutil_hash_make(env);
     if (!registry_impl->ext_attr_reg)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    registry_impl->deserializer_reg = axis2_hash_make(env);
+    registry_impl->deserializer_reg = axutil_hash_make(env);
     if (!registry_impl->deserializer_reg)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    registry_impl->ext_element_reg = axis2_hash_make(env);
+    registry_impl->ext_element_reg = axutil_hash_make(env);
     if (!registry_impl->ext_element_reg)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    registry_impl->comp_ext_reg = axis2_hash_make(env);
+    registry_impl->comp_ext_reg = axutil_hash_make(env);
     if (!registry_impl->comp_ext_reg)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -325,22 +325,22 @@
     void *ed)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_deserializer_reg = NULL;
+    axutil_hash_t *inner_deserializer_reg = NULL;
     axis2_char_t *element_type = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_deserializer_reg = axis2_hash_get(registry_impl->deserializer_reg,
+    inner_deserializer_reg = axutil_hash_get(registry_impl->deserializer_reg,
             parent_type, AXIS2_HASH_KEY_STRING);
     if (! inner_deserializer_reg)
     {
-        inner_deserializer_reg = axis2_hash_make(env);
-        axis2_hash_set(registry_impl->deserializer_reg, parent_type,
+        inner_deserializer_reg = axutil_hash_make(env);
+        axutil_hash_set(registry_impl->deserializer_reg, parent_type,
                 AXIS2_HASH_KEY_STRING, inner_deserializer_reg);
     }
     element_type = axis2_qname_to_string(element_qtype, env);
-    axis2_hash_set(inner_deserializer_reg, element_type, AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(inner_deserializer_reg, element_type, AXIS2_HASH_KEY_STRING,
             ed);
     return AXIS2_SUCCESS;
 }
@@ -369,7 +369,7 @@
     axis2_qname_t *element_type)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_deserializer_reg = NULL;
+    axutil_hash_t *inner_deserializer_reg = NULL;
     axis2_char_t *elem_name = NULL;
     void *ed = NULL;
     axis2_qname_t *element_qtype = NULL;
@@ -377,7 +377,7 @@
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_deserializer_reg = axis2_hash_get(registry_impl->deserializer_reg,
+    inner_deserializer_reg = axutil_hash_get(registry_impl->deserializer_reg,
             parent_type, AXIS2_HASH_KEY_STRING);
     /*elem_name = axis2_qname_to_string(element_type, env); */
     if (inner_deserializer_reg)
@@ -386,7 +386,7 @@
         element_qtype = axis2_qname_create_from_string(env,
                 WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
         elem_name = axis2_qname_to_string(element_qtype, env);
-        ed = axis2_hash_get(inner_deserializer_reg, elem_name,
+        ed = axutil_hash_get(inner_deserializer_reg, elem_name,
                 AXIS2_HASH_KEY_STRING);
     }
     if (ed)
@@ -415,19 +415,19 @@
     axis2_qname_t *elem_qn)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_ext_element_reg = NULL;
+    axutil_hash_t *inner_ext_element_reg = NULL;
     /*axis2_char_t *elem_name = NULL;*/
     void *element = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_ext_element_reg = axis2_hash_get(registry_impl->ext_element_reg,
+    inner_ext_element_reg = axutil_hash_get(registry_impl->ext_element_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
     /*elem_name = axis2_qname_to_string(elem_qn, env);*/
     if (inner_ext_element_reg)
     {
-        element = axis2_hash_get(inner_ext_element_reg,
+        element = axutil_hash_get(inner_ext_element_reg,
                 WODEN_WSDL10_Q_ELEM_SOAP_MODULE, AXIS2_HASH_KEY_STRING);
     }
     return element;
@@ -448,24 +448,24 @@
     axis2_char_t *parent_type)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_deserializer_reg = NULL;
+    axutil_hash_t *inner_deserializer_reg = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_deserializer_reg = axis2_hash_get(registry_impl->deserializer_reg,
+    inner_deserializer_reg = axutil_hash_get(registry_impl->deserializer_reg,
             parent_type, AXIS2_HASH_KEY_STRING);
     if (inner_deserializer_reg)
     {
-        axis2_hash_index_t *i = NULL;
+        axutil_hash_index_t *i = NULL;
 
         registry_impl->key_set = axutil_array_list_create(env, 0);
-        for (i = axis2_hash_first(inner_deserializer_reg, env); i; i =
-                    axis2_hash_next(env, i))
+        for (i = axutil_hash_first(inner_deserializer_reg, env); i; i =
+                    axutil_hash_next(env, i))
         {
             void *v = NULL;
 
-            axis2_hash_this(i, NULL, NULL, &v);
+            axutil_hash_this(i, NULL, NULL, &v);
             axutil_array_list_add(registry_impl->key_set, env, v);
         }
     }
@@ -497,22 +497,22 @@
     void *element)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_ext_type_reg = NULL;
+    axutil_hash_t *inner_ext_type_reg = NULL;
     axis2_char_t *element_type = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_ext_type_reg = axis2_hash_get(registry_impl->ext_element_reg,
+    inner_ext_type_reg = axutil_hash_get(registry_impl->ext_element_reg,
             parent_type, AXIS2_HASH_KEY_STRING);
     if (! inner_ext_type_reg)
     {
-        inner_ext_type_reg = axis2_hash_make(env);
-        axis2_hash_set(registry_impl->ext_element_reg, parent_type,
+        inner_ext_type_reg = axutil_hash_make(env);
+        axutil_hash_set(registry_impl->ext_element_reg, parent_type,
                 AXIS2_HASH_KEY_STRING, inner_ext_type_reg);
     }
     element_type = axis2_qname_to_string(element_qtype, env);
-    axis2_hash_set(inner_ext_type_reg, element_type, AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(inner_ext_type_reg, element_type, AXIS2_HASH_KEY_STRING,
             element);
     return AXIS2_SUCCESS;
 }
@@ -540,22 +540,22 @@
     void *attr)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_ext_attr_reg = NULL;
+    axutil_hash_t *inner_ext_attr_reg = NULL;
     axis2_char_t *attr_name = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_ext_attr_reg = axis2_hash_get(registry_impl->ext_attr_reg,
+    inner_ext_attr_reg = axutil_hash_get(registry_impl->ext_attr_reg,
             owner_class, AXIS2_HASH_KEY_STRING);
     if (! inner_ext_attr_reg)
     {
-        inner_ext_attr_reg = axis2_hash_make(env);
-        axis2_hash_set(registry_impl->ext_attr_reg, owner_class,
+        inner_ext_attr_reg = axutil_hash_make(env);
+        axutil_hash_set(registry_impl->ext_attr_reg, owner_class,
                 AXIS2_HASH_KEY_STRING, inner_ext_attr_reg);
     }
     attr_name = axis2_qname_to_string(attr_qname, env);
-    axis2_hash_set(inner_ext_attr_reg, attr_name, AXIS2_HASH_KEY_STRING, attr);
+    axutil_hash_set(inner_ext_attr_reg, attr_name, AXIS2_HASH_KEY_STRING, attr);
     return AXIS2_SUCCESS;
 }
 
@@ -579,19 +579,19 @@
     axis2_qname_t *attr_qn)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_ext_attr_reg = NULL;
+    axutil_hash_t *inner_ext_attr_reg = NULL;
     void *attr = NULL;
     axis2_char_t *attr_name = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_ext_attr_reg = axis2_hash_get(registry_impl->ext_attr_reg,
+    inner_ext_attr_reg = axutil_hash_get(registry_impl->ext_attr_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
     attr_name = axis2_qname_to_string(attr_qn, env);
     if (inner_ext_attr_reg)
     {
-        attr = axis2_hash_get(inner_ext_attr_reg, attr_name,
+        attr = axutil_hash_get(inner_ext_attr_reg, attr_name,
                 AXIS2_HASH_KEY_STRING);
     }
     return attr;
@@ -614,22 +614,22 @@
     void *comp_ext)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_comp_ext_reg = NULL;
+    axutil_hash_t *inner_comp_ext_reg = NULL;
     axis2_char_t *namespc = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_comp_ext_reg = axis2_hash_get(registry_impl->comp_ext_reg,
+    inner_comp_ext_reg = axutil_hash_get(registry_impl->comp_ext_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
     if (! inner_comp_ext_reg)
     {
-        inner_comp_ext_reg = axis2_hash_make(env);
-        axis2_hash_set(registry_impl->comp_ext_reg, parent_class,
+        inner_comp_ext_reg = axutil_hash_make(env);
+        axutil_hash_set(registry_impl->comp_ext_reg, parent_class,
                 AXIS2_HASH_KEY_STRING, inner_comp_ext_reg);
     }
     namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
-    axis2_hash_set(inner_comp_ext_reg, namespc, AXIS2_HASH_KEY_STRING, comp_ext);
+    axutil_hash_set(inner_comp_ext_reg, namespc, AXIS2_HASH_KEY_STRING, comp_ext);
     return AXIS2_SUCCESS;
 }
 
@@ -649,19 +649,19 @@
     axis2_uri_t *ext_namespc)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_comp_ext_reg = NULL;
+    axutil_hash_t *inner_comp_ext_reg = NULL;
     void *comp_ext = NULL;
     axis2_char_t *namespc = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_comp_ext_reg = axis2_hash_get(registry_impl->comp_ext_reg,
+    inner_comp_ext_reg = axutil_hash_get(registry_impl->comp_ext_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
     namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
     if (inner_comp_ext_reg)
     {
-        comp_ext = axis2_hash_get(inner_comp_ext_reg, namespc,
+        comp_ext = axutil_hash_get(inner_comp_ext_reg, namespc,
                 AXIS2_HASH_KEY_STRING);
     }
     return comp_ext;
@@ -680,24 +680,24 @@
     axis2_char_t *parent_class)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
-    axis2_hash_t *inner_comp_ext_reg = NULL;
+    axutil_hash_t *inner_comp_ext_reg = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
-    inner_comp_ext_reg = axis2_hash_get(registry_impl->comp_ext_reg,
+    inner_comp_ext_reg = axutil_hash_get(registry_impl->comp_ext_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
     registry_impl->key_set = axutil_array_list_create(env, 0);
     if (inner_comp_ext_reg)
     {
-        axis2_hash_index_t *i = NULL;
+        axutil_hash_index_t *i = NULL;
 
-        for (i = axis2_hash_first(inner_comp_ext_reg, env); i; i =
-                    axis2_hash_next(env, i))
+        for (i = axutil_hash_first(inner_comp_ext_reg, env); i; i =
+                    axutil_hash_next(env, i))
         {
             const void *key = NULL;
 
-            axis2_hash_this(i, &key, NULL, NULL);
+            axutil_hash_this(i, &key, NULL, NULL);
             axutil_array_list_add(registry_impl->key_set, env, key);
         }
     }



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