axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r524225 [11/22] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/src/util/ include/ modules/core/addr/ modules/core/clientapi/ modules/core/context/ modules...
Date Fri, 30 Mar 2007 18:28:34 GMT
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c Fri Mar 30 11:28:18 2007
@@ -33,8 +33,8 @@
     woden_types_t types;
     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;
     axis2_char_t *f_type_system;
     axutil_array_list_t *f_schemas;
     axutil_array_list_t *schema_defs;
@@ -47,7 +47,7 @@
     void *types,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_types_super_objs(
     void *types,
     const axutil_env_t *env);
@@ -396,62 +396,62 @@
     types_impl->types.ops->is_namespace_in_scope_with_namespace =
         woden_types_is_namespace_in_scope_with_namespace;
 
-    types_impl->methods = axis2_hash_make(env);
+    types_impl->methods = axutil_hash_make(env);
     if (!types_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(types_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(types_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_types_free);
-    axis2_hash_set(types_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(types_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             woden_types_super_objs);
-    axis2_hash_set(types_impl->methods, "type",
+    axutil_hash_set(types_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_types_type);
 
-    axis2_hash_set(types_impl->methods, "set_type_system",
+    axutil_hash_set(types_impl->methods, "set_type_system",
             AXIS2_HASH_KEY_STRING,
             woden_types_set_type_system);
-    axis2_hash_set(types_impl->methods, "get_type_system",
+    axutil_hash_set(types_impl->methods, "get_type_system",
             AXIS2_HASH_KEY_STRING,
             woden_types_get_type_system);
-    axis2_hash_set(types_impl->methods, "add_schema",
+    axutil_hash_set(types_impl->methods, "add_schema",
             AXIS2_HASH_KEY_STRING,
             woden_types_add_schema);
-    axis2_hash_set(types_impl->methods, "remove_schema",
+    axutil_hash_set(types_impl->methods, "remove_schema",
             AXIS2_HASH_KEY_STRING,
             woden_types_remove_schema);
-    axis2_hash_set(types_impl->methods, "get_schemas",
+    axutil_hash_set(types_impl->methods, "get_schemas",
             AXIS2_HASH_KEY_STRING,
             woden_types_get_schemas);
-    axis2_hash_set(types_impl->methods, "get_schemas_with_namespace",
+    axutil_hash_set(types_impl->methods, "get_schemas_with_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_types_get_schemas_with_namespace);
-    axis2_hash_set(types_impl->methods, "get_inlined_schemas",
+    axutil_hash_set(types_impl->methods, "get_inlined_schemas",
             AXIS2_HASH_KEY_STRING,
             woden_types_get_inlined_schemas);
-    axis2_hash_set(types_impl->methods, "get_imported_schemas",
+    axutil_hash_set(types_impl->methods, "get_imported_schemas",
             AXIS2_HASH_KEY_STRING,
             woden_types_get_imported_schemas);
-    axis2_hash_set(types_impl->methods, "get_element_declaration",
+    axutil_hash_set(types_impl->methods, "get_element_declaration",
             AXIS2_HASH_KEY_STRING,
             woden_types_get_element_declaration);
-    axis2_hash_set(types_impl->methods, "get_type_definition",
+    axutil_hash_set(types_impl->methods, "get_type_definition",
             AXIS2_HASH_KEY_STRING,
             woden_types_get_type_definition);
-    axis2_hash_set(types_impl->methods, "get_referenceable_schema_defs",
+    axutil_hash_set(types_impl->methods, "get_referenceable_schema_defs",
             AXIS2_HASH_KEY_STRING,
             woden_types_get_referenceable_schema_defs);
-    axis2_hash_set(types_impl->methods, "get_referenceable_schema_defs_with_namespace",
+    axutil_hash_set(types_impl->methods, "get_referenceable_schema_defs_with_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_types_get_referenceable_schema_defs_with_namespace);
-    axis2_hash_set(types_impl->methods, "is_namespace_in_scope_with_namespace_uri",
+    axutil_hash_set(types_impl->methods, "is_namespace_in_scope_with_namespace_uri",
             AXIS2_HASH_KEY_STRING,
             woden_types_is_namespace_in_scope_with_namespace_uri);
-    axis2_hash_set(types_impl->methods, "is_namespace_in_scope_with_qname",
+    axutil_hash_set(types_impl->methods, "is_namespace_in_scope_with_qname",
             AXIS2_HASH_KEY_STRING,
             woden_types_is_namespace_in_scope_with_qname);
-    axis2_hash_set(types_impl->methods, "is_namespace_in_scope_with_namespace",
+    axutil_hash_set(types_impl->methods, "is_namespace_in_scope_with_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_types_is_namespace_in_scope_with_namespace);
 
@@ -469,15 +469,15 @@
 
     types_impl->documentable = woden_documentable_create(env);
 
-    types_impl->super = axis2_hash_make(env);
+    types_impl->super = axutil_hash_make(env);
     if (!types_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(types_impl->super, "WODEN_TYPES", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(types_impl->super, "WODEN_TYPES", AXIS2_HASH_KEY_STRING,
             &(types_impl->types));
-    axis2_hash_set(types_impl->super, "WODEN_DOCUMENTABLE", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(types_impl->super, "WODEN_DOCUMENTABLE", AXIS2_HASH_KEY_STRING,
             types_impl->documentable);
 
     return &(types_impl->types);
@@ -583,13 +583,13 @@
 
     if (types_impl->super)
     {
-        axis2_hash_free(types_impl->super, env);
+        axutil_hash_free(types_impl->super, env);
         types_impl->super = NULL;
     }
 
     if (types_impl->methods)
     {
-        axis2_hash_free(types_impl->methods, env);
+        axutil_hash_free(types_impl->methods, env);
         types_impl->methods = NULL;
     }
 
@@ -615,7 +615,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_types_super_objs(
     void *types,
     const axutil_env_t *env)
@@ -659,7 +659,7 @@
     woden_types_t *types,
     const axutil_env_t *env,
     woden_types_t *types_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_types_impl_t *types_impl_l = NULL;
 
@@ -667,45 +667,45 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     types_impl_l = INTF_TO_IMPL(types_impl);
 
-    types->ops->free = axis2_hash_get(methods, "free",
+    types->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    types->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    types->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    types->ops->type = axis2_hash_get(methods, "type",
+    types->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    types->ops->get_element_declaration = axis2_hash_get(methods,
+    types->ops->get_element_declaration = axutil_hash_get(methods,
             "get_element_declaration", AXIS2_HASH_KEY_STRING);
     if (!types->ops->get_element_declaration && types_impl_l)
         types->ops->get_element_declaration =
             types_impl_l->types.ops->get_element_declaration;
 
-    types->ops->get_type_definition = axis2_hash_get(methods,
+    types->ops->get_type_definition = axutil_hash_get(methods,
             "get_type_definition", AXIS2_HASH_KEY_STRING);
     if (!types->ops->get_type_definition && types_impl_l)
         types->ops->get_type_definition =
             types_impl_l->types.ops->get_type_definition;
 
-    types->ops->get_referenceable_schema_defs = axis2_hash_get(methods,
+    types->ops->get_referenceable_schema_defs = axutil_hash_get(methods,
             "get_referenceable_schema_defs", AXIS2_HASH_KEY_STRING);
     if (!types->ops->get_referenceable_schema_defs && types_impl_l)
         types->ops->get_referenceable_schema_defs =
             types_impl_l->types.ops->get_referenceable_schema_defs;
 
     types->ops->is_namespace_in_scope_with_namespace_uri =
-        axis2_hash_get(methods, "is_namespace_in_scope_with_namespace_uri",
+        axutil_hash_get(methods, "is_namespace_in_scope_with_namespace_uri",
                 AXIS2_HASH_KEY_STRING);
     if (!types->ops->is_namespace_in_scope_with_namespace_uri && types_impl_l)
         types->ops->is_namespace_in_scope_with_namespace_uri =
             types_impl_l->types.ops->is_namespace_in_scope_with_namespace_uri;
 
-    types->ops->is_namespace_in_scope_with_qname = axis2_hash_get(methods,
+    types->ops->is_namespace_in_scope_with_qname = axutil_hash_get(methods,
             "is_namespace_in_scope_with_qname", AXIS2_HASH_KEY_STRING);
     if (!types->ops->is_namespace_in_scope_with_qname && types_impl_l)
         types->ops->is_namespace_in_scope_with_qname =
             types_impl_l->types.ops->is_namespace_in_scope_with_qname;
 
-    types->ops->is_namespace_in_scope_with_namespace = axis2_hash_get(methods,
+    types->ops->is_namespace_in_scope_with_namespace = axutil_hash_get(methods,
             "is_namespace_in_scope_with_namespace", AXIS2_HASH_KEY_STRING);
     if (!types->ops->is_namespace_in_scope_with_namespace && types_impl_l)
         types->ops->is_namespace_in_scope_with_namespace =
@@ -721,12 +721,12 @@
     axis2_char_t *type_system)
 {
     woden_types_impl_t *types_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, type_system, AXIS2_FAILURE);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     if (types_impl->f_type_system)
@@ -748,11 +748,11 @@
     const axutil_env_t *env)
 {
     woden_types_impl_t *types_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
     return types_impl->f_type_system;
 }
@@ -764,12 +764,12 @@
     void *schema)
 {
     woden_types_impl_t *types_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, schema, AXIS2_FAILURE);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     return axutil_array_list_add(types_impl->f_schemas, env, schema);
@@ -784,12 +784,12 @@
     woden_types_impl_t *types_impl = NULL;
     int index = 0;
     axis2_status_t code = AXIS2_FAILURE;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, schema, AXIS2_FAILURE);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     index = axutil_array_list_index_of(types_impl->f_schemas, env, schema);
@@ -804,11 +804,11 @@
     const axutil_env_t *env)
 {
     woden_types_impl_t *types_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
     return types_impl->f_schemas;
 }
@@ -822,11 +822,11 @@
     woden_types_impl_t *types_impl = NULL;
     int i = 0, size = 0;
     axis2_char_t *str_namespc = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     if (namespc)
@@ -857,11 +857,11 @@
 {
     woden_types_impl_t *types_impl = NULL;
     int i = 0, size = 0;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     size = axutil_array_list_size(types_impl->f_schemas, env);
@@ -884,11 +884,11 @@
 {
     woden_types_impl_t *types_impl = NULL;
     int i = 0, size = 0;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     size = axutil_array_list_size(types_impl->f_schemas, env);
@@ -913,11 +913,11 @@
     woden_types_impl_t *types_impl = NULL;
     xml_schema_element_t *xml_schema_el = NULL;
     axutil_array_list_t *schemas = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
     axis2_char_t *uri = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
     /* Can't resolve the element if the QName is NULL.*/
     if (! qname)
@@ -956,11 +956,11 @@
     woden_types_impl_t *types_impl = NULL;
     xml_schema_type_t *xml_schema_type = NULL;
     axutil_array_list_t *schema_refs = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     if (qname)
@@ -998,11 +998,11 @@
 {
     woden_types_impl_t *types_impl = NULL;
     int i = 0, size = 0;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     if (types_impl->schema_defs)
@@ -1046,12 +1046,12 @@
 {
     woden_types_impl_t *types_impl = NULL;
     int i = 0, size = 0;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, namespc, NULL);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     size = axutil_array_list_size(types_impl->f_schemas, env);
@@ -1081,13 +1081,13 @@
 {
     woden_types_impl_t *types_impl = NULL;
     axis2_char_t *str_uri = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_PARAM_CHECK(env->error, namespc_uri, AXIS2_FAILURE);
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     str_uri = axis2_uri_to_string(namespc_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
@@ -1103,12 +1103,12 @@
     woden_types_impl_t *types_impl = NULL;
     axis2_char_t *str_uri = NULL;
     axis2_uri_t *uri = 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_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     str_uri = axis2_qname_get_uri(qname, env);
@@ -1125,12 +1125,12 @@
     woden_types_impl_t *types_impl = NULL;
     axis2_bool_t result = AXIS2_FALSE;
     int i = 0, size = 0;
-    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_TYPES_SUPER_OBJS(types, env);
-    types_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
     size = axutil_array_list_size(types_impl->f_schemas, env);

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_types_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_types_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_types_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_types_element.c Fri Mar 30 11:28:18 2007
@@ -21,30 +21,30 @@
 woden_types_element_resolve_methods(
     woden_types_element_t *types_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);
 
-    types_element->ops->free = axis2_hash_get(methods, "free",
+    types_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    types_element->ops->type = axis2_hash_get(methods, "type",
+    types_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
-    types_element->ops->set_type_system = axis2_hash_get(methods,
+    types_element->ops->set_type_system = axutil_hash_get(methods,
             "set_type_system", AXIS2_HASH_KEY_STRING);
-    types_element->ops->get_type_system = axis2_hash_get(methods,
+    types_element->ops->get_type_system = axutil_hash_get(methods,
             "get_type_system", AXIS2_HASH_KEY_STRING);
-    types_element->ops->add_schema = axis2_hash_get(methods,
+    types_element->ops->add_schema = axutil_hash_get(methods,
             "add_schema", AXIS2_HASH_KEY_STRING);
-    types_element->ops->remove_schema = axis2_hash_get(methods,
+    types_element->ops->remove_schema = axutil_hash_get(methods,
             "remove_schema", AXIS2_HASH_KEY_STRING);
-    types_element->ops->get_schemas = axis2_hash_get(methods,
+    types_element->ops->get_schemas = axutil_hash_get(methods,
             "get_schemas", AXIS2_HASH_KEY_STRING);
-    types_element->ops->get_schemas_with_namespace = axis2_hash_get(methods,
+    types_element->ops->get_schemas_with_namespace = axutil_hash_get(methods,
             "get_schemas_with_namespace", AXIS2_HASH_KEY_STRING);
-    types_element->ops->get_inlined_schemas = axis2_hash_get(methods,
+    types_element->ops->get_inlined_schemas = axutil_hash_get(methods,
             "get_inlined_schemas", AXIS2_HASH_KEY_STRING);
-    types_element->ops->get_imported_schemas = axis2_hash_get(methods,
+    types_element->ops->get_imported_schemas = axutil_hash_get(methods,
             "get_imported_schemas", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

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

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_element.c Fri Mar 30 11:28:18 2007
@@ -21,7 +21,7 @@
 #include <woden_ext_element.h>
 #include <woden_xml_attr.h>
 #include <axis2_uri.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
 
 typedef struct woden_wsdl_element_impl woden_wsdl_element_impl_t;
 
@@ -33,8 +33,8 @@
 {
     woden_wsdl_element_t wsdl_element;
     woden_obj_types_t obj_type;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
     woden_attr_extensible_t *f_attr_ext;
     woden_element_extensible_t *f_elem_ext;
 };
@@ -47,7 +47,7 @@
     void *wsdl_element,
     const axutil_env_t *envv);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl_element_super_objs(
     void *wsdl_element,
     const axutil_env_t *envv);
@@ -253,55 +253,55 @@
     wsdl_element_impl->wsdl_element.ops->get_attr_extensible =
         woden_wsdl_element_get_attr_extensible;
 
-    wsdl_element_impl->super = axis2_hash_make(env);
+    wsdl_element_impl->super = axutil_hash_make(env);
     if (!wsdl_element_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(wsdl_element_impl->super, "WODEN_WSDL_ELEMENT",
+    axutil_hash_set(wsdl_element_impl->super, "WODEN_WSDL_ELEMENT",
             AXIS2_HASH_KEY_STRING, &(wsdl_element_impl->wsdl_element));
 
-    wsdl_element_impl->methods = axis2_hash_make(env);
+    wsdl_element_impl->methods = axutil_hash_make(env);
     if (!wsdl_element_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(wsdl_element_impl->methods, "free",
+    axutil_hash_set(wsdl_element_impl->methods, "free",
             AXIS2_HASH_KEY_STRING, woden_wsdl_element_free);
-    axis2_hash_set(wsdl_element_impl->methods, "super_objs",
+    axutil_hash_set(wsdl_element_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_wsdl_element_super_objs);
-    axis2_hash_set(wsdl_element_impl->methods, "type",
+    axutil_hash_set(wsdl_element_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl_element_type);
-    axis2_hash_set(wsdl_element_impl->methods, "set_ext_attr",
+    axutil_hash_set(wsdl_element_impl->methods, "set_ext_attr",
             AXIS2_HASH_KEY_STRING, woden_wsdl_element_set_ext_attr);
-    axis2_hash_set(wsdl_element_impl->methods, "get_ext_attr",
+    axutil_hash_set(wsdl_element_impl->methods, "get_ext_attr",
             AXIS2_HASH_KEY_STRING, woden_wsdl_element_get_ext_attr);
-    axis2_hash_set(wsdl_element_impl->methods, "get_ext_attrs",
+    axutil_hash_set(wsdl_element_impl->methods, "get_ext_attrs",
             AXIS2_HASH_KEY_STRING, woden_wsdl_element_get_ext_attrs);
-    axis2_hash_set(wsdl_element_impl->methods, "get_ext_attrs_for_namespace",
+    axutil_hash_set(wsdl_element_impl->methods, "get_ext_attrs_for_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl_element_get_ext_attrs_for_namespace);
-    axis2_hash_set(wsdl_element_impl->methods, "has_ext_attrs_for_namespace",
+    axutil_hash_set(wsdl_element_impl->methods, "has_ext_attrs_for_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl_element_has_ext_attrs_for_namespace);
-    axis2_hash_set(wsdl_element_impl->methods, "add_ext_element",
+    axutil_hash_set(wsdl_element_impl->methods, "add_ext_element",
             AXIS2_HASH_KEY_STRING, woden_wsdl_element_add_ext_element);
-    axis2_hash_set(wsdl_element_impl->methods, "remove_ext_element",
+    axutil_hash_set(wsdl_element_impl->methods, "remove_ext_element",
             AXIS2_HASH_KEY_STRING, woden_wsdl_element_remove_ext_element);
-    axis2_hash_set(wsdl_element_impl->methods, "get_ext_elements",
+    axutil_hash_set(wsdl_element_impl->methods, "get_ext_elements",
             AXIS2_HASH_KEY_STRING, woden_wsdl_element_get_ext_elements);
-    axis2_hash_set(wsdl_element_impl->methods, "get_ext_elements_of_type",
+    axutil_hash_set(wsdl_element_impl->methods, "get_ext_elements_of_type",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl_element_get_ext_elements_of_type);
-    axis2_hash_set(wsdl_element_impl->methods, "has_ext_elements_for_namespace",
+    axutil_hash_set(wsdl_element_impl->methods, "has_ext_elements_for_namespace",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl_element_has_ext_elements_for_namespace);
-    axis2_hash_set(wsdl_element_impl->methods, "get_element_extensible",
+    axutil_hash_set(wsdl_element_impl->methods, "get_element_extensible",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl_element_get_element_extensible);
-    axis2_hash_set(wsdl_element_impl->methods, "get_attr_extensible",
+    axutil_hash_set(wsdl_element_impl->methods, "get_attr_extensible",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl_element_get_attr_extensible);
 
@@ -328,17 +328,17 @@
         return NULL;
     }
 
-    wsdl_element_impl->super = axis2_hash_make(env);
+    wsdl_element_impl->super = axutil_hash_make(env);
     if (!wsdl_element_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(wsdl_element_impl->super, "WODEN_ELEMENT_EXTENSIBLE",
+    axutil_hash_set(wsdl_element_impl->super, "WODEN_ELEMENT_EXTENSIBLE",
             AXIS2_HASH_KEY_STRING, &(wsdl_element_impl->wsdl_element));
-    axis2_hash_set(wsdl_element_impl->super, "WODEN_ATTR_EXTENSIBLE",
+    axutil_hash_set(wsdl_element_impl->super, "WODEN_ATTR_EXTENSIBLE",
             AXIS2_HASH_KEY_STRING, &(wsdl_element_impl->wsdl_element));
-    axis2_hash_set(wsdl_element_impl->super, "WODEN_WSDL_ELEMENT",
+    axutil_hash_set(wsdl_element_impl->super, "WODEN_WSDL_ELEMENT",
             AXIS2_HASH_KEY_STRING, &(wsdl_element_impl->wsdl_element));
 
     return &(wsdl_element_impl->wsdl_element);
@@ -396,13 +396,13 @@
 
     if (wsdl_element_impl->super)
     {
-        axis2_hash_free(wsdl_element_impl->super, env);
+        axutil_hash_free(wsdl_element_impl->super, env);
         wsdl_element_impl->super = NULL;
     }
 
     if (wsdl_element_impl->methods)
     {
-        axis2_hash_free(wsdl_element_impl->methods, env);
+        axutil_hash_free(wsdl_element_impl->methods, env);
         wsdl_element_impl->methods = NULL;
     }
 
@@ -422,7 +422,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl_element_super_objs(
     void *wsdl_element,
     const axutil_env_t *env)
@@ -453,7 +453,7 @@
     woden_wsdl_element_t *wsdl_element,
     const axutil_env_t *env,
     woden_wsdl_element_t *wsdl_element_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl_element_impl_t *wsdl_element_impl_l = NULL;
 
@@ -463,11 +463,11 @@
 
     wsdl_element->ops = AXIS2_MALLOC(env->allocator,
             sizeof(woden_wsdl_element_ops_t));
-    wsdl_element->ops->free = axis2_hash_get(methods, "free",
+    wsdl_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    wsdl_element->ops->super_objs = axis2_hash_get(methods,
+    wsdl_element->ops->super_objs = axutil_hash_get(methods,
             "super_objs", AXIS2_HASH_KEY_STRING);
-    wsdl_element->ops->type = axis2_hash_get(methods, "type",
+    wsdl_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;
@@ -481,13 +481,13 @@
     woden_xml_attr_t *attr)
 {
     woden_wsdl_element_impl_t *wsdl_element_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_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_SET_EXT_ATTR(wsdl_element_impl->f_attr_ext,
@@ -501,12 +501,12 @@
     axis2_qname_t *attr_type)
 {
     woden_wsdl_element_impl_t *wsdl_element_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_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(wsdl_element_impl->f_attr_ext,
@@ -519,11 +519,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTRS(wsdl_element_impl->f_attr_ext,
@@ -537,12 +537,12 @@
     axis2_uri_t *namespc)
 {
     woden_wsdl_element_impl_t *wsdl_element_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_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTRS_FOR_NAMESPACE(
@@ -556,12 +556,12 @@
     axis2_uri_t *namespc)
 {
     woden_wsdl_element_impl_t *wsdl_element_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_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -575,12 +575,12 @@
     woden_ext_element_t *ext_el)
 {
     woden_wsdl_element_impl_t *wsdl_element_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_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_ADD_EXT_ELEMENT(wsdl_element_impl->
@@ -594,12 +594,12 @@
     woden_ext_element_t *ext_el)
 {
     woden_wsdl_element_impl_t *wsdl_element_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_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_REMOVE_EXT_ELEMENT(wsdl_element_impl->
@@ -612,11 +612,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(wsdl_element_impl->
@@ -630,13 +630,13 @@
     axis2_qname_t *ext_type)
 {
     woden_wsdl_element_impl_t *wsdl_element_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_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
@@ -650,12 +650,12 @@
     axis2_uri_t *namespc)
 {
     woden_wsdl_element_impl_t *wsdl_element_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_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ELEMENTS_FOR_NAMESPACE(
@@ -668,11 +668,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return wsdl_element_impl->f_elem_ext;
@@ -684,11 +684,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL_ELEMENT_SUPER_OBJS(wsdl_element, env);
-    wsdl_element_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_element_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING));
 
     return wsdl_element_impl->f_attr_ext;

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_obj.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_obj.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_obj.c Fri Mar 30 11:28:18 2007
@@ -28,9 +28,9 @@
 {
     woden_wsdl_obj_t wsdl_obj;
     woden_wsdl_element_t *wsdl_element;
-    axis2_hash_t *super;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
-    axis2_hash_t *f_comp_exts;
+    axutil_hash_t *f_comp_exts;
 };
 
 #define INTF_TO_IMPL(wsdl_obj) ((woden_wsdl_obj_impl_t *) wsdl_obj)
@@ -40,7 +40,7 @@
     void *wsdl_obj,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl_obj_super_objs(
     void *wsdl_obj,
     const axutil_env_t *env);
@@ -78,7 +78,7 @@
 
     wsdl_obj_impl->wsdl_obj.ops = AXIS2_MALLOC(env->allocator,
             sizeof(woden_wsdl_obj_ops_t));
-    wsdl_obj_impl->f_comp_exts = axis2_hash_make(env);
+    wsdl_obj_impl->f_comp_exts = axutil_hash_make(env);
     if (!wsdl_obj_impl->f_comp_exts)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -106,15 +106,15 @@
 
     wsdl_obj_impl->wsdl_element = woden_wsdl_element_create(env);
 
-    wsdl_obj_impl->super = axis2_hash_make(env);
+    wsdl_obj_impl->super = axutil_hash_make(env);
     if (!wsdl_obj_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(wsdl_obj_impl->super, "WODEN_WSDL_OBJ", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(wsdl_obj_impl->super, "WODEN_WSDL_OBJ", AXIS2_HASH_KEY_STRING,
             &(wsdl_obj_impl->wsdl_obj));
-    axis2_hash_set(wsdl_obj_impl->super, "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(wsdl_obj_impl->super, "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING,
             wsdl_obj_impl->wsdl_element);
     return &(wsdl_obj_impl->wsdl_obj);
 }
@@ -137,7 +137,7 @@
 
     if (wsdl_obj_impl->super)
     {
-        axis2_hash_free(wsdl_obj_impl->super, env);
+        axutil_hash_free(wsdl_obj_impl->super, env);
         wsdl_obj_impl->super = NULL;
     }
 
@@ -155,7 +155,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl_obj_super_objs(
     void *wsdl_obj,
     const axutil_env_t *env)
@@ -186,7 +186,7 @@
     woden_wsdl_obj_t *wsdl_obj,
     const axutil_env_t *env,
     woden_wsdl_obj_t *wsdl_obj_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl_obj_impl_t *wsdl_obj_impl_l = NULL;
 
@@ -194,20 +194,20 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     wsdl_obj_impl_l = INTF_TO_IMPL(wsdl_obj_impl);
 
-    wsdl_obj->ops->free = axis2_hash_get(methods, "free",
+    wsdl_obj->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    wsdl_obj->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    wsdl_obj->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    wsdl_obj->ops->type = axis2_hash_get(methods, "type",
+    wsdl_obj->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    wsdl_obj->ops->get_component_exts_for_namespace = axis2_hash_get(methods,
+    wsdl_obj->ops->get_component_exts_for_namespace = axutil_hash_get(methods,
             "get_component_exts_for_namespace", AXIS2_HASH_KEY_STRING);
     if (!wsdl_obj->ops->get_component_exts_for_namespace && wsdl_obj_impl_l)
         wsdl_obj->ops->get_component_exts_for_namespace =
             wsdl_obj_impl_l->wsdl_obj.ops->get_component_exts_for_namespace;
 
-    wsdl_obj->ops->set_component_exts = axis2_hash_get(methods,
+    wsdl_obj->ops->set_component_exts = axutil_hash_get(methods,
             "set_component_exts", AXIS2_HASH_KEY_STRING);
     if (!wsdl_obj->ops->set_component_exts && wsdl_obj_impl_l)
         wsdl_obj->ops->set_component_exts =
@@ -224,15 +224,15 @@
 {
     woden_wsdl_obj_impl_t *wsdl_obj_impl = NULL;
     axis2_char_t *str_namespc = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL_OBJ_SUPER_OBJS(wsdl_obj, env);
-    wsdl_obj_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_obj_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_OBJ", AXIS2_HASH_KEY_STRING));
 
     str_namespc = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
-    return (woden_component_exts_t *)axis2_hash_get(wsdl_obj_impl->
+    return (woden_component_exts_t *)axutil_hash_get(wsdl_obj_impl->
             f_comp_exts, str_namespc, AXIS2_HASH_KEY_STRING);
 }
 
@@ -245,12 +245,12 @@
 {
     woden_wsdl_obj_impl_t *wsdl_obj_impl = NULL;
     axis2_char_t *str_namespc = 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_WSDL_OBJ_SUPER_OBJS(wsdl_obj, env);
-    wsdl_obj_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_obj_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_OBJ", AXIS2_HASH_KEY_STRING));
 
     str_namespc = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
@@ -258,12 +258,12 @@
     {
         if (exts)
         {
-            axis2_hash_set(wsdl_obj_impl->f_comp_exts, str_namespc,
+            axutil_hash_set(wsdl_obj_impl->f_comp_exts, str_namespc,
                     AXIS2_HASH_KEY_STRING, exts);
         }
         else
         {
-            axis2_hash_set(wsdl_obj_impl->f_comp_exts, str_namespc,
+            axutil_hash_set(wsdl_obj_impl->f_comp_exts, str_namespc,
                     AXIS2_HASH_KEY_STRING, NULL);
         }
     }

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_ref.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_ref.c Fri Mar 30 11:28:18 2007
@@ -29,7 +29,7 @@
 {
     woden_wsdl_ref_t wsdl_ref;
     woden_wsdl_element_t *wsdl_element;
-    axis2_hash_t *super;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
     axutil_array_list_t *f_documentation_elements;
     axis2_uri_t *f_location;
@@ -43,7 +43,7 @@
     void *wsdl_ref,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl_ref_super_objs(
     void *wsdl_ref,
     const axutil_env_t *env);
@@ -134,15 +134,15 @@
 
     wsdl_ref_impl->wsdl_element = woden_wsdl_element_create(env);
 
-    wsdl_ref_impl->super = axis2_hash_make(env);
+    wsdl_ref_impl->super = axutil_hash_make(env);
     if (!wsdl_ref_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(wsdl_ref_impl->super, "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(wsdl_ref_impl->super, "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING,
             &(wsdl_ref_impl->wsdl_ref));
-    axis2_hash_set(wsdl_ref_impl->super, "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(wsdl_ref_impl->super, "WODEN_WSDL_ELEMENT", AXIS2_HASH_KEY_STRING,
             wsdl_ref_impl->wsdl_element);
     return &(wsdl_ref_impl->wsdl_ref);
 }
@@ -165,7 +165,7 @@
 
     if (wsdl_ref_impl->super)
     {
-        axis2_hash_free(wsdl_ref_impl->super, env);
+        axutil_hash_free(wsdl_ref_impl->super, env);
         wsdl_ref_impl->super = NULL;
     }
 
@@ -183,7 +183,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl_ref_super_objs(
     void *wsdl_ref,
     const axutil_env_t *env)
@@ -196,7 +196,7 @@
     return wsdl_ref_impl->super;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl_ref_super(
     void *wsdl_ref,
     const axutil_env_t *env)
@@ -227,7 +227,7 @@
     woden_wsdl_ref_t *wsdl_ref,
     const axutil_env_t *env,
     woden_wsdl_ref_t *wsdl_ref_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl_ref_impl_t *wsdl_ref_impl_l = NULL;
 
@@ -235,44 +235,44 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     wsdl_ref_impl_l = INTF_TO_IMPL(wsdl_ref_impl);
 
-    wsdl_ref->ops->free = axis2_hash_get(methods, "free",
+    wsdl_ref->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    wsdl_ref->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    wsdl_ref->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    wsdl_ref->ops->type = axis2_hash_get(methods, "type",
+    wsdl_ref->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    wsdl_ref->ops->get_location = axis2_hash_get(methods,
+    wsdl_ref->ops->get_location = axutil_hash_get(methods,
             "get_location", AXIS2_HASH_KEY_STRING);
     if (!wsdl_ref->ops->get_location && wsdl_ref_impl_l)
         wsdl_ref->ops->get_location =
             wsdl_ref_impl_l->wsdl_ref.ops->get_location;
 
-    wsdl_ref->ops->set_location = axis2_hash_get(methods,
+    wsdl_ref->ops->set_location = axutil_hash_get(methods,
             "set_location", AXIS2_HASH_KEY_STRING);
     if (!wsdl_ref->ops->set_location && wsdl_ref_impl_l)
         wsdl_ref->ops->set_location =
             wsdl_ref_impl_l->wsdl_ref.ops->set_location;
 
-    wsdl_ref->ops->get_desc_element = axis2_hash_get(methods,
+    wsdl_ref->ops->get_desc_element = axutil_hash_get(methods,
             "get_desc_element", AXIS2_HASH_KEY_STRING);
     if (!wsdl_ref->ops->get_desc_element && wsdl_ref_impl_l)
         wsdl_ref->ops->get_desc_element =
             wsdl_ref_impl_l->wsdl_ref.ops->get_desc_element;
 
-    wsdl_ref->ops->set_desc_element = axis2_hash_get(methods,
+    wsdl_ref->ops->set_desc_element = axutil_hash_get(methods,
             "set_desc_element", AXIS2_HASH_KEY_STRING);
     if (!wsdl_ref->ops->set_desc_element && wsdl_ref_impl_l)
         wsdl_ref->ops->set_desc_element =
             wsdl_ref_impl_l->wsdl_ref.ops->set_desc_element;
 
-    wsdl_ref->ops->add_documentation_element = axis2_hash_get(methods,
+    wsdl_ref->ops->add_documentation_element = axutil_hash_get(methods,
             "add_documentation_element", AXIS2_HASH_KEY_STRING);
     if (!wsdl_ref->ops->add_documentation_element && wsdl_ref_impl_l)
         wsdl_ref->ops->add_documentation_element =
             wsdl_ref_impl_l->wsdl_ref.ops->add_documentation_element;
 
-    wsdl_ref->ops->get_documentation_elements = axis2_hash_get(methods,
+    wsdl_ref->ops->get_documentation_elements = axutil_hash_get(methods,
             "get_documentation_elements", AXIS2_HASH_KEY_STRING);
     if (!wsdl_ref->ops->get_documentation_elements && wsdl_ref_impl_l)
         wsdl_ref->ops->get_documentation_elements =
@@ -289,11 +289,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
-    wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     return wsdl_ref_impl->f_location;
@@ -306,11 +306,11 @@
     axis2_uri_t *loc_uri)
 {
     woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
-    wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     if (wsdl_ref_impl->f_location)
@@ -327,11 +327,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
-    wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     return wsdl_ref_impl->f_desc_element;
@@ -344,11 +344,11 @@
     void *desc)
 {
     woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
-    wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     if (wsdl_ref_impl->f_desc_element)
@@ -366,11 +366,11 @@
     void *doc_el)
 {
     woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
-    wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     if (!wsdl_ref_impl->f_documentation_elements)
@@ -392,11 +392,11 @@
     const axutil_env_t *env)
 {
     woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL_REF_SUPER_OBJS(wsdl_ref, env);
-    wsdl_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    wsdl_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_WSDL_REF", AXIS2_HASH_KEY_STRING));
 
     return wsdl_ref_impl->f_documentation_elements;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c Fri Mar 30 11:28:18 2007
@@ -34,8 +34,8 @@
 {
     woden_wsdl10_soap_address_exts_t address_exts;
     woden_component_exts_t *component_exts;
-    axis2_hash_t *methods;
-    axis2_hash_t *super;
+    axutil_hash_t *methods;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
     axis2_qname_t *qname;
@@ -49,7 +49,7 @@
     void *address_exts,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_address_exts_super_objs(
     void *address_exts,
     const axutil_env_t *env);
@@ -154,26 +154,26 @@
     address_exts_impl->address_exts.ops->get_soap_address =
         woden_wsdl10_soap_address_exts_get_soap_address;
 
-    address_exts_impl->methods = axis2_hash_make(env);
+    address_exts_impl->methods = axutil_hash_make(env);
     if (!address_exts_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(address_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(address_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_address_exts_free);
-    axis2_hash_set(address_exts_impl->methods, "super_objs",
+    axutil_hash_set(address_exts_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_address_exts_super_objs);
-    axis2_hash_set(address_exts_impl->methods, "type",
+    axutil_hash_set(address_exts_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_address_exts_type);
 
-    axis2_hash_set(address_exts_impl->methods, "get_soap_modules",
+    axutil_hash_set(address_exts_impl->methods, "get_soap_modules",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_address_exts_get_soap_modules);
-    axis2_hash_set(address_exts_impl->methods, "set_soap_address",
+    axutil_hash_set(address_exts_impl->methods, "set_soap_address",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_address_exts_set_soap_address);
-    axis2_hash_set(address_exts_impl->methods, "get_soap_address",
+    axutil_hash_set(address_exts_impl->methods, "get_soap_address",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_address_exts_get_soap_address);
 
@@ -190,15 +190,15 @@
 
     address_exts_impl->component_exts = woden_component_exts_create(env);
 
-    address_exts_impl->super = axis2_hash_make(env);
+    address_exts_impl->super = axutil_hash_make(env);
     if (!address_exts_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(address_exts_impl->super, "WODEN_WSDL10_SOAP_ADDRESS_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(address_exts_impl->super, "WODEN_WSDL10_SOAP_ADDRESS_EXTS", AXIS2_HASH_KEY_STRING,
             &(address_exts_impl->address_exts));
-    axis2_hash_set(address_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(address_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
             address_exts_impl->component_exts);
 
     return &(address_exts_impl->address_exts);
@@ -236,13 +236,13 @@
 
     if (address_exts_impl->super)
     {
-        axis2_hash_free(address_exts_impl->super, env);
+        axutil_hash_free(address_exts_impl->super, env);
         address_exts_impl->super = NULL;
     }
 
     if (address_exts_impl->methods)
     {
-        axis2_hash_free(address_exts_impl->methods, env);
+        axutil_hash_free(address_exts_impl->methods, env);
         address_exts_impl->methods = NULL;
     }
 
@@ -279,7 +279,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_address_exts_super_objs(
     void *address_exts,
     const axutil_env_t *env)
@@ -323,7 +323,7 @@
     woden_wsdl10_soap_address_exts_t *address_exts,
     const axutil_env_t *env,
     woden_wsdl10_soap_address_exts_t *address_exts_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl10_soap_address_exts_impl_t *address_exts_impl_l = NULL;
 
@@ -331,14 +331,14 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     address_exts_impl_l = INTF_TO_IMPL(address_exts_impl);
 
-    address_exts->ops->free = axis2_hash_get(methods, "free",
+    address_exts->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    address_exts->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    address_exts->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    address_exts->ops->type = axis2_hash_get(methods, "type",
+    address_exts->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    address_exts->ops->get_soap_modules = axis2_hash_get(methods,
+    address_exts->ops->get_soap_modules = axutil_hash_get(methods,
             "get_soap_modules", AXIS2_HASH_KEY_STRING);
     if (!address_exts->ops->get_soap_modules && address_exts_impl_l)
         address_exts->ops->get_soap_modules =

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c Fri Mar 30 11:28:18 2007
@@ -32,8 +32,8 @@
 {
     woden_wsdl10_soap_binding_exts_t binding_exts;
     woden_component_exts_t *component_exts;
-    axis2_hash_t *methods;
-    axis2_hash_t *super;
+    axutil_hash_t *methods;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
     axis2_qname_t *qname;
@@ -46,7 +46,7 @@
     void *binding_exts,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_binding_exts_super_objs(
     void *binding_exts,
     const axutil_env_t *env);
@@ -154,29 +154,29 @@
     binding_exts_impl->binding_exts.ops->get_soap_modules =
         woden_wsdl10_soap_binding_exts_get_soap_modules;
 
-    binding_exts_impl->methods = axis2_hash_make(env);
+    binding_exts_impl->methods = axutil_hash_make(env);
     if (!binding_exts_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_exts_free);
-    axis2_hash_set(binding_exts_impl->methods, "super_objs",
+    axutil_hash_set(binding_exts_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_binding_exts_super_objs);
-    axis2_hash_set(binding_exts_impl->methods, "type",
+    axutil_hash_set(binding_exts_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_binding_exts_type);
 
-    axis2_hash_set(binding_exts_impl->methods, "get_soap_version",
+    axutil_hash_set(binding_exts_impl->methods, "get_soap_version",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_exts_get_soap_version);
-    axis2_hash_set(binding_exts_impl->methods, "get_soap_underlying_protocol",
+    axutil_hash_set(binding_exts_impl->methods, "get_soap_underlying_protocol",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_exts_get_soap_underlying_protocol);
-    axis2_hash_set(binding_exts_impl->methods, "get_soap_mep_default",
+    axutil_hash_set(binding_exts_impl->methods, "get_soap_mep_default",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_exts_get_soap_mep_default);
-    axis2_hash_set(binding_exts_impl->methods, "get_soap_modules",
+    axutil_hash_set(binding_exts_impl->methods, "get_soap_modules",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_exts_get_soap_modules);
 
@@ -193,15 +193,15 @@
 
     binding_exts_impl->component_exts = woden_component_exts_create(env);
 
-    binding_exts_impl->super = axis2_hash_make(env);
+    binding_exts_impl->super = axutil_hash_make(env);
     if (!binding_exts_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_exts_impl->super, "WODEN_WSDL10_SOAP_BINDING_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_exts_impl->super, "WODEN_WSDL10_SOAP_BINDING_EXTS", AXIS2_HASH_KEY_STRING,
             &(binding_exts_impl->binding_exts));
-    axis2_hash_set(binding_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
             binding_exts_impl->component_exts);
 
     return &(binding_exts_impl->binding_exts);
@@ -239,13 +239,13 @@
 
     if (binding_exts_impl->super)
     {
-        axis2_hash_free(binding_exts_impl->super, env);
+        axutil_hash_free(binding_exts_impl->super, env);
         binding_exts_impl->super = NULL;
     }
 
     if (binding_exts_impl->methods)
     {
-        axis2_hash_free(binding_exts_impl->methods, env);
+        axutil_hash_free(binding_exts_impl->methods, env);
         binding_exts_impl->methods = NULL;
     }
 
@@ -276,7 +276,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_binding_exts_super_objs(
     void *binding_exts,
     const axutil_env_t *env)
@@ -320,7 +320,7 @@
     woden_wsdl10_soap_binding_exts_t *binding_exts,
     const axutil_env_t *env,
     woden_wsdl10_soap_binding_exts_t *binding_exts_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl10_soap_binding_exts_impl_t *binding_exts_impl_l = NULL;
 
@@ -328,32 +328,32 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     binding_exts_impl_l = INTF_TO_IMPL(binding_exts_impl);
 
-    binding_exts->ops->free = axis2_hash_get(methods, "free",
+    binding_exts->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_exts->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    binding_exts->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    binding_exts->ops->type = axis2_hash_get(methods, "type",
+    binding_exts->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    binding_exts->ops->get_soap_version = axis2_hash_get(methods,
+    binding_exts->ops->get_soap_version = axutil_hash_get(methods,
             "get_soap_version", AXIS2_HASH_KEY_STRING);
     if (!binding_exts->ops->get_soap_version && binding_exts_impl_l)
         binding_exts->ops->get_soap_version =
             binding_exts_impl_l->binding_exts.ops->get_soap_version;
 
-    binding_exts->ops->get_soap_underlying_protocol = axis2_hash_get(methods,
+    binding_exts->ops->get_soap_underlying_protocol = axutil_hash_get(methods,
             "get_soap_underlying_protocol", AXIS2_HASH_KEY_STRING);
     if (!binding_exts->ops->get_soap_underlying_protocol && binding_exts_impl_l)
         binding_exts->ops->get_soap_underlying_protocol =
             binding_exts_impl_l->binding_exts.ops->get_soap_underlying_protocol;
 
-    binding_exts->ops->get_soap_mep_default = axis2_hash_get(methods,
+    binding_exts->ops->get_soap_mep_default = axutil_hash_get(methods,
             "get_soap_mep_default", AXIS2_HASH_KEY_STRING);
     if (!binding_exts->ops->get_soap_mep_default && binding_exts_impl_l)
         binding_exts->ops->get_soap_mep_default =
             binding_exts_impl_l->binding_exts.ops->get_soap_mep_default;
 
-    binding_exts->ops->get_soap_modules = axis2_hash_get(methods,
+    binding_exts->ops->get_soap_modules = axutil_hash_get(methods,
             "get_soap_modules", AXIS2_HASH_KEY_STRING);
     if (!binding_exts->ops->get_soap_modules && binding_exts_impl_l)
         binding_exts->ops->get_soap_modules =

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c Fri Mar 30 11:28:18 2007
@@ -35,8 +35,8 @@
 {
     woden_wsdl10_soap_binding_fault_exts_t binding_fault_exts;
     woden_component_exts_t *component_exts;
-    axis2_hash_t *methods;
-    axis2_hash_t *super;
+    axutil_hash_t *methods;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
     axis2_qname_t *qname;
@@ -49,7 +49,7 @@
     void *binding_fault_exts,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_binding_fault_exts_super_objs(
     void *binding_fault_exts,
     const axutil_env_t *env);
@@ -157,29 +157,29 @@
     binding_fault_exts_impl->binding_fault_exts.ops->get_soap_headers =
         woden_wsdl10_soap_binding_fault_exts_get_soap_headers;
 
-    binding_fault_exts_impl->methods = axis2_hash_make(env);
+    binding_fault_exts_impl->methods = axutil_hash_make(env);
     if (!binding_fault_exts_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_fault_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_fault_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_fault_exts_free);
-    axis2_hash_set(binding_fault_exts_impl->methods, "super_objs",
+    axutil_hash_set(binding_fault_exts_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_binding_fault_exts_super_objs);
-    axis2_hash_set(binding_fault_exts_impl->methods, "type",
+    axutil_hash_set(binding_fault_exts_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_binding_fault_exts_type);
 
-    axis2_hash_set(binding_fault_exts_impl->methods, "get_soap_fault_code",
+    axutil_hash_set(binding_fault_exts_impl->methods, "get_soap_fault_code",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_fault_exts_get_soap_fault_code);
-    axis2_hash_set(binding_fault_exts_impl->methods, "get_soap_fault_subcodes",
+    axutil_hash_set(binding_fault_exts_impl->methods, "get_soap_fault_subcodes",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_fault_exts_get_soap_fault_subcodes);
-    axis2_hash_set(binding_fault_exts_impl->methods, "get_modules",
+    axutil_hash_set(binding_fault_exts_impl->methods, "get_modules",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_fault_exts_get_soap_modules);
-    axis2_hash_set(binding_fault_exts_impl->methods, "get_soap_headers",
+    axutil_hash_set(binding_fault_exts_impl->methods, "get_soap_headers",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_fault_exts_get_soap_headers);
 
@@ -196,15 +196,15 @@
 
     binding_fault_exts_impl->component_exts = woden_component_exts_create(env);
 
-    binding_fault_exts_impl->super = axis2_hash_make(env);
+    binding_fault_exts_impl->super = axutil_hash_make(env);
     if (!binding_fault_exts_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_fault_exts_impl->super, "WODEN_WSDL10_SOAP_BINDING_FAULT_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_fault_exts_impl->super, "WODEN_WSDL10_SOAP_BINDING_FAULT_EXTS", AXIS2_HASH_KEY_STRING,
             &(binding_fault_exts_impl->binding_fault_exts));
-    axis2_hash_set(binding_fault_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_fault_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
             binding_fault_exts_impl->component_exts);
 
     return &(binding_fault_exts_impl->binding_fault_exts);
@@ -242,13 +242,13 @@
 
     if (binding_fault_exts_impl->super)
     {
-        axis2_hash_free(binding_fault_exts_impl->super, env);
+        axutil_hash_free(binding_fault_exts_impl->super, env);
         binding_fault_exts_impl->super = NULL;
     }
 
     if (binding_fault_exts_impl->methods)
     {
-        axis2_hash_free(binding_fault_exts_impl->methods, env);
+        axutil_hash_free(binding_fault_exts_impl->methods, env);
         binding_fault_exts_impl->methods = NULL;
     }
 
@@ -279,7 +279,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_binding_fault_exts_super_objs(
     void *binding_fault_exts,
     const axutil_env_t *env)
@@ -323,7 +323,7 @@
     woden_wsdl10_soap_binding_fault_exts_t *binding_fault_exts,
     const axutil_env_t *env,
     woden_wsdl10_soap_binding_fault_exts_t *binding_fault_exts_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl10_soap_binding_fault_exts_impl_t *binding_fault_exts_impl_l = NULL;
 
@@ -331,32 +331,32 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     binding_fault_exts_impl_l = INTF_TO_IMPL(binding_fault_exts_impl);
 
-    binding_fault_exts->ops->free = axis2_hash_get(methods, "free",
+    binding_fault_exts->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_fault_exts->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    binding_fault_exts->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    binding_fault_exts->ops->type = axis2_hash_get(methods, "type",
+    binding_fault_exts->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    binding_fault_exts->ops->get_soap_fault_code = axis2_hash_get(methods,
+    binding_fault_exts->ops->get_soap_fault_code = axutil_hash_get(methods,
             "get_soap_fault_code", AXIS2_HASH_KEY_STRING);
     if (!binding_fault_exts->ops->get_soap_fault_code && binding_fault_exts_impl_l)
         binding_fault_exts->ops->get_soap_fault_code =
             binding_fault_exts_impl_l->binding_fault_exts.ops->get_soap_fault_code;
 
-    binding_fault_exts->ops->get_soap_fault_subcodes = axis2_hash_get(methods,
+    binding_fault_exts->ops->get_soap_fault_subcodes = axutil_hash_get(methods,
             "get_soap_fault_subcodes", AXIS2_HASH_KEY_STRING);
     if (!binding_fault_exts->ops->get_soap_fault_subcodes && binding_fault_exts_impl_l)
         binding_fault_exts->ops->get_soap_fault_subcodes =
             binding_fault_exts_impl_l->binding_fault_exts.ops->get_soap_fault_subcodes;
 
-    binding_fault_exts->ops->get_soap_modules = axis2_hash_get(methods,
+    binding_fault_exts->ops->get_soap_modules = axutil_hash_get(methods,
             "get_soap_modules", AXIS2_HASH_KEY_STRING);
     if (!binding_fault_exts->ops->get_soap_modules && binding_fault_exts_impl_l)
         binding_fault_exts->ops->get_soap_modules =
             binding_fault_exts_impl_l->binding_fault_exts.ops->get_soap_modules;
 
-    binding_fault_exts->ops->get_soap_headers = axis2_hash_get(methods,
+    binding_fault_exts->ops->get_soap_headers = axutil_hash_get(methods,
             "get_soap_headers", AXIS2_HASH_KEY_STRING);
     if (!binding_fault_exts->ops->get_soap_headers && binding_fault_exts_impl_l)
         binding_fault_exts->ops->get_soap_headers =

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c Fri Mar 30 11:28:18 2007
@@ -33,8 +33,8 @@
 {
     woden_wsdl10_soap_binding_fault_ref_exts_t binding_fault_ref_exts;
     woden_component_exts_t *component_exts;
-    axis2_hash_t *methods;
-    axis2_hash_t *super;
+    axutil_hash_t *methods;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
     axis2_qname_t *qname;
@@ -47,7 +47,7 @@
     void *binding_fault_ref_exts,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_binding_fault_ref_exts_super_objs(
     void *binding_fault_ref_exts,
     const axutil_env_t *env);
@@ -134,20 +134,20 @@
     binding_fault_ref_exts_impl->binding_fault_ref_exts.ops->get_soap_modules =
         woden_wsdl10_soap_binding_fault_ref_exts_get_soap_modules;
 
-    binding_fault_ref_exts_impl->methods = axis2_hash_make(env);
+    binding_fault_ref_exts_impl->methods = axutil_hash_make(env);
     if (!binding_fault_ref_exts_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_fault_ref_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_fault_ref_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_fault_ref_exts_free);
-    axis2_hash_set(binding_fault_ref_exts_impl->methods, "super_objs",
+    axutil_hash_set(binding_fault_ref_exts_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_binding_fault_ref_exts_super_objs);
-    axis2_hash_set(binding_fault_ref_exts_impl->methods, "type",
+    axutil_hash_set(binding_fault_ref_exts_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_binding_fault_ref_exts_type);
 
-    axis2_hash_set(binding_fault_ref_exts_impl->methods, "get_modules",
+    axutil_hash_set(binding_fault_ref_exts_impl->methods, "get_modules",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_fault_ref_exts_get_soap_modules);
 
@@ -164,15 +164,15 @@
 
     binding_fault_ref_exts_impl->component_exts = woden_component_exts_create(env);
 
-    binding_fault_ref_exts_impl->super = axis2_hash_make(env);
+    binding_fault_ref_exts_impl->super = axutil_hash_make(env);
     if (!binding_fault_ref_exts_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_fault_ref_exts_impl->super, "WODEN_WSDL10_SOAP_BINDING_FAULT_REF_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_fault_ref_exts_impl->super, "WODEN_WSDL10_SOAP_BINDING_FAULT_REF_EXTS", AXIS2_HASH_KEY_STRING,
             &(binding_fault_ref_exts_impl->binding_fault_ref_exts));
-    axis2_hash_set(binding_fault_ref_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_fault_ref_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
             binding_fault_ref_exts_impl->component_exts);
 
     return &(binding_fault_ref_exts_impl->binding_fault_ref_exts);
@@ -210,13 +210,13 @@
 
     if (binding_fault_ref_exts_impl->super)
     {
-        axis2_hash_free(binding_fault_ref_exts_impl->super, env);
+        axutil_hash_free(binding_fault_ref_exts_impl->super, env);
         binding_fault_ref_exts_impl->super = NULL;
     }
 
     if (binding_fault_ref_exts_impl->methods)
     {
-        axis2_hash_free(binding_fault_ref_exts_impl->methods, env);
+        axutil_hash_free(binding_fault_ref_exts_impl->methods, env);
         binding_fault_ref_exts_impl->methods = NULL;
     }
 
@@ -247,7 +247,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_binding_fault_ref_exts_super_objs(
     void *binding_fault_ref_exts,
     const axutil_env_t *env)
@@ -291,7 +291,7 @@
     woden_wsdl10_soap_binding_fault_ref_exts_t *binding_fault_ref_exts,
     const axutil_env_t *env,
     woden_wsdl10_soap_binding_fault_ref_exts_t *binding_fault_ref_exts_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl10_soap_binding_fault_ref_exts_impl_t *binding_fault_ref_exts_impl_l = NULL;
 
@@ -299,14 +299,14 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     binding_fault_ref_exts_impl_l = INTF_TO_IMPL(binding_fault_ref_exts_impl);
 
-    binding_fault_ref_exts->ops->free = axis2_hash_get(methods, "free",
+    binding_fault_ref_exts->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_fault_ref_exts->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    binding_fault_ref_exts->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    binding_fault_ref_exts->ops->type = axis2_hash_get(methods, "type",
+    binding_fault_ref_exts->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    binding_fault_ref_exts->ops->get_soap_modules = axis2_hash_get(methods,
+    binding_fault_ref_exts->ops->get_soap_modules = axutil_hash_get(methods,
             "get_soap_modules", AXIS2_HASH_KEY_STRING);
     if (!binding_fault_ref_exts->ops->get_soap_modules && binding_fault_ref_exts_impl_l)
         binding_fault_ref_exts->ops->get_soap_modules =

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c Fri Mar 30 11:28:18 2007
@@ -33,8 +33,8 @@
 {
     woden_wsdl10_soap_binding_msg_ref_exts_t binding_msg_ref_exts;
     woden_component_exts_t *component_exts;
-    axis2_hash_t *methods;
-    axis2_hash_t *super;
+    axutil_hash_t *methods;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
     axis2_qname_t *qname;
@@ -47,7 +47,7 @@
     void *binding_msg_ref_exts,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_binding_msg_ref_exts_super_objs(
     void *binding_msg_ref_exts,
     const axutil_env_t *env);
@@ -141,23 +141,23 @@
     binding_msg_ref_exts_impl->binding_msg_ref_exts.ops->get_soap_headers =
         woden_wsdl10_soap_binding_msg_ref_exts_get_soap_headers;
 
-    binding_msg_ref_exts_impl->methods = axis2_hash_make(env);
+    binding_msg_ref_exts_impl->methods = axutil_hash_make(env);
     if (!binding_msg_ref_exts_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_msg_ref_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_msg_ref_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_msg_ref_exts_free);
-    axis2_hash_set(binding_msg_ref_exts_impl->methods, "super_objs",
+    axutil_hash_set(binding_msg_ref_exts_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_binding_msg_ref_exts_super_objs);
-    axis2_hash_set(binding_msg_ref_exts_impl->methods, "type",
+    axutil_hash_set(binding_msg_ref_exts_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_binding_msg_ref_exts_type);
 
-    axis2_hash_set(binding_msg_ref_exts_impl->methods, "get_modules",
+    axutil_hash_set(binding_msg_ref_exts_impl->methods, "get_modules",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_msg_ref_exts_get_soap_modules);
-    axis2_hash_set(binding_msg_ref_exts_impl->methods, "get_soap_headers",
+    axutil_hash_set(binding_msg_ref_exts_impl->methods, "get_soap_headers",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_msg_ref_exts_get_soap_headers);
 
@@ -174,15 +174,15 @@
 
     binding_msg_ref_exts_impl->component_exts = woden_component_exts_create(env);
 
-    binding_msg_ref_exts_impl->super = axis2_hash_make(env);
+    binding_msg_ref_exts_impl->super = axutil_hash_make(env);
     if (!binding_msg_ref_exts_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_msg_ref_exts_impl->super, "WODEN_WSDL10_SOAP_BINDING_MSG_REF_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_msg_ref_exts_impl->super, "WODEN_WSDL10_SOAP_BINDING_MSG_REF_EXTS", AXIS2_HASH_KEY_STRING,
             &(binding_msg_ref_exts_impl->binding_msg_ref_exts));
-    axis2_hash_set(binding_msg_ref_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_msg_ref_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
             binding_msg_ref_exts_impl->component_exts);
 
     return &(binding_msg_ref_exts_impl->binding_msg_ref_exts);
@@ -220,13 +220,13 @@
 
     if (binding_msg_ref_exts_impl->super)
     {
-        axis2_hash_free(binding_msg_ref_exts_impl->super, env);
+        axutil_hash_free(binding_msg_ref_exts_impl->super, env);
         binding_msg_ref_exts_impl->super = NULL;
     }
 
     if (binding_msg_ref_exts_impl->methods)
     {
-        axis2_hash_free(binding_msg_ref_exts_impl->methods, env);
+        axutil_hash_free(binding_msg_ref_exts_impl->methods, env);
         binding_msg_ref_exts_impl->methods = NULL;
     }
 
@@ -257,7 +257,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_binding_msg_ref_exts_super_objs(
     void *binding_msg_ref_exts,
     const axutil_env_t *env)
@@ -301,7 +301,7 @@
     woden_wsdl10_soap_binding_msg_ref_exts_t *binding_msg_ref_exts,
     const axutil_env_t *env,
     woden_wsdl10_soap_binding_msg_ref_exts_t *binding_msg_ref_exts_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl10_soap_binding_msg_ref_exts_impl_t *binding_msg_ref_exts_impl_l = NULL;
 
@@ -309,20 +309,20 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     binding_msg_ref_exts_impl_l = INTF_TO_IMPL(binding_msg_ref_exts_impl);
 
-    binding_msg_ref_exts->ops->free = axis2_hash_get(methods, "free",
+    binding_msg_ref_exts->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_msg_ref_exts->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    binding_msg_ref_exts->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    binding_msg_ref_exts->ops->type = axis2_hash_get(methods, "type",
+    binding_msg_ref_exts->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    binding_msg_ref_exts->ops->get_soap_modules = axis2_hash_get(methods,
+    binding_msg_ref_exts->ops->get_soap_modules = axutil_hash_get(methods,
             "get_soap_modules", AXIS2_HASH_KEY_STRING);
     if (!binding_msg_ref_exts->ops->get_soap_modules && binding_msg_ref_exts_impl_l)
         binding_msg_ref_exts->ops->get_soap_modules =
             binding_msg_ref_exts_impl_l->binding_msg_ref_exts.ops->get_soap_modules;
 
-    binding_msg_ref_exts->ops->get_soap_headers = axis2_hash_get(methods,
+    binding_msg_ref_exts->ops->get_soap_headers = axutil_hash_get(methods,
             "get_soap_headers", AXIS2_HASH_KEY_STRING);
     if (!binding_msg_ref_exts->ops->get_soap_headers && binding_msg_ref_exts_impl_l)
         binding_msg_ref_exts->ops->get_soap_headers =

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c Fri Mar 30 11:28:18 2007
@@ -34,8 +34,8 @@
 {
     woden_wsdl10_soap_binding_op_exts_t binding_op_exts;
     woden_component_exts_t *component_exts;
-    axis2_hash_t *methods;
-    axis2_hash_t *super;
+    axutil_hash_t *methods;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
     axis2_qname_t *qname;
@@ -49,7 +49,7 @@
     void *binding_op_exts,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_binding_op_exts_super_objs(
     void *binding_op_exts,
     const axutil_env_t *env);
@@ -161,29 +161,29 @@
     binding_op_exts_impl->binding_op_exts.ops->get_soap_action =
         woden_wsdl10_soap_binding_op_exts_get_soap_action;
 
-    binding_op_exts_impl->methods = axis2_hash_make(env);
+    binding_op_exts_impl->methods = axutil_hash_make(env);
     if (!binding_op_exts_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_op_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_op_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_op_exts_free);
-    axis2_hash_set(binding_op_exts_impl->methods, "super_objs",
+    axutil_hash_set(binding_op_exts_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_binding_op_exts_super_objs);
-    axis2_hash_set(binding_op_exts_impl->methods, "type",
+    axutil_hash_set(binding_op_exts_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_wsdl10_soap_binding_op_exts_type);
 
-    axis2_hash_set(binding_op_exts_impl->methods, "get_soap_modules",
+    axutil_hash_set(binding_op_exts_impl->methods, "get_soap_modules",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_op_exts_get_soap_modules);
-    axis2_hash_set(binding_op_exts_impl->methods, "get_soap_mep",
+    axutil_hash_set(binding_op_exts_impl->methods, "get_soap_mep",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_op_exts_get_soap_mep);
-    axis2_hash_set(binding_op_exts_impl->methods, "set_soap_action",
+    axutil_hash_set(binding_op_exts_impl->methods, "set_soap_action",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_op_exts_set_soap_action);
-    axis2_hash_set(binding_op_exts_impl->methods, "get_soap_action",
+    axutil_hash_set(binding_op_exts_impl->methods, "get_soap_action",
             AXIS2_HASH_KEY_STRING,
             woden_wsdl10_soap_binding_op_exts_get_soap_action);
 
@@ -200,15 +200,15 @@
 
     binding_op_exts_impl->component_exts = woden_component_exts_create(env);
 
-    binding_op_exts_impl->super = axis2_hash_make(env);
+    binding_op_exts_impl->super = axutil_hash_make(env);
     if (!binding_op_exts_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_op_exts_impl->super, "WODEN_WSDL10_SOAP_BINDING_OP_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_op_exts_impl->super, "WODEN_WSDL10_SOAP_BINDING_OP_EXTS", AXIS2_HASH_KEY_STRING,
             &(binding_op_exts_impl->binding_op_exts));
-    axis2_hash_set(binding_op_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_op_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
             binding_op_exts_impl->component_exts);
 
     return &(binding_op_exts_impl->binding_op_exts);
@@ -246,13 +246,13 @@
 
     if (binding_op_exts_impl->super)
     {
-        axis2_hash_free(binding_op_exts_impl->super, env);
+        axutil_hash_free(binding_op_exts_impl->super, env);
         binding_op_exts_impl->super = NULL;
     }
 
     if (binding_op_exts_impl->methods)
     {
-        axis2_hash_free(binding_op_exts_impl->methods, env);
+        axutil_hash_free(binding_op_exts_impl->methods, env);
         binding_op_exts_impl->methods = NULL;
     }
 
@@ -289,7 +289,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_soap_binding_op_exts_super_objs(
     void *binding_op_exts,
     const axutil_env_t *env)
@@ -333,7 +333,7 @@
     woden_wsdl10_soap_binding_op_exts_t *binding_op_exts,
     const axutil_env_t *env,
     woden_wsdl10_soap_binding_op_exts_t *binding_op_exts_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_wsdl10_soap_binding_op_exts_impl_t *binding_op_exts_impl_l = NULL;
 
@@ -341,14 +341,14 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     binding_op_exts_impl_l = INTF_TO_IMPL(binding_op_exts_impl);
 
-    binding_op_exts->ops->free = axis2_hash_get(methods, "free",
+    binding_op_exts->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_op_exts->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    binding_op_exts->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    binding_op_exts->ops->type = axis2_hash_get(methods, "type",
+    binding_op_exts->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    binding_op_exts->ops->get_soap_modules = axis2_hash_get(methods,
+    binding_op_exts->ops->get_soap_modules = axutil_hash_get(methods,
             "get_soap_modules", AXIS2_HASH_KEY_STRING);
     if (!binding_op_exts->ops->get_soap_modules && binding_op_exts_impl_l)
         binding_op_exts->ops->get_soap_modules =



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


Mime
View raw message