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 [8/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/builder/wsdl10/woden_wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Fri Mar 30 11:28:18 2007
@@ -134,7 +134,7 @@
     axiom_document_t *om_doc;
     axiom_node_t *root_node;
     /* A map of imported schema definitions keyed by schema location URI */
-    axis2_hash_t *f_imported_schemas;
+    axutil_hash_t *f_imported_schemas;
     woden_wsdl10_ext_registry_t *f_ext_reg;
 
 };
@@ -179,7 +179,7 @@
     const axutil_env_t *env,
     const axis2_char_t *document_base_uri,
     axiom_node_t *desc_el_node,
-    axis2_hash_t *wsdl_modules);
+    axutil_hash_t *wsdl_modules);
 
 static void *
 parse_documentation(
@@ -194,7 +194,7 @@
     const axutil_env_t *env,
     axiom_node_t *import_el_node,
     void *desc,
-    axis2_hash_t *wsdl_modules);
+    axutil_hash_t *wsdl_modules);
 
 static void *
 parse_include(
@@ -202,7 +202,7 @@
     const axutil_env_t *env,
     axiom_node_t *include_el_node,
     void *desc,
-    axis2_hash_t *wsdl_modules);
+    axutil_hash_t *wsdl_modules);
 
 /*
  * TODO Initial schema parsing is specific to XML Schema.
@@ -429,7 +429,7 @@
     const axutil_env_t *env,
     axis2_char_t *location_uri_str,
     void *desc,
-    axis2_hash_t *wsdl_modules);
+    axutil_hash_t *wsdl_modules);
 
 /*
  * Convert a string of type xs:anyURI to a axis2_uri.
@@ -457,7 +457,7 @@
     reader_impl->reader.ops = AXIS2_MALLOC(env->allocator,
             sizeof(woden_wsdl10_reader_ops_t));
 
-    reader_impl->f_imported_schemas = axis2_hash_make(env);
+    reader_impl->f_imported_schemas = axutil_hash_make(env);
     if (!reader_impl->f_imported_schemas)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -496,7 +496,7 @@
 
     if (reader_impl->f_imported_schemas)
     {
-        axis2_hash_free(reader_impl->f_imported_schemas, env);
+        axutil_hash_free(reader_impl->f_imported_schemas, env);
         reader_impl->f_imported_schemas = NULL;
     }
 
@@ -602,7 +602,7 @@
     const axutil_env_t *env,
     const axis2_char_t *document_base_uri,
     axiom_node_t *desc_el_node,
-    axis2_hash_t *wsdl_modules)
+    axutil_hash_t *wsdl_modules)
 {
     woden_wsdl10_reader_impl_t *reader_impl = NULL;
     void *desc = NULL;
@@ -610,8 +610,8 @@
     axis2_uri_t *uri = NULL;
     axis2_char_t *target_namespc = NULL;
     axiom_element_t *desc_el = NULL;
-    axis2_hash_t *attrs = NULL;
-    axis2_hash_index_t *index = NULL;
+    axutil_hash_t *attrs = NULL;
+    axutil_hash_index_t *index = NULL;
     axiom_element_t *temp_el = NULL;
     axiom_node_t *temp_el_node = NULL;
     void *types = NULL;
@@ -644,7 +644,7 @@
         /* This is the initial WSDL document. No imports or includes yet.
          * TODO this might be the place to flag the initial Desc if necessary.
          */
-        wsdl_modules = axis2_hash_make(env);
+        wsdl_modules = axutil_hash_make(env);
     }
     ext_reg = woden_wsdl10_reader_get_ext_registry(reader, env);
     if (ext_reg)
@@ -672,7 +672,7 @@
 
     /* parse the namespace declarations */
     attrs = axiom_element_get_all_attributes(desc_el, env);
-    for (index = axis2_hash_first(attrs, env); index; index = axis2_hash_next(
+    for (index = axutil_hash_first(attrs, env); index; index = axutil_hash_next(
                 env, index))
     {
         void *v = NULL;
@@ -682,7 +682,7 @@
         axis2_char_t *local_part = NULL;
         axis2_char_t *value = NULL;
 
-        axis2_hash_this(index, NULL, NULL, &v);
+        axutil_hash_this(index, NULL, NULL, &v);
         attr = (axiom_attribute_t *) v;
         namespc = axiom_attribute_get_namespace(attr, env);
         if (!namespc)
@@ -755,10 +755,10 @@
             void *import_element = NULL;
 
             if (document_base_uri && AXIS2_TRUE !=
-                    axis2_hash_contains_key(wsdl_modules, env,
+                    axutil_hash_contains_key(wsdl_modules, env,
                             document_base_uri))
             {
-                axis2_hash_set(wsdl_modules, document_base_uri,
+                axutil_hash_set(wsdl_modules, document_base_uri,
                         AXIS2_HASH_KEY_STRING, desc);
             }
             import_element = parse_import(reader, env, temp_el_node, desc,
@@ -772,10 +772,10 @@
             void *include_element = NULL;
 
             if (document_base_uri && AXIS2_TRUE !=
-                    axis2_hash_contains_key(wsdl_modules, env,
+                    axutil_hash_contains_key(wsdl_modules, env,
                             document_base_uri))
             {
-                axis2_hash_set(wsdl_modules, document_base_uri,
+                axutil_hash_set(wsdl_modules, document_base_uri,
                         AXIS2_HASH_KEY_STRING, desc);
             }
             include_element = parse_include(reader, env, temp_el_node, desc,
@@ -945,7 +945,7 @@
     const axutil_env_t *env,
     axiom_node_t *import_el_node,
     void *desc,
-    axis2_hash_t *wsdl_modules)
+    axutil_hash_t *wsdl_modules)
 {
     void *imp = NULL;
     axiom_element_t *import_el = NULL;
@@ -1001,7 +1001,7 @@
     const axutil_env_t *env,
     axiom_node_t *include_el_node,
     void *desc,
-    axis2_hash_t *wsdl_modules)
+    axutil_hash_t *wsdl_modules)
 {
     void *include = NULL;
     axiom_element_t *include_el = NULL;
@@ -1304,7 +1304,7 @@
     schema_uri = axis2_uri_to_string(uri, env, AXIS2_URI_UNP_OMITUSERINFO);
 
     /* If the schema has already been imported, reuse it. */
-    schema_def = axis2_hash_get(reader_impl->f_imported_schemas, schema_uri,
+    schema_def = axutil_hash_get(reader_impl->f_imported_schemas, schema_uri,
             AXIS2_HASH_KEY_STRING);
     if (schema_def)
     {
@@ -1331,7 +1331,7 @@
             WODEN_SCHEMA_SET_REFERENCEABLE(base_schema, env, AXIS2_FALSE);
             return schema;
         }
-        axis2_hash_set(reader_impl->f_imported_schemas, schema_uri,
+        axutil_hash_set(reader_impl->f_imported_schemas, schema_uri,
                 AXIS2_HASH_KEY_STRING, schema_def);
 
     }
@@ -1515,7 +1515,7 @@
     if (element)
     {
         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);
@@ -2275,7 +2275,7 @@
     intface = axiom_element_get_attribute_value_by_name(binding_el, env, WODEN_WSDL10_ATTR_INTERFACE);
     if (intface)
     {
-        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);
@@ -2638,7 +2638,7 @@
 
     if (ref)
     {
-        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);
@@ -3058,7 +3058,7 @@
     intface = axiom_element_get_attribute_value_by_name(svc_el, env, WODEN_WSDL10_ATTR_INTERFACE);
     if (intface)
     {
-        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);
@@ -3226,7 +3226,7 @@
     binding = axiom_element_get_attribute_value_by_name(endpoint_el, env, WODEN_WSDL10_ATTR_BINDING);
     if (binding)
     {
-        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);
@@ -3584,7 +3584,7 @@
                     else
                     {
                         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);
@@ -3630,9 +3630,9 @@
     void *wsdl_obj,
     void *desc)
 {
-    axis2_hash_t *node_map = NULL;
+    axutil_hash_t *node_map = NULL;
     axiom_element_t *om_el = NULL;
-    axis2_hash_index_t *index = NULL;
+    axutil_hash_index_t *index = NULL;
 
     om_el = AXIOM_NODE_GET_DATA_ELEMENT(om_el_node, env);
     node_map = axiom_element_get_all_attributes(om_el, env);
@@ -3645,8 +3645,8 @@
         else
             return AXIS2_SUCCESS;
     }
-    for (index = axis2_hash_first(node_map, env); index; index =
-                axis2_hash_next(env, index))
+    for (index = axutil_hash_first(node_map, env); index; index =
+                axutil_hash_next(env, index))
     {
         void *om_attr = NULL;
         axis2_char_t *localname = NULL;
@@ -3655,7 +3655,7 @@
         axis2_char_t *prefix = NULL;
         axis2_qname_t *attr_type = NULL;
 
-        axis2_hash_this(index, NULL, NULL, &om_attr);
+        axutil_hash_this(index, NULL, NULL, &om_attr);
         localname = axiom_attribute_get_localname((axiom_attribute_t *) om_attr, env);
         namespc = axiom_attribute_get_namespace((axiom_attribute_t *) om_attr, env);
         if (namespc)
@@ -3801,7 +3801,7 @@
     const axutil_env_t *env,
     axis2_char_t *location_uri_str,
     void *desc,
-    axis2_hash_t *wsdl_modules)
+    axutil_hash_t *wsdl_modules)
 {
     axis2_uri_t *context_uri = NULL;
     axis2_uri_t *location_uri = NULL;
@@ -3820,7 +3820,7 @@
     location_str = axis2_uri_to_string(location_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
 
     /* Check if WSDL imported or included previously from this location.*/
-    referenced_desc = axis2_hash_get(wsdl_modules, location_str, AXIS2_HASH_KEY_STRING);
+    referenced_desc = axutil_hash_get(wsdl_modules, location_str, AXIS2_HASH_KEY_STRING);
 
     if (!referenced_desc)
     {
@@ -3853,10 +3853,10 @@
 
         referenced_desc = parse_desc(reader, env, location_str,
                 doc_el_node, wsdl_modules);
-        if (AXIS2_TRUE != axis2_hash_contains_key(wsdl_modules, env,
+        if (AXIS2_TRUE != axutil_hash_contains_key(wsdl_modules, env,
                 location_str))
         {
-            axis2_hash_set(wsdl_modules, location_str, AXIS2_HASH_KEY_STRING,
+            axutil_hash_set(wsdl_modules, location_str, AXIS2_HASH_KEY_STRING,
                     referenced_desc);
         }
     }

Modified: webservices/axis2/trunk/c/woden/src/schema/woden_imported_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/woden_imported_schema.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/woden_imported_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/woden_imported_schema.c Fri Mar 30 11:28:18 2007
@@ -30,8 +30,8 @@
     woden_imported_schema_t imported_schema;
     woden_schema_t *schema;
     woden_obj_types_t obj_type;
-    axis2_hash_t *methods;
-    axis2_hash_t *super;
+    axutil_hash_t *methods;
+    axutil_hash_t *super;
     axis2_uri_t *f_schema_location;
 };
 
@@ -43,7 +43,7 @@
     void *schema,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_imported_schema_super_objs(
     void *schema,
     const axutil_env_t *env);
@@ -144,28 +144,28 @@
         woden_imported_schema_get_location;
 
 
-    schema_impl->super = axis2_hash_make(env);
+    schema_impl->super = axutil_hash_make(env);
     if (!schema_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    schema_impl->methods = axis2_hash_make(env);
+    schema_impl->methods = axutil_hash_make(env);
     if (!schema_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(schema_impl->methods, "free",
+    axutil_hash_set(schema_impl->methods, "free",
             AXIS2_HASH_KEY_STRING, woden_imported_schema_free);
-    axis2_hash_set(schema_impl->methods, "super_objs",
+    axutil_hash_set(schema_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_imported_schema_super_objs);
-    axis2_hash_set(schema_impl->methods, "type",
+    axutil_hash_set(schema_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_imported_schema_type);
 
-    axis2_hash_set(schema_impl->methods, "set_location",
+    axutil_hash_set(schema_impl->methods, "set_location",
             AXIS2_HASH_KEY_STRING, woden_imported_schema_set_location);
-    axis2_hash_set(schema_impl->methods, "get_location",
+    axutil_hash_set(schema_impl->methods, "get_location",
             AXIS2_HASH_KEY_STRING, woden_imported_schema_get_location);
 
     return &(schema_impl->imported_schema);
@@ -180,9 +180,9 @@
     schema_impl = (woden_imported_schema_impl_t *) create(env);
 
     schema_impl->schema = woden_schema_create(env);
-    axis2_hash_set(schema_impl->super, "WODEN_IMPORTED_SCHEMA", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(schema_impl->super, "WODEN_IMPORTED_SCHEMA", AXIS2_HASH_KEY_STRING,
             &(schema_impl->schema));
-    axis2_hash_set(schema_impl->super, "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(schema_impl->super, "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING,
             schema_impl->schema);
     return &(schema_impl->imported_schema);
 }
@@ -238,7 +238,7 @@
 
     if (schema_impl->methods)
     {
-        axis2_hash_free(schema_impl->methods, env);
+        axutil_hash_free(schema_impl->methods, env);
         schema_impl->methods = NULL;
     }
 
@@ -264,7 +264,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_imported_schema_super_objs(
     void *schema,
     const axutil_env_t *env)
@@ -295,7 +295,7 @@
     woden_imported_schema_t *schema,
     const axutil_env_t *env,
     woden_imported_schema_t *schema_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_imported_schema_impl_t *schema_impl_l = NULL;
 
@@ -304,17 +304,17 @@
     schema_impl_l = INTF_TO_IMPL(schema_impl);
 
     schema->ops->free =
-        axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
+        axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
     schema->ops->type =
-        axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
+        axutil_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
 
-    schema->ops->set_location = axis2_hash_get(methods,
+    schema->ops->set_location = axutil_hash_get(methods,
             "set_location", AXIS2_HASH_KEY_STRING);
     if (!schema->ops->set_location && schema_impl_l)
         schema->ops->set_location =
             schema_impl_l->imported_schema.ops->set_location;
 
-    schema->ops->get_location = axis2_hash_get(methods,
+    schema->ops->get_location = axutil_hash_get(methods,
             "get_location", AXIS2_HASH_KEY_STRING);
     if (!schema->ops->get_location && schema_impl_l)
         schema->ops->get_location =

Modified: webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c Fri Mar 30 11:28:18 2007
@@ -30,8 +30,8 @@
     woden_inlined_schema_t inlined_schema;
     woden_schema_t *schema;
     woden_obj_types_t obj_type;
-    axis2_hash_t *methods;
-    axis2_hash_t *super;
+    axutil_hash_t *methods;
+    axutil_hash_t *super;
     axis2_char_t *f_schema_id;
 };
 
@@ -43,7 +43,7 @@
     void *schema,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_inlined_schema_super_objs(
     void *schema,
     const axutil_env_t *env);
@@ -147,22 +147,22 @@
     schema_impl->inlined_schema.ops->get_id =
         woden_inlined_schema_get_id;
 
-    schema_impl->methods = axis2_hash_make(env);
+    schema_impl->methods = axutil_hash_make(env);
     if (!schema_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(schema_impl->methods, "free",
+    axutil_hash_set(schema_impl->methods, "free",
             AXIS2_HASH_KEY_STRING, woden_inlined_schema_free);
-    axis2_hash_set(schema_impl->methods, "super_objs",
+    axutil_hash_set(schema_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_inlined_schema_super_objs);
-    axis2_hash_set(schema_impl->methods, "type",
+    axutil_hash_set(schema_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_inlined_schema_type);
 
-    axis2_hash_set(schema_impl->methods, "set_id",
+    axutil_hash_set(schema_impl->methods, "set_id",
             AXIS2_HASH_KEY_STRING, woden_inlined_schema_set_id);
-    axis2_hash_set(schema_impl->methods, "get_id",
+    axutil_hash_set(schema_impl->methods, "get_id",
             AXIS2_HASH_KEY_STRING, woden_inlined_schema_get_id);
 
     return &(schema_impl->inlined_schema);
@@ -177,15 +177,15 @@
     schema_impl = (woden_inlined_schema_impl_t *) create(env);
 
     schema_impl->schema = woden_schema_create(env);
-    schema_impl->super = axis2_hash_make(env);
+    schema_impl->super = axutil_hash_make(env);
     if (!schema_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(schema_impl->super, "WODEN_INLINED_SCHEMA", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(schema_impl->super, "WODEN_INLINED_SCHEMA", AXIS2_HASH_KEY_STRING,
             &(schema_impl->schema));
-    axis2_hash_set(schema_impl->super, "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(schema_impl->super, "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING,
             schema_impl->schema);
 
     return &(schema_impl->inlined_schema);
@@ -242,7 +242,7 @@
 
     if (schema_impl->methods)
     {
-        axis2_hash_free(schema_impl->methods, env);
+        axutil_hash_free(schema_impl->methods, env);
         schema_impl->methods = NULL;
     }
 
@@ -281,7 +281,7 @@
     return schema_impl->schema;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_inlined_schema_super_objs(
     void *schema,
     const axutil_env_t *env)
@@ -299,7 +299,7 @@
     woden_inlined_schema_t *schema,
     const axutil_env_t *env,
     woden_inlined_schema_t *schema_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_inlined_schema_impl_t *schema_impl_l = NULL;
 
@@ -308,19 +308,19 @@
     schema_impl_l = INTF_TO_IMPL(schema_impl);
 
     schema->ops->free =
-        axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
-    schema->ops->super_objs = axis2_hash_get(methods, "super_objs",
+        axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
+    schema->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
     schema->ops->type =
-        axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
+        axutil_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
 
-    schema->ops->set_id = axis2_hash_get(methods,
+    schema->ops->set_id = axutil_hash_get(methods,
             "set_id", AXIS2_HASH_KEY_STRING);
     if (!schema->ops->set_id && schema_impl_l)
         schema->ops->set_id =
             schema_impl_l->inlined_schema.ops->set_id;
 
-    schema->ops->get_id = axis2_hash_get(methods,
+    schema->ops->get_id = axutil_hash_get(methods,
             "get_id", AXIS2_HASH_KEY_STRING);
     if (!schema->ops->get_id && schema_impl_l)
         schema->ops->get_id =

Modified: webservices/axis2/trunk/c/woden/src/schema/woden_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/woden_schema.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/woden_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/woden_schema.c Fri Mar 30 11:28:18 2007
@@ -27,7 +27,7 @@
 struct woden_schema_impl
 {
     woden_schema_t schema;
-    axis2_hash_t *super;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
     axis2_uri_t *f_namespc;
@@ -42,7 +42,7 @@
     void *schema,
     const axutil_env_t *envv);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_schema_super_objs(
     void *schema,
     const axutil_env_t *env);
@@ -109,7 +109,7 @@
     schema_impl->schema.ops = AXIS2_MALLOC(env->allocator,
             sizeof(woden_schema_ops_t));
 
-    schema_impl->super = axis2_hash_make(env);
+    schema_impl->super = axutil_hash_make(env);
     if (!schema_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -129,7 +129,7 @@
     schema_impl->schema.ops->get_namespace_as_string =
         woden_schema_get_namespace_as_string;
 
-    axis2_hash_set(schema_impl->super, "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(schema_impl->super, "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING,
             &(schema_impl->schema));
 
     return &(schema_impl->schema);
@@ -171,7 +171,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_schema_super_objs(
     void *schema,
     const axutil_env_t *env)
@@ -203,7 +203,7 @@
     woden_schema_t *schema,
     const axutil_env_t *env,
     woden_schema_t *schema_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_schema_impl_t *schema_impl_l = NULL;
 
@@ -211,48 +211,48 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     schema_impl_l = INTF_TO_IMPL(schema_impl);
 
-    schema->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
-    schema->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    schema->ops->free = axutil_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
+    schema->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    schema->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
+    schema->ops->type = axutil_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
 
-    schema->ops->set_namespace = axis2_hash_get(methods,
+    schema->ops->set_namespace = axutil_hash_get(methods,
             "set_namespace", AXIS2_HASH_KEY_STRING);
     if (!schema->ops->set_namespace && schema_impl_l)
         schema->ops->set_namespace =
             schema_impl_l->schema.ops->set_namespace;
 
-    schema->ops->get_namespace = axis2_hash_get(methods,
+    schema->ops->get_namespace = axutil_hash_get(methods,
             "get_namespace", AXIS2_HASH_KEY_STRING);
     if (!schema->ops->get_namespace && schema_impl_l)
         schema->ops->get_namespace =
             schema_impl_l->schema.ops->get_namespace;
 
-    schema->ops->set_schema_def = axis2_hash_get(methods,
+    schema->ops->set_schema_def = axutil_hash_get(methods,
             "set_schema_def", AXIS2_HASH_KEY_STRING);
     if (!schema->ops->set_schema_def && schema_impl_l)
         schema->ops->set_schema_def =
             schema_impl_l->schema.ops->set_schema_def;
 
-    schema->ops->get_schema_def = axis2_hash_get(methods,
+    schema->ops->get_schema_def = axutil_hash_get(methods,
             "get_schema_def", AXIS2_HASH_KEY_STRING);
     if (!schema->ops->get_schema_def && schema_impl_l)
         schema->ops->get_schema_def =
             schema_impl_l->schema.ops->get_schema_def;
 
-    schema->ops->set_referenceable = axis2_hash_get(methods,
+    schema->ops->set_referenceable = axutil_hash_get(methods,
             "set_referenceable", AXIS2_HASH_KEY_STRING);
     if (!schema->ops->set_referenceable && schema_impl_l)
         schema->ops->set_referenceable =
             schema_impl_l->schema.ops->set_referenceable;
 
-    schema->ops->is_referenceable = axis2_hash_get(methods,
+    schema->ops->is_referenceable = axutil_hash_get(methods,
             "is_referenceable", AXIS2_HASH_KEY_STRING);
     if (!schema->ops->is_referenceable && schema_impl_l)
         schema->ops->is_referenceable =
             schema_impl_l->schema.ops->is_referenceable;
 
-    schema->ops->get_namespace_as_string = axis2_hash_get(methods,
+    schema->ops->get_namespace_as_string = axutil_hash_get(methods,
             "get_namespace_as_string", AXIS2_HASH_KEY_STRING);
     if (!schema->ops->get_namespace_as_string && schema_impl_l)
         schema->ops->get_namespace_as_string =
@@ -268,12 +268,12 @@
     axis2_uri_t *namespc)
 {
     woden_schema_impl_t *schema_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_SCHEMA_SUPER_OBJS(schema, env);
-    schema_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    schema_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING));
 
     if (schema_impl->f_namespc)
@@ -292,11 +292,11 @@
     const axutil_env_t *env)
 {
     woden_schema_impl_t *schema_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_SCHEMA_SUPER_OBJS(schema, env);
-    schema_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    schema_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING));
 
     return schema_impl->f_namespc;
@@ -309,12 +309,12 @@
     xml_schema_t *schema_def)
 {
     woden_schema_impl_t *schema_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, schema_def, AXIS2_FAILURE);
     super = WODEN_SCHEMA_SUPER_OBJS(schema, env);
-    schema_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    schema_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING));
 
     if (schema_impl->f_schema_def)
@@ -333,11 +333,11 @@
     const axutil_env_t *env)
 {
     woden_schema_impl_t *schema_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_SCHEMA_SUPER_OBJS(schema, env);
-    schema_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    schema_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING));
 
     return schema_impl->f_schema_def;
@@ -350,11 +350,11 @@
     axis2_bool_t referenceable)
 {
     woden_schema_impl_t *schema_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_SCHEMA_SUPER_OBJS(schema, env);
-    schema_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    schema_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING));
 
     schema_impl->f_is_referenceable = referenceable;
@@ -368,11 +368,11 @@
     const axutil_env_t *env)
 {
     woden_schema_impl_t *schema_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     super = WODEN_SCHEMA_SUPER_OBJS(schema, env);
-    schema_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    schema_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING));
 
     return schema_impl->f_is_referenceable;
@@ -384,11 +384,11 @@
     const axutil_env_t *env)
 {
     woden_schema_impl_t *schema_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_SCHEMA_SUPER_OBJS(schema, env);
-    schema_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    schema_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING));
 
     return schema_impl->f_namespc  ?

Modified: webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c Fri Mar 30 11:28:18 2007
@@ -20,7 +20,7 @@
 #include <axutil_error.h>
 #include <axis2_string.h>
 #include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
 #include <axis2_uri.h>
 #include <axis2_qname.h>
 #include <woden.h>

Modified: webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_om_util.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_om_util.c Fri Mar 30 11:28:18 2007
@@ -26,7 +26,7 @@
     const axutil_env_t *env,
     axiom_node_t *context_el_node,
     axis2_char_t *prefixed_value,
-    axis2_hash_t *namespcs)
+    axutil_hash_t *namespcs)
 {
     axis2_char_t *index = NULL;
     axis2_char_t *prefix = NULL;
@@ -63,14 +63,14 @@
     const axutil_env_t *env,
     axis2_char_t *prefix,
     axis2_char_t *namespc_uri_str,
-    axis2_hash_t *namespcs)
+    axutil_hash_t *namespcs)
 {
     axis2_uri_t *ns_uri = NULL;
     axis2_uri_t *uri = NULL;
     axis2_char_t *ns_uri_str = NULL;
     axis2_char_t *tmp_prefix = NULL;
 
-    ns_uri = axis2_hash_get(namespcs, prefix, AXIS2_HASH_KEY_STRING);
+    ns_uri = axutil_hash_get(namespcs, prefix, AXIS2_HASH_KEY_STRING);
     if (ns_uri)
         ns_uri_str = axis2_uri_to_string(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
     if (ns_uri_str && 0 == axis2_strcmp(ns_uri_str, namespc_uri_str))
@@ -84,14 +84,14 @@
         axis2_char_t *temp = NULL;
 
         temp = axis2_stracat(env, tmp_prefix, "_");
-        ns_uri = axis2_hash_get(namespcs, temp, AXIS2_HASH_KEY_STRING);
+        ns_uri = axutil_hash_get(namespcs, temp, AXIS2_HASH_KEY_STRING);
         ns_uri_str = axis2_uri_to_string(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
         AXIS2_FREE(env->allocator, tmp_prefix);
         tmp_prefix = axis2_strdup(env, temp);
         AXIS2_FREE(env->allocator, temp);
     }
     uri = axis2_uri_parse_string(env, namespc_uri_str);
-    axis2_hash_set(namespcs, prefix, AXIS2_HASH_KEY_STRING, uri);
+    axutil_hash_set(namespcs, prefix, AXIS2_HASH_KEY_STRING, uri);
 
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/woden/src/util/woden_om_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_om_util.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.h (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_om_util.h Fri Mar 30 11:28:18 2007
@@ -30,7 +30,7 @@
 #include <axutil_error.h>
 #include <axis2_string.h>
 #include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
 #include <axis2_qname.h>
 #include <woden.h>
 #include <axiom_node.h>
@@ -50,14 +50,14 @@
         const axutil_env_t *env,
         axiom_node_t *context_el_node,
         axis2_char_t *prefixed_value,
-        axis2_hash_t *namespcs);
+        axutil_hash_t *namespcs);
  
 AXIS2_EXTERN axis2_status_t  AXIS2_CALL
 woden_om_util_register_unique_prefix(
         const axutil_env_t *env,
         axis2_char_t *prefix,
         axis2_char_t *namespc_uri_str,
-        axis2_hash_t *namespcs);
+        axutil_hash_t *namespcs);
  
 
 /** @} */

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c Fri Mar 30 11:28:18 2007
@@ -18,7 +18,7 @@
 #include <woden_attr_extensible.h>
 #include <woden_xml_attr.h>
 #include <axis2_uri.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
 
 typedef struct woden_attr_extensible_impl woden_attr_extensible_impl_t;
 
@@ -29,9 +29,9 @@
 struct woden_attr_extensible_impl
 {
     woden_attr_extensible_t extensible;
-    axis2_hash_t *super;
+    axutil_hash_t *super;
     woden_obj_types_t obj_type;
-    axis2_hash_t *f_ext_attrs;
+    axutil_hash_t *f_ext_attrs;
     axutil_array_list_t *temp_attrs;
 };
 
@@ -43,7 +43,7 @@
     void *extensible,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_attr_extensible_super_objs(
     void *extensible,
     const axutil_env_t *env);
@@ -122,13 +122,13 @@
     extensible_impl->extensible.ops->has_ext_attrs_for_namespace =
         woden_attr_extensible_has_ext_attrs_for_namespace;
 
-    extensible_impl->super = axis2_hash_make(env);
+    extensible_impl->super = axutil_hash_make(env);
     if (!extensible_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(extensible_impl->super, "WODEN_ATTR_EXTENSLBE",
+    axutil_hash_set(extensible_impl->super, "WODEN_ATTR_EXTENSLBE",
             AXIS2_HASH_KEY_STRING, &(extensible_impl->extensible));
 
 
@@ -147,7 +147,7 @@
 
     if (extensible_impl->f_ext_attrs)
     {
-        axis2_hash_free(extensible_impl->f_ext_attrs, env);
+        axutil_hash_free(extensible_impl->f_ext_attrs, env);
         extensible_impl->f_ext_attrs = NULL;
     }
 
@@ -168,7 +168,7 @@
 
     if (extensible_impl->super)
     {
-        axis2_hash_free(extensible_impl->super, env);
+        axutil_hash_free(extensible_impl->super, env);
         extensible_impl->super = NULL;
     }
 
@@ -186,7 +186,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_attr_extensible_super_objs(
     void *extensible,
     const axutil_env_t *env)
@@ -217,7 +217,7 @@
     woden_attr_extensible_t *extensible,
     const axutil_env_t *env,
     woden_attr_extensible_t *extensible_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_attr_extensible_impl_t *extensible_impl_l = NULL;
 
@@ -225,40 +225,40 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     extensible_impl_l = INTF_TO_IMPL(extensible_impl);
 
-    extensible->ops->free = axis2_hash_get(methods, "free",
+    extensible->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    extensible->ops->to_attr_extensible_free = axis2_hash_get(methods,
+    extensible->ops->to_attr_extensible_free = axutil_hash_get(methods,
             "to_attr_extensible_free", AXIS2_HASH_KEY_STRING);
-    extensible->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    extensible->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    extensible->ops->type = axis2_hash_get(methods, "type",
+    extensible->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    extensible->ops->set_ext_attr = axis2_hash_get(methods,
+    extensible->ops->set_ext_attr = axutil_hash_get(methods,
             "set_ext_attr", AXIS2_HASH_KEY_STRING);
     if (!extensible->ops->set_ext_attr && extensible_impl_l)
         extensible->ops->set_ext_attr =
             extensible_impl_l->extensible.ops->set_ext_attr;
 
-    extensible->ops->get_ext_attr = axis2_hash_get(methods,
+    extensible->ops->get_ext_attr = axutil_hash_get(methods,
             "get_ext_attr", AXIS2_HASH_KEY_STRING);
     if (!extensible->ops->get_ext_attr && extensible_impl_l)
         extensible->ops->get_ext_attr =
             extensible_impl_l->extensible.ops->get_ext_attr;
 
-    extensible->ops->get_ext_attrs = axis2_hash_get(methods,
+    extensible->ops->get_ext_attrs = axutil_hash_get(methods,
             "get_ext_attrs", AXIS2_HASH_KEY_STRING);
     if (!extensible->ops->get_ext_attrs && extensible_impl_l)
         extensible->ops->get_ext_attrs =
             extensible_impl_l->extensible.ops->get_ext_attrs;
 
-    extensible->ops->get_ext_attrs_for_namespace = axis2_hash_get(methods,
+    extensible->ops->get_ext_attrs_for_namespace = axutil_hash_get(methods,
             "get_ext_attrs_for_namespace", AXIS2_HASH_KEY_STRING);
     if (!extensible->ops->get_ext_attrs_for_namespace && extensible_impl_l)
         extensible->ops->get_ext_attrs_for_namespace =
             extensible_impl_l->extensible.ops->get_ext_attrs_for_namespace;
 
-    extensible->ops->has_ext_attrs_for_namespace = axis2_hash_get(methods,
+    extensible->ops->has_ext_attrs_for_namespace = axutil_hash_get(methods,
             "has_ext_attrs_for_namespace", AXIS2_HASH_KEY_STRING);
     if (!extensible->ops->has_ext_attrs_for_namespace && extensible_impl_l)
         extensible->ops->has_ext_attrs_for_namespace =
@@ -276,20 +276,20 @@
 {
     woden_attr_extensible_impl_t *extensible_impl = NULL;
     axis2_char_t *str_attr_type = 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);
     super = WODEN_ATTR_EXTENSIBLE_SUPER_OBJS(extensible, env);
-    extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    extensible_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_ATTR_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
 
     str_attr_type = axis2_qname_to_string(attr_type, env);
     if (attr)
-        axis2_hash_set(extensible_impl->f_ext_attrs, str_attr_type,
+        axutil_hash_set(extensible_impl->f_ext_attrs, str_attr_type,
                 AXIS2_HASH_KEY_STRING, attr);
     else
-        axis2_hash_set(extensible_impl->f_ext_attrs, str_attr_type,
+        axutil_hash_set(extensible_impl->f_ext_attrs, str_attr_type,
                 AXIS2_HASH_KEY_STRING, NULL);
     return AXIS2_SUCCESS;
 }
@@ -302,16 +302,16 @@
 {
     woden_attr_extensible_impl_t *extensible_impl = NULL;
     axis2_char_t *str_attr_type = 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_ATTR_EXTENSIBLE_SUPER_OBJS(extensible, env);
-    extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    extensible_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_ATTR_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
 
     str_attr_type = axis2_qname_to_string(attr_type, env);
-    return (woden_xml_attr_t *)axis2_hash_get(extensible_impl->f_ext_attrs,
+    return (woden_xml_attr_t *)axutil_hash_get(extensible_impl->f_ext_attrs,
             str_attr_type, AXIS2_HASH_KEY_STRING);
 }
 
@@ -321,12 +321,12 @@
     const axutil_env_t *env)
 {
     woden_attr_extensible_impl_t *extensible_impl = NULL;
-    axis2_hash_index_t *index = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_index_t *index = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_ATTR_EXTENSIBLE_SUPER_OBJS(extensible, env);
-    extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    extensible_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_ATTR_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
 
     if (extensible_impl->temp_attrs)
@@ -344,12 +344,12 @@
         extensible_impl->temp_attrs = NULL;
     }
     extensible_impl->temp_attrs = axutil_array_list_create(env, 0);
-    for (index = axis2_hash_first(extensible_impl->f_ext_attrs, env); index;
-            index = axis2_hash_next(env, index))
+    for (index = axutil_hash_first(extensible_impl->f_ext_attrs, env); index;
+            index = axutil_hash_next(env, index))
     {
         void *value = NULL;
 
-        axis2_hash_this(index, NULL, NULL, &value);
+        axutil_hash_this(index, NULL, NULL, &value);
         axutil_array_list_add(extensible_impl->temp_attrs, env, value);
     }
     return extensible_impl->temp_attrs;
@@ -362,13 +362,13 @@
 {
     woden_attr_extensible_impl_t *extensible_impl = NULL;
     axis2_char_t *str_namespc = NULL;
-    axis2_hash_index_t *index = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_index_t *index = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, namespc, NULL);
     super = WODEN_ATTR_EXTENSIBLE_SUPER_OBJS(extensible, env);
-    extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    extensible_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_ATTR_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
 
     str_namespc = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
@@ -388,12 +388,12 @@
     }
 
     extensible_impl->temp_attrs = axutil_array_list_create(env, 0);
-    for (index = axis2_hash_first(extensible_impl->f_ext_attrs, env); index;
-            index = axis2_hash_next(env, index))
+    for (index = axutil_hash_first(extensible_impl->f_ext_attrs, env); index;
+            index = axutil_hash_next(env, index))
     {
         void *value = NULL;
 
-        axis2_hash_this(index, NULL, NULL, &value);
+        axutil_hash_this(index, NULL, NULL, &value);
         axutil_array_list_add(extensible_impl->temp_attrs, env, value);
     }
 
@@ -408,24 +408,24 @@
     woden_attr_extensible_impl_t *extensible_impl = NULL;
     axis2_bool_t result = AXIS2_FALSE;
     axis2_char_t *str_namespc = NULL;
-    axis2_hash_index_t *index = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_index_t *index = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
     super = WODEN_ATTR_EXTENSIBLE_SUPER_OBJS(extensible, env);
-    extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    extensible_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_ATTR_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
 
     str_namespc = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
-    for (index = axis2_hash_first(extensible_impl->f_ext_attrs, env); index;
-            index = axis2_hash_next(env, index))
+    for (index = axutil_hash_first(extensible_impl->f_ext_attrs, env); index;
+            index = axutil_hash_next(env, index))
     {
         const void *v = NULL;
         axis2_qname_t *key = NULL;
         axis2_char_t *str_ns = NULL;
 
-        axis2_hash_this(index, &v, NULL, NULL);
+        axutil_hash_this(index, &v, NULL, NULL);
         key = (axis2_qname_t *) v;
         str_ns = axis2_qname_get_uri(key, env);
         if (0 == axis2_strcmp(str_ns, str_namespc))

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c Fri Mar 30 11:28:18 2007
@@ -36,8 +36,8 @@
     woden_binding_t binding;
     woden_configurable_t *configurable;
     woden_obj_types_t obj_type;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
     axutil_array_list_t *f_extended_bindings;
     axis2_qname_t *f_qname;
     axis2_qname_t *f_interface_qname;
@@ -63,7 +63,7 @@
     void *binding,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_binding_super_objs(
     void *binding,
     const axutil_env_t *env);
@@ -424,71 +424,71 @@
     binding_impl->binding.ops->set_interface_element =
         woden_binding_set_interface_element;
 
-    binding_impl->methods = axis2_hash_make(env);
+    binding_impl->methods = axutil_hash_make(env);
     if (!binding_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_binding_free);
-    axis2_hash_set(binding_impl->methods, "super_objs",
+    axutil_hash_set(binding_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_binding_super_objs);
-    axis2_hash_set(binding_impl->methods, "type",
+    axutil_hash_set(binding_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_binding_type);
 
-    axis2_hash_set(binding_impl->methods, "get_qname",
+    axutil_hash_set(binding_impl->methods, "get_qname",
             AXIS2_HASH_KEY_STRING,
             woden_binding_get_qname);
-    axis2_hash_set(binding_impl->methods, "get_interface",
+    axutil_hash_set(binding_impl->methods, "get_interface",
             AXIS2_HASH_KEY_STRING,
             woden_binding_get_interface);
-    axis2_hash_set(binding_impl->methods, "get_type",
+    axutil_hash_set(binding_impl->methods, "get_type",
             AXIS2_HASH_KEY_STRING,
             woden_binding_get_type);
-    axis2_hash_set(binding_impl->methods, "get_binding_faults",
+    axutil_hash_set(binding_impl->methods, "get_binding_faults",
             AXIS2_HASH_KEY_STRING,
             woden_binding_get_binding_faults);
-    axis2_hash_set(binding_impl->methods, "get_binding_ops",
+    axutil_hash_set(binding_impl->methods, "get_binding_ops",
             AXIS2_HASH_KEY_STRING,
             woden_binding_get_binding_ops);
-    axis2_hash_set(binding_impl->methods, "to_element",
+    axutil_hash_set(binding_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_to_element);
-    axis2_hash_set(binding_impl->methods, "set_qname",
+    axutil_hash_set(binding_impl->methods, "set_qname",
             AXIS2_HASH_KEY_STRING,
             woden_binding_set_qname);
-    axis2_hash_set(binding_impl->methods, "set_interface_qname",
+    axutil_hash_set(binding_impl->methods, "set_interface_qname",
             AXIS2_HASH_KEY_STRING,
             woden_binding_set_interface_qname);
-    axis2_hash_set(binding_impl->methods, "get_interface_qname",
+    axutil_hash_set(binding_impl->methods, "get_interface_qname",
             AXIS2_HASH_KEY_STRING,
             woden_binding_get_interface_qname);
-    axis2_hash_set(binding_impl->methods, "get_interface_element",
+    axutil_hash_set(binding_impl->methods, "get_interface_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_get_interface_element);
-    axis2_hash_set(binding_impl->methods, "set_type",
+    axutil_hash_set(binding_impl->methods, "set_type",
             AXIS2_HASH_KEY_STRING,
             woden_binding_set_type);
-    axis2_hash_set(binding_impl->methods, "add_binding_fault_element",
+    axutil_hash_set(binding_impl->methods, "add_binding_fault_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_add_binding_fault_element);
-    axis2_hash_set(binding_impl->methods, "get_binding_fault_elements",
+    axutil_hash_set(binding_impl->methods, "get_binding_fault_elements",
             AXIS2_HASH_KEY_STRING,
             woden_binding_get_binding_fault_elements);
-    axis2_hash_set(binding_impl->methods, "add_binding_op_element",
+    axutil_hash_set(binding_impl->methods, "add_binding_op_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_add_binding_op_element);
-    axis2_hash_set(binding_impl->methods, "get_binding_op_elements",
+    axutil_hash_set(binding_impl->methods, "get_binding_op_elements",
             AXIS2_HASH_KEY_STRING,
             woden_binding_get_binding_op_elements);
-    axis2_hash_set(binding_impl->methods, "get_binding_fault_element",
+    axutil_hash_set(binding_impl->methods, "get_binding_fault_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_get_binding_fault_element);
-    axis2_hash_set(binding_impl->methods, "get_binding_op_element",
+    axutil_hash_set(binding_impl->methods, "get_binding_op_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_get_binding_op_element);
-    axis2_hash_set(binding_impl->methods, "set_interface_element",
+    axutil_hash_set(binding_impl->methods, "set_interface_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_set_interface_element);
 
@@ -505,15 +505,15 @@
 
     binding_impl->configurable = woden_configurable_create(env);
 
-    binding_impl->super = axis2_hash_make(env);
+    binding_impl->super = axutil_hash_make(env);
     if (!binding_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_impl->super, "WODEN_BINDING", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_impl->super, "WODEN_BINDING", AXIS2_HASH_KEY_STRING,
             &(binding_impl->binding));
-    axis2_hash_set(binding_impl->super, "WODEN_CONFIGURABLE", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_impl->super, "WODEN_CONFIGURABLE", AXIS2_HASH_KEY_STRING,
             binding_impl->configurable);
 
     return &(binding_impl->binding);
@@ -636,13 +636,13 @@
 
     if (binding_impl->super)
     {
-        axis2_hash_free(binding_impl->super, env);
+        axutil_hash_free(binding_impl->super, env);
         binding_impl->super = NULL;
     }
 
     if (binding_impl->methods)
     {
-        axis2_hash_free(binding_impl->methods, env);
+        axutil_hash_free(binding_impl->methods, env);
         binding_impl->methods = NULL;
     }
 
@@ -667,7 +667,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_binding_super_objs(
     void *binding,
     const axutil_env_t *env)
@@ -711,7 +711,7 @@
     woden_binding_t *binding,
     const axutil_env_t *env,
     woden_binding_t *binding_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_binding_impl_t *binding_impl_l = NULL;
 
@@ -719,62 +719,62 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     binding_impl_l = INTF_TO_IMPL(binding_impl);
 
-    binding->ops->free = axis2_hash_get(methods, "free",
+    binding->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    binding->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    binding->ops->type = axis2_hash_get(methods, "type",
+    binding->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    binding->ops->get_qname = axis2_hash_get(methods,
+    binding->ops->get_qname = axutil_hash_get(methods,
             "get_qname", AXIS2_HASH_KEY_STRING);
     if (!binding->ops->get_qname && binding_impl_l)
         binding->ops->get_qname =
             binding_impl_l->binding.ops->get_qname;
 
-    binding->ops->get_interface = axis2_hash_get(methods,
+    binding->ops->get_interface = axutil_hash_get(methods,
             "get_interface", AXIS2_HASH_KEY_STRING);
     if (!binding->ops->get_interface && binding_impl_l)
         binding->ops->get_interface =
             binding_impl_l->binding.ops->get_interface;
 
-    binding->ops->get_type = axis2_hash_get(methods,
+    binding->ops->get_type = axutil_hash_get(methods,
             "get_type", AXIS2_HASH_KEY_STRING);
     if (!binding->ops->get_type && binding_impl_l)
         binding->ops->get_type =
             binding_impl_l->binding.ops->get_type;
 
-    binding->ops->get_binding_faults = axis2_hash_get(methods,
+    binding->ops->get_binding_faults = axutil_hash_get(methods,
             "get_binding_faults", AXIS2_HASH_KEY_STRING);
     if (!binding->ops->get_binding_faults && binding_impl_l)
         binding->ops->get_binding_faults =
             binding_impl_l->binding.ops->get_binding_faults;
 
-    binding->ops->get_binding_ops = axis2_hash_get(methods,
+    binding->ops->get_binding_ops = axutil_hash_get(methods,
             "get_binding_ops", AXIS2_HASH_KEY_STRING);
     if (!binding->ops->get_binding_ops && binding_impl_l)
         binding->ops->get_binding_ops =
             binding_impl_l->binding.ops->get_binding_ops;
 
-    binding->ops->to_element = axis2_hash_get(methods,
+    binding->ops->to_element = axutil_hash_get(methods,
             "to_element", AXIS2_HASH_KEY_STRING);
     if (!binding->ops->to_element && binding_impl_l)
         binding->ops->to_element =
             binding_impl_l->binding.ops->to_element;
 
-    binding->ops->get_binding_fault_element = axis2_hash_get(methods,
+    binding->ops->get_binding_fault_element = axutil_hash_get(methods,
             "get_binding_fault_element", AXIS2_HASH_KEY_STRING);
     if (!binding->ops->get_binding_fault_element && binding_impl_l)
         binding->ops->get_binding_fault_element =
             binding_impl_l->binding.ops->get_binding_fault_element;
 
-    binding->ops->get_binding_op_element = axis2_hash_get(methods,
+    binding->ops->get_binding_op_element = axutil_hash_get(methods,
             "get_binding_op_element", AXIS2_HASH_KEY_STRING);
     if (!binding->ops->get_binding_op_element && binding_impl_l)
         binding->ops->get_binding_op_element =
             binding_impl_l->binding.ops->get_binding_op_element;
 
-    binding->ops->set_interface_element = axis2_hash_get(methods,
+    binding->ops->set_interface_element = axutil_hash_get(methods,
             "set_interface_element", AXIS2_HASH_KEY_STRING);
     if (!binding->ops->set_interface_element && binding_impl_l)
         binding->ops->set_interface_element =
@@ -793,11 +793,11 @@
     const axutil_env_t *env)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     return binding_impl->f_qname;
@@ -809,11 +809,11 @@
     const axutil_env_t *env)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     return binding_impl->f_interface;
@@ -825,11 +825,11 @@
     const axutil_env_t *env)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     return binding_impl->f_type;
@@ -842,11 +842,11 @@
     const axutil_env_t *env)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     return binding_impl->f_faults;
@@ -858,11 +858,11 @@
     const axutil_env_t *env)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     return binding_impl->f_ops;
@@ -874,11 +874,11 @@
     const axutil_env_t *env)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     return &(binding_impl->binding);
@@ -894,12 +894,12 @@
     axis2_qname_t *qname)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     if (binding_impl->f_qname)
@@ -917,12 +917,12 @@
     axis2_qname_t *qname)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     if (binding_impl->f_interface_qname)
@@ -940,11 +940,11 @@
     const axutil_env_t *env)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     return binding_impl->f_interface_qname;
@@ -956,11 +956,11 @@
     const axutil_env_t *env)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     return binding_impl->f_interface;
@@ -974,12 +974,12 @@
     axis2_uri_t *type)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, type, AXIS2_FAILURE);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     if (binding_impl->f_type)
@@ -999,12 +999,12 @@
     void *fault)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, fault, AXIS2_FAILURE);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     if (!binding_impl->f_faults)
@@ -1027,11 +1027,11 @@
     const axutil_env_t *env)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     return binding_impl->f_faults;
@@ -1044,12 +1044,12 @@
     void *op)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     if (!binding_impl->f_ops)
@@ -1072,11 +1072,11 @@
     const axutil_env_t *env)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     return binding_impl->f_ops;
@@ -1092,14 +1092,14 @@
     axis2_qname_t *qname)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
     int i = 0, size = 0;
     void *fault = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, qname, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     size = axutil_array_list_size(binding_impl->f_faults, env);
@@ -1129,14 +1129,14 @@
     axis2_qname_t *qname)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
     int i = 0, size = 0;
     void *op = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, qname, NULL);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     size = axutil_array_list_size(binding_impl->f_ops, env);
@@ -1166,12 +1166,12 @@
     void *interface)
 {
     woden_binding_impl_t *binding_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, interface, AXIS2_FAILURE);
     super = WODEN_BINDING_SUPER_OBJS(binding, env);
-    binding_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING", AXIS2_HASH_KEY_STRING));
 
     if (binding_impl->f_interface)

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_element.c Fri Mar 30 11:28:18 2007
@@ -21,58 +21,58 @@
 woden_binding_element_resolve_methods(
     woden_binding_element_t *binding_element,
     const axutil_env_t *env,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
 
-    binding_element->ops->free = axis2_hash_get(methods, "free",
+    binding_element->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_element->ops->type = axis2_hash_get(methods, "type",
+    binding_element->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
     binding_element->ops->set_qname =
-        axis2_hash_get(methods, "set_qname",
+        axutil_hash_get(methods, "set_qname",
                 AXIS2_HASH_KEY_STRING);
 
     binding_element->ops->get_qname =
-        axis2_hash_get(methods, "get_qname",
+        axutil_hash_get(methods, "get_qname",
                 AXIS2_HASH_KEY_STRING);
 
     binding_element->ops->set_interface_qname =
-        axis2_hash_get(methods, "set_interface_qname",
+        axutil_hash_get(methods, "set_interface_qname",
                 AXIS2_HASH_KEY_STRING);
 
     binding_element->ops->get_interface_qname =
-        axis2_hash_get(methods, "get_interface_qname",
+        axutil_hash_get(methods, "get_interface_qname",
                 AXIS2_HASH_KEY_STRING);
 
     binding_element->ops->get_interface_element =
-        axis2_hash_get(methods, "get_interface_element",
+        axutil_hash_get(methods, "get_interface_element",
                 AXIS2_HASH_KEY_STRING);
 
     binding_element->ops->set_type =
-        axis2_hash_get(methods, "set_type",
+        axutil_hash_get(methods, "set_type",
                 AXIS2_HASH_KEY_STRING);
 
     binding_element->ops->get_type =
-        axis2_hash_get(methods, "get_type",
+        axutil_hash_get(methods, "get_type",
                 AXIS2_HASH_KEY_STRING);
 
     binding_element->ops->add_binding_fault_element =
-        axis2_hash_get(methods, "add_binding_fault_element",
+        axutil_hash_get(methods, "add_binding_fault_element",
                 AXIS2_HASH_KEY_STRING);
 
     binding_element->ops->get_binding_fault_elements =
-        axis2_hash_get(methods, "get_binding_fault_elements",
+        axutil_hash_get(methods, "get_binding_fault_elements",
                 AXIS2_HASH_KEY_STRING);
 
     binding_element->ops->add_binding_op_element =
-        axis2_hash_get(methods, "add_binding_op_element",
+        axutil_hash_get(methods, "add_binding_op_element",
                 AXIS2_HASH_KEY_STRING);
 
     binding_element->ops->get_binding_op_elements =
-        axis2_hash_get(methods, "get_binding_op_elements",
+        axutil_hash_get(methods, "get_binding_op_elements",
                 AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_fault_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_fault_ref.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_fault_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_fault_ref.c Fri Mar 30 11:28:18 2007
@@ -38,8 +38,8 @@
     woden_binding_fault_ref_t binding_fault_ref;
     woden_nested_configurable_t *nested_configurable;
     woden_obj_types_t obj_type;
-    axis2_hash_t *super;
-    axis2_hash_t *methods;
+    axutil_hash_t *super;
+    axutil_hash_t *methods;
     axis2_qname_t *f_ref;
     void *f_direction;
     void *f_msg_label;
@@ -53,7 +53,7 @@
     void *binding_fault_ref,
     const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_binding_fault_ref_super_objs(
     void *binding_fault_ref,
     const axutil_env_t *env);
@@ -486,44 +486,44 @@
     binding_fault_ref_impl->binding_fault_ref.ops->set_interface_fault_ref =
         woden_binding_fault_ref_set_interface_fault_ref;
 
-    binding_fault_ref_impl->methods = axis2_hash_make(env);
+    binding_fault_ref_impl->methods = axutil_hash_make(env);
     if (!binding_fault_ref_impl->methods)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_fault_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+    axutil_hash_set(binding_fault_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             woden_binding_fault_ref_free);
-    axis2_hash_set(binding_fault_ref_impl->methods, "super_objs",
+    axutil_hash_set(binding_fault_ref_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, woden_binding_fault_ref_super_objs);
-    axis2_hash_set(binding_fault_ref_impl->methods, "type",
+    axutil_hash_set(binding_fault_ref_impl->methods, "type",
             AXIS2_HASH_KEY_STRING, woden_binding_fault_ref_type);
 
-    axis2_hash_set(binding_fault_ref_impl->methods, "get_interface_fault_ref",
+    axutil_hash_set(binding_fault_ref_impl->methods, "get_interface_fault_ref",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_ref_get_interface_fault_ref);
-    axis2_hash_set(binding_fault_ref_impl->methods, "to_element",
+    axutil_hash_set(binding_fault_ref_impl->methods, "to_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_ref_to_element);
-    axis2_hash_set(binding_fault_ref_impl->methods, "set_ref",
+    axutil_hash_set(binding_fault_ref_impl->methods, "set_ref",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_ref_set_ref);
-    axis2_hash_set(binding_fault_ref_impl->methods, "get_ref",
+    axutil_hash_set(binding_fault_ref_impl->methods, "get_ref",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_ref_get_ref);
-    axis2_hash_set(binding_fault_ref_impl->methods, "get_interface_fault_ref_element",
+    axutil_hash_set(binding_fault_ref_impl->methods, "get_interface_fault_ref_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_ref_get_interface_fault_ref_element);
-    axis2_hash_set(binding_fault_ref_impl->methods, "set_msg_label",
+    axutil_hash_set(binding_fault_ref_impl->methods, "set_msg_label",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_ref_set_msg_label);
-    axis2_hash_set(binding_fault_ref_impl->methods, "get_msg_label",
+    axutil_hash_set(binding_fault_ref_impl->methods, "get_msg_label",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_ref_get_msg_label);
-    axis2_hash_set(binding_fault_ref_impl->methods, "set_interface_fault_ref_element",
+    axutil_hash_set(binding_fault_ref_impl->methods, "set_interface_fault_ref_element",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_ref_set_interface_fault_ref_element);
-    axis2_hash_set(binding_fault_ref_impl->methods, "set_interface_fault_ref",
+    axutil_hash_set(binding_fault_ref_impl->methods, "set_interface_fault_ref",
             AXIS2_HASH_KEY_STRING,
             woden_binding_fault_ref_set_interface_fault_ref);
 
@@ -541,21 +541,21 @@
 
     binding_fault_ref_impl->nested_configurable = woden_nested_configurable_create(env);
 
-    binding_fault_ref_impl->super = axis2_hash_make(env);
+    binding_fault_ref_impl->super = axutil_hash_make(env);
     if (!binding_fault_ref_impl->super)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(binding_fault_ref_impl->super, "WODEN_BINDING_FAULT_REF",
+    axutil_hash_set(binding_fault_ref_impl->super, "WODEN_BINDING_FAULT_REF",
             AXIS2_HASH_KEY_STRING,
             &(binding_fault_ref_impl->binding_fault_ref));
-    axis2_hash_set(binding_fault_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
+    axutil_hash_set(binding_fault_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING,
             binding_fault_ref_impl->nested_configurable);
     configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
                 binding_fault_ref_impl->nested_configurable, env);
-    axis2_hash_set(binding_fault_ref_impl->super, "WODEN_CONFIGURABLE",
+    axutil_hash_set(binding_fault_ref_impl->super, "WODEN_CONFIGURABLE",
             AXIS2_HASH_KEY_STRING, configurable);
 
     return &(binding_fault_ref_impl->binding_fault_ref);
@@ -702,13 +702,13 @@
 
     if (binding_fault_ref_impl->super)
     {
-        axis2_hash_free(binding_fault_ref_impl->super, env);
+        axutil_hash_free(binding_fault_ref_impl->super, env);
         binding_fault_ref_impl->super = NULL;
     }
 
     if (binding_fault_ref_impl->methods)
     {
-        axis2_hash_free(binding_fault_ref_impl->methods, env);
+        axutil_hash_free(binding_fault_ref_impl->methods, env);
         binding_fault_ref_impl->methods = NULL;
     }
 
@@ -734,7 +734,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_binding_fault_ref_super_objs(
     void *binding_fault_ref,
     const axutil_env_t *env)
@@ -778,7 +778,7 @@
     woden_binding_fault_ref_t *binding_fault_ref,
     const axutil_env_t *env,
     woden_binding_fault_ref_t *binding_fault_ref_impl,
-    axis2_hash_t *methods)
+    axutil_hash_t *methods)
 {
     woden_binding_fault_ref_impl_t *binding_fault_ref_impl_l = NULL;
 
@@ -786,32 +786,32 @@
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     binding_fault_ref_impl_l = INTF_TO_IMPL(binding_fault_ref_impl);
 
-    binding_fault_ref->ops->free = axis2_hash_get(methods, "free",
+    binding_fault_ref->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    binding_fault_ref->ops->super_objs = axis2_hash_get(methods, "super_objs",
+    binding_fault_ref->ops->super_objs = axutil_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    binding_fault_ref->ops->type = axis2_hash_get(methods, "type",
+    binding_fault_ref->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
 
-    binding_fault_ref->ops->get_interface_fault_ref = axis2_hash_get(methods,
+    binding_fault_ref->ops->get_interface_fault_ref = axutil_hash_get(methods,
             "get_interface_fault_ref", AXIS2_HASH_KEY_STRING);
     if (!binding_fault_ref->ops->get_interface_fault_ref && binding_fault_ref_impl_l)
         binding_fault_ref->ops->get_interface_fault_ref =
             binding_fault_ref_impl_l->binding_fault_ref.ops->get_interface_fault_ref;
 
-    binding_fault_ref->ops->to_element = axis2_hash_get(methods,
+    binding_fault_ref->ops->to_element = axutil_hash_get(methods,
             "to_element", AXIS2_HASH_KEY_STRING);
     if (!binding_fault_ref->ops->to_element && binding_fault_ref_impl_l)
         binding_fault_ref->ops->to_element =
             binding_fault_ref_impl_l->binding_fault_ref.ops->to_element;
 
-    binding_fault_ref->ops->set_interface_fault_ref_element = axis2_hash_get(methods,
+    binding_fault_ref->ops->set_interface_fault_ref_element = axutil_hash_get(methods,
             "set_interface_fault_ref_element", AXIS2_HASH_KEY_STRING);
     if (!binding_fault_ref->ops->set_interface_fault_ref_element && binding_fault_ref_impl_l)
         binding_fault_ref->ops->set_interface_fault_ref_element =
             binding_fault_ref_impl_l->binding_fault_ref.ops->set_interface_fault_ref_element;
 
-    binding_fault_ref->ops->set_interface_fault_ref = axis2_hash_get(methods,
+    binding_fault_ref->ops->set_interface_fault_ref = axutil_hash_get(methods,
             "set_interface_fault_ref", AXIS2_HASH_KEY_STRING);
     if (!binding_fault_ref->ops->set_interface_fault_ref && binding_fault_ref_impl_l)
         binding_fault_ref->ops->set_interface_fault_ref =
@@ -829,11 +829,11 @@
     const axutil_env_t *env)
 {
     woden_binding_fault_ref_impl_t *binding_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_FAULT_REF_SUPER_OBJS(binding_fault_ref, env);
-    binding_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     return binding_fault_ref_impl->f_interface_fault_ref;
@@ -845,11 +845,11 @@
     const axutil_env_t *env)
 {
     woden_binding_fault_ref_impl_t *binding_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_FAULT_REF_SUPER_OBJS(binding_fault_ref, env);
-    binding_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     return binding_fault_ref_impl->f_direction;
@@ -860,11 +860,11 @@
     const axutil_env_t *env)
 {
     woden_binding_fault_ref_impl_t *binding_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_FAULT_REF_SUPER_OBJS(binding_fault_ref, env);
-    binding_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     return &(binding_fault_ref_impl->binding_fault_ref);
@@ -880,12 +880,12 @@
     axis2_qname_t *fault_qname)
 {
     woden_binding_fault_ref_impl_t *binding_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, fault_qname, AXIS2_FAILURE);
     super = WODEN_BINDING_FAULT_REF_SUPER_OBJS(binding_fault_ref, env);
-    binding_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     if (binding_fault_ref_impl->f_ref)
@@ -902,11 +902,11 @@
     const axutil_env_t *env)
 {
     woden_binding_fault_ref_impl_t *binding_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_FAULT_REF_SUPER_OBJS(binding_fault_ref, env);
-    binding_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     return binding_fault_ref_impl->f_ref;
@@ -918,11 +918,11 @@
     const axutil_env_t *env)
 {
     woden_binding_fault_ref_impl_t *binding_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_FAULT_REF_SUPER_OBJS(binding_fault_ref, env);
-    binding_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     return NULL;
@@ -935,12 +935,12 @@
     void *msg_label)
 {
     woden_binding_fault_ref_impl_t *binding_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg_label, AXIS2_FAILURE);
     super = WODEN_BINDING_FAULT_REF_SUPER_OBJS(binding_fault_ref, env);
-    binding_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     if (!binding_fault_ref_impl->f_msg_label)
@@ -959,11 +959,11 @@
     const axutil_env_t *env)
 {
     woden_binding_fault_ref_impl_t *binding_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_BINDING_FAULT_REF_SUPER_OBJS(binding_fault_ref, env);
-    binding_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     return binding_fault_ref_impl->f_msg_label;
@@ -979,12 +979,12 @@
     void *fault_ref)
 {
     woden_binding_fault_ref_impl_t *binding_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, fault_ref, AXIS2_FAILURE);
     super = WODEN_BINDING_FAULT_REF_SUPER_OBJS(binding_fault_ref, env);
-    binding_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     if (!binding_fault_ref_impl->f_interface_fault_ref)
@@ -1003,12 +1003,12 @@
     void *fault_ref)
 {
     woden_binding_fault_ref_impl_t *binding_fault_ref_impl = NULL;
-    axis2_hash_t *super = NULL;
+    axutil_hash_t *super = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, fault_ref, AXIS2_FAILURE);
     super = WODEN_BINDING_FAULT_REF_SUPER_OBJS(binding_fault_ref, env);
-    binding_fault_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+    binding_fault_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_BINDING_FAULT_REF", AXIS2_HASH_KEY_STRING));
 
     if (!binding_fault_ref_impl->f_interface_fault_ref)

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

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_component_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_component_exts.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_component_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_component_exts.c Fri Mar 30 11:28:18 2007
@@ -18,7 +18,7 @@
 #include <woden_component_exts.h>
 #include <woden_wsdl_element.h>
 #include <axis2_uri.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
 
 typedef struct woden_component_exts_impl woden_component_exts_impl_t;
 
@@ -125,25 +125,25 @@
 woden_component_exts_resolve_methods(
     woden_component_exts_t *component_exts,
     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);
 
     component_exts->ops = AXIS2_MALLOC(env->allocator,
             sizeof(woden_component_exts_ops_t));
-    component_exts->ops->free = axis2_hash_get(methods, "free",
+    component_exts->ops->free = axutil_hash_get(methods, "free",
             AXIS2_HASH_KEY_STRING);
-    component_exts->ops->get_parent_element = axis2_hash_get(methods,
+    component_exts->ops->get_parent_element = axutil_hash_get(methods,
             "get_parent_element", AXIS2_HASH_KEY_STRING);
-    component_exts->ops->to_component_exts_free = axis2_hash_get(methods,
+    component_exts->ops->to_component_exts_free = axutil_hash_get(methods,
             "to_component_exts_free", AXIS2_HASH_KEY_STRING);
-    component_exts->ops->type = axis2_hash_get(methods, "type",
+    component_exts->ops->type = axutil_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
-    component_exts->ops->init = axis2_hash_get(methods,
+    component_exts->ops->init = axutil_hash_get(methods,
             "init", AXIS2_HASH_KEY_STRING);
     ;
-    component_exts->ops->get_namespace = axis2_hash_get(methods,
+    component_exts->ops->get_namespace = axutil_hash_get(methods,
             "get_namespace", AXIS2_HASH_KEY_STRING);
 
     return AXIS2_SUCCESS;



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


Mime
View raw message