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

svn commit: r524225 [13/22] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/src/util/ include/ modules/core/addr/ modules/core/clientapi/ modules/core/context/ modules...

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_msg_ref.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_msg_ref.c Fri Mar 30 11:28:18 2007
@@ -37,8 +37,8 @@
       woden_wsdl10_msg_ref_t msg_ref;
       woden_nested_configurable_t *nested_configurable;
       woden_obj_types_t obj_type;
-      axis2_hash_t *super;
-      axis2_hash_t *methods;
+      axutil_hash_t *super;
+      axutil_hash_t *methods;
 
       axis2_qname_t *f_qname;
       void *f_part;
@@ -51,7 +51,7 @@
       void *msg_ref,
       const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_msg_ref_super_objs(
       void *msg_ref,
       const axutil_env_t *env);
@@ -458,32 +458,32 @@
       msg_ref_impl->msg_ref.ops->to_element =
 	    woden_wsdl10_msg_ref_to_element;
 
-      msg_ref_impl->methods = axis2_hash_make(env);
+      msg_ref_impl->methods = axutil_hash_make(env);
       if (!msg_ref_impl->methods)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(msg_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+      axutil_hash_set(msg_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_msg_ref_free);
-      axis2_hash_set(msg_ref_impl->methods, "super_objs",
+      axutil_hash_set(msg_ref_impl->methods, "super_objs",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_msg_ref_super_objs);
-      axis2_hash_set(msg_ref_impl->methods, "type",
+      axutil_hash_set(msg_ref_impl->methods, "type",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_msg_ref_type);
 
-      axis2_hash_set(msg_ref_impl->methods, "get_qname",
+      axutil_hash_set(msg_ref_impl->methods, "get_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_msg_ref_get_qname);
-      axis2_hash_set(msg_ref_impl->methods, "to_element",
+      axutil_hash_set(msg_ref_impl->methods, "to_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_msg_ref_to_element);
-      axis2_hash_set(msg_ref_impl->methods, "set_qname",
+      axutil_hash_set(msg_ref_impl->methods, "set_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_msg_ref_set_qname);
-      axis2_hash_set(msg_ref_impl->methods, "set_part",
+      axutil_hash_set(msg_ref_impl->methods, "set_part",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_msg_ref_set_part);
-      axis2_hash_set(msg_ref_impl->methods, "get_part",
+      axutil_hash_set(msg_ref_impl->methods, "get_part",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_msg_ref_get_part);
 
@@ -501,21 +501,21 @@
 
       msg_ref_impl->nested_configurable = woden_nested_configurable_create(env);
 
-      msg_ref_impl->super = axis2_hash_make(env);
+      msg_ref_impl->super = axutil_hash_make(env);
       if (!msg_ref_impl->super)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(msg_ref_impl->super, "WODEN_WSDL10_MSG_REF",
+      axutil_hash_set(msg_ref_impl->super, "WODEN_WSDL10_MSG_REF",
 		     AXIS2_HASH_KEY_STRING,
 		     &(msg_ref_impl->msg_ref));
-      axis2_hash_set(msg_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
+      axutil_hash_set(msg_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
 		     AXIS2_HASH_KEY_STRING,
 		     msg_ref_impl->nested_configurable);
       configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
 	    msg_ref_impl->nested_configurable, env);
-      axis2_hash_set(msg_ref_impl->super, "WODEN_CONFIGURABLE",
+      axutil_hash_set(msg_ref_impl->super, "WODEN_CONFIGURABLE",
 		     AXIS2_HASH_KEY_STRING, configurable);
 
       return &(msg_ref_impl->msg_ref);
@@ -649,13 +649,13 @@
 
       if (msg_ref_impl->super)
       {
-	    axis2_hash_free(msg_ref_impl->super, env);
+	    axutil_hash_free(msg_ref_impl->super, env);
 	    msg_ref_impl->super = NULL;
       }
 
       if (msg_ref_impl->methods)
       {
-	    axis2_hash_free(msg_ref_impl->methods, env);
+	    axutil_hash_free(msg_ref_impl->methods, env);
 	    msg_ref_impl->methods = NULL;
       }
 
@@ -683,7 +683,7 @@
       return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_msg_ref_super_objs(
       void *msg_ref,
       const axutil_env_t *env)
@@ -727,7 +727,7 @@
       woden_wsdl10_msg_ref_t *msg_ref,
       const axutil_env_t *env,
       woden_wsdl10_msg_ref_t *msg_ref_impl,
-      axis2_hash_t *methods)
+      axutil_hash_t *methods)
 {
       woden_wsdl10_msg_ref_impl_t *msg_ref_impl_l = NULL;
 
@@ -735,20 +735,20 @@
       AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
       msg_ref_impl_l = INTF_TO_IMPL(msg_ref_impl);
 
-      msg_ref->ops->free = axis2_hash_get(methods, "free",
+      msg_ref->ops->free = axutil_hash_get(methods, "free",
 					  AXIS2_HASH_KEY_STRING);
-      msg_ref->ops->super_objs = axis2_hash_get(methods, "super_objs",
+      msg_ref->ops->super_objs = axutil_hash_get(methods, "super_objs",
 						AXIS2_HASH_KEY_STRING);
-      msg_ref->ops->type = axis2_hash_get(methods, "type",
+      msg_ref->ops->type = axutil_hash_get(methods, "type",
 					  AXIS2_HASH_KEY_STRING);
 
-      msg_ref->ops->get_qname = axis2_hash_get(methods,
+      msg_ref->ops->get_qname = axutil_hash_get(methods,
 					       "get_qname", AXIS2_HASH_KEY_STRING);
       if (!msg_ref->ops->get_qname && msg_ref_impl_l)
 	    msg_ref->ops->get_qname =
 		  msg_ref_impl_l->msg_ref.ops->get_qname;
 
-      msg_ref->ops->to_element = axis2_hash_get(methods,
+      msg_ref->ops->to_element = axutil_hash_get(methods,
 						"to_element", AXIS2_HASH_KEY_STRING);
       if (!msg_ref->ops->to_element && msg_ref_impl_l)
 	    msg_ref->ops->to_element =
@@ -767,11 +767,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_msg_ref_impl_t *msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_MSG_REF_SUPER_OBJS(msg_ref, env);
-      msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						 "WODEN_WSDL10_MSG_REF", 
 						 AXIS2_HASH_KEY_STRING));
 
@@ -784,11 +784,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_msg_ref_impl_t *msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_MSG_REF_SUPER_OBJS(msg_ref, env);
-      msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						 "WODEN_WSDL10_MSG_REF", 
 						 AXIS2_HASH_KEY_STRING));
 
@@ -806,12 +806,12 @@
       axis2_qname_t *qname)
 {
       woden_wsdl10_msg_ref_impl_t *msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
       super = WODEN_WSDL10_MSG_REF_SUPER_OBJS(msg_ref, env);
-      msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						 "WODEN_WSDL10_MSG_REF", 
 						 AXIS2_HASH_KEY_STRING));
 
@@ -832,12 +832,12 @@
       void *part)
 {
       woden_wsdl10_msg_ref_impl_t *msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, part, AXIS2_FAILURE);
       super = WODEN_WSDL10_MSG_REF_SUPER_OBJS(msg_ref, env);
-      msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						 "WODEN_WSDL10_MSG_REF", 
 						 AXIS2_HASH_KEY_STRING));
 
@@ -857,11 +857,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_msg_ref_impl_t *msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_MSG_REF_SUPER_OBJS(msg_ref, env);
-      msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						 "WODEN_WSDL10_MSG_REF",
 						 AXIS2_HASH_KEY_STRING));
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c Fri Mar 30 11:28:18 2007
@@ -38,8 +38,8 @@
       woden_wsdl10_part_t part;
       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_qname;
       void *f_element_decl;
@@ -54,7 +54,7 @@
       void *part,
       const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_part_super_objs(
       void *part,
       const axutil_env_t *env);
@@ -450,44 +450,44 @@
       part_impl->part.ops->set_types =
 	    woden_wsdl10_part_set_types;
 
-      part_impl->methods = axis2_hash_make(env);
+      part_impl->methods = axutil_hash_make(env);
       if (!part_impl->methods)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(part_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+      axutil_hash_set(part_impl->methods, "free", AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_part_free);
-      axis2_hash_set(part_impl->methods, "super_objs",
+      axutil_hash_set(part_impl->methods, "super_objs",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_part_super_objs);
-      axis2_hash_set(part_impl->methods, "type",
+      axutil_hash_set(part_impl->methods, "type",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_part_type);
 
-      axis2_hash_set(part_impl->methods, "get_qname",
+      axutil_hash_set(part_impl->methods, "get_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_part_get_qname);
-      axis2_hash_set(part_impl->methods, "get_element_declaration",
+      axutil_hash_set(part_impl->methods, "get_element_declaration",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_part_get_element_declaration);
-      axis2_hash_set(part_impl->methods, "to_element",
+      axutil_hash_set(part_impl->methods, "to_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_part_to_element);
-      axis2_hash_set(part_impl->methods, "set_element_qname",
+      axutil_hash_set(part_impl->methods, "set_element_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_part_set_element_qname);
-      axis2_hash_set(part_impl->methods, "get_element_qname",
+      axutil_hash_set(part_impl->methods, "get_element_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_part_get_element_qname);
-      axis2_hash_set(part_impl->methods, "get_element",
+      axutil_hash_set(part_impl->methods, "get_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_part_get_element);
-      axis2_hash_set(part_impl->methods, "set_qname",
+      axutil_hash_set(part_impl->methods, "set_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_part_set_qname);
-      axis2_hash_set(part_impl->methods, "set_element_declaration",
+      axutil_hash_set(part_impl->methods, "set_element_declaration",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_part_set_element_declaration);
-      axis2_hash_set(part_impl->methods, "set_types",
+      axutil_hash_set(part_impl->methods, "set_types",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_part_set_types);
 
@@ -505,21 +505,21 @@
 
       part_impl->nested_configurable = woden_nested_configurable_create(env);
 
-      part_impl->super = axis2_hash_make(env);
+      part_impl->super = axutil_hash_make(env);
       if (!part_impl->super)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(part_impl->super, "WODEN_WSDL10_PART",
+      axutil_hash_set(part_impl->super, "WODEN_WSDL10_PART",
 		     AXIS2_HASH_KEY_STRING,
 		     &(part_impl->part));
-      axis2_hash_set(part_impl->super, "WODEN_NESTED_CONFIGURABLE",
+      axutil_hash_set(part_impl->super, "WODEN_NESTED_CONFIGURABLE",
 		     AXIS2_HASH_KEY_STRING,
 		     part_impl->nested_configurable);
       configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
 	    part_impl->nested_configurable, env);
-      axis2_hash_set(part_impl->super, "WODEN_CONFIGURABLE",
+      axutil_hash_set(part_impl->super, "WODEN_CONFIGURABLE",
 		     AXIS2_HASH_KEY_STRING, configurable);
 
       return &(part_impl->part);
@@ -653,13 +653,13 @@
 
       if (part_impl->super)
       {
-	    axis2_hash_free(part_impl->super, env);
+	    axutil_hash_free(part_impl->super, env);
 	    part_impl->super = NULL;
       }
 
       if (part_impl->methods)
       {
-	    axis2_hash_free(part_impl->methods, env);
+	    axutil_hash_free(part_impl->methods, env);
 	    part_impl->methods = NULL;
       }
 
@@ -686,7 +686,7 @@
       return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_part_super_objs(
       void *part,
       const axutil_env_t *env)
@@ -730,7 +730,7 @@
       woden_wsdl10_part_t *part,
       const axutil_env_t *env,
       woden_wsdl10_part_t *part_impl,
-      axis2_hash_t *methods)
+      axutil_hash_t *methods)
 {
       woden_wsdl10_part_impl_t *part_impl_l = NULL;
 
@@ -738,38 +738,38 @@
       AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
       part_impl_l = INTF_TO_IMPL(part_impl);
 
-      part->ops->free = axis2_hash_get(methods, "free",
+      part->ops->free = axutil_hash_get(methods, "free",
 				       AXIS2_HASH_KEY_STRING);
-      part->ops->super_objs = axis2_hash_get(methods, "super_objs",
+      part->ops->super_objs = axutil_hash_get(methods, "super_objs",
 					     AXIS2_HASH_KEY_STRING);
-      part->ops->type = axis2_hash_get(methods, "type",
+      part->ops->type = axutil_hash_get(methods, "type",
 				       AXIS2_HASH_KEY_STRING);
 
-      part->ops->get_qname = axis2_hash_get(methods,
+      part->ops->get_qname = axutil_hash_get(methods,
 					    "get_qname", AXIS2_HASH_KEY_STRING);
       if (!part->ops->get_qname && part_impl_l)
 	    part->ops->get_qname =
 		  part_impl_l->part.ops->get_qname;
 
-      part->ops->get_element_declaration = axis2_hash_get(methods,
+      part->ops->get_element_declaration = axutil_hash_get(methods,
 							  "get_element_declaration", AXIS2_HASH_KEY_STRING);
       if (!part->ops->get_element_declaration && part_impl_l)
 	    part->ops->get_element_declaration =
 		  part_impl_l->part.ops->get_element_declaration;
 
-      part->ops->to_element = axis2_hash_get(methods,
+      part->ops->to_element = axutil_hash_get(methods,
 					     "to_element", AXIS2_HASH_KEY_STRING);
       if (!part->ops->to_element && part_impl_l)
 	    part->ops->to_element =
 		  part_impl_l->part.ops->to_element;
 
-      part->ops->set_element_declaration = axis2_hash_get(methods,
+      part->ops->set_element_declaration = axutil_hash_get(methods,
 							  "set_element_declaration", AXIS2_HASH_KEY_STRING);
       if (!part->ops->set_element_declaration && part_impl_l)
 	    part->ops->set_element_declaration =
 		  part_impl_l->part.ops->set_element_declaration;
 
-      part->ops->set_types = axis2_hash_get(methods,
+      part->ops->set_types = axutil_hash_get(methods,
 					    "set_types", AXIS2_HASH_KEY_STRING);
       if (!part->ops->set_types && part_impl_l)
 	    part->ops->set_types =
@@ -788,11 +788,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_part_impl_t *part_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_PART_SUPER_OBJS(part, env);
-      part_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      part_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_PART", AXIS2_HASH_KEY_STRING));
 
       return part_impl->f_qname;
@@ -804,11 +804,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_part_impl_t *part_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_PART_SUPER_OBJS(part, env);
-      part_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      part_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_PART", AXIS2_HASH_KEY_STRING));
 
       return part_impl->f_element_decl;
@@ -820,11 +820,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_part_impl_t *part_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_PART_SUPER_OBJS(part, env);
-      part_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      part_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_PART", AXIS2_HASH_KEY_STRING));
 
       return &(part_impl->part);
@@ -841,12 +841,12 @@
       axis2_qname_t *qname)
 {
       woden_wsdl10_part_impl_t *part_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
       super = WODEN_WSDL10_PART_SUPER_OBJS(part, env);
-      part_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      part_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_PART", AXIS2_HASH_KEY_STRING));
 
       if (part_impl->f_qname)
@@ -867,12 +867,12 @@
       axis2_qname_t *element)
 {
       woden_wsdl10_part_impl_t *part_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, element, AXIS2_FAILURE);
       super = WODEN_WSDL10_PART_SUPER_OBJS(part, env);
-      part_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      part_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_PART", AXIS2_HASH_KEY_STRING));
 
       if (part_impl->f_element_qname)
@@ -889,11 +889,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_part_impl_t *part_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_PART_SUPER_OBJS(part, env);
-      part_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      part_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_PART", AXIS2_HASH_KEY_STRING));
 
       return part_impl->f_element_qname;
@@ -905,12 +905,12 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_part_impl_t *part_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
       xml_schema_element_t *xse = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_PART_SUPER_OBJS(part, env);
-      part_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      part_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_PART", AXIS2_HASH_KEY_STRING));
 
       if (part_impl->f_types)
@@ -934,12 +934,12 @@
       void *element)
 {
       woden_wsdl10_part_impl_t *part_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, element, AXIS2_FAILURE);
       super = WODEN_WSDL10_PART_SUPER_OBJS(part, env);
-      part_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      part_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_PART", AXIS2_HASH_KEY_STRING));
 
       if (!part_impl->f_element_decl)
@@ -958,12 +958,12 @@
       void *types)
 {
       woden_wsdl10_part_impl_t *part_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, types, AXIS2_FAILURE);
       super = WODEN_WSDL10_PART_SUPER_OBJS(part, env);
-      part_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      part_impl = INTF_TO_IMPL(axutil_hash_get(super,
 					      "WODEN_WSDL10_PART", AXIS2_HASH_KEY_STRING));
 
       if (!part_impl->f_types)

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_msg_ref.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_msg_ref.c Fri Mar 30 11:28:18 2007
@@ -38,8 +38,8 @@
       woden_wsdl10_binding_msg_ref_t binding_msg_ref;
       woden_nested_configurable_t *nested_configurable;
       woden_obj_types_t obj_type;
-      axis2_hash_t *super;
-      axis2_hash_t *methods;
+      axutil_hash_t *super;
+      axutil_hash_t *methods;
       void *f_direction;
       axis2_qname_t *f_qname;
       void *f_interface_msg_ref;
@@ -52,7 +52,7 @@
       void *binding_msg_ref,
       const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_binding_msg_ref_super_objs(
       void *binding_msg_ref,
       const axutil_env_t *env);
@@ -499,38 +499,38 @@
       binding_msg_ref_impl->binding_msg_ref.ops->set_interface_msg_ref_element =
 	    woden_wsdl10_binding_msg_ref_set_interface_msg_ref_element;
 
-      binding_msg_ref_impl->methods = axis2_hash_make(env);
+      binding_msg_ref_impl->methods = axutil_hash_make(env);
       if (!binding_msg_ref_impl->methods)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(binding_msg_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+      axutil_hash_set(binding_msg_ref_impl->methods, "free", AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_msg_ref_free);
-      axis2_hash_set(binding_msg_ref_impl->methods, "super_objs",
+      axutil_hash_set(binding_msg_ref_impl->methods, "super_objs",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_binding_msg_ref_super_objs);
-      axis2_hash_set(binding_msg_ref_impl->methods, "type",
+      axutil_hash_set(binding_msg_ref_impl->methods, "type",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_binding_msg_ref_type);
 
-      axis2_hash_set(binding_msg_ref_impl->methods, "get_interface_msg_ref",
+      axutil_hash_set(binding_msg_ref_impl->methods, "get_interface_msg_ref",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_msg_ref_get_interface_msg_ref);
-      axis2_hash_set(binding_msg_ref_impl->methods, "to_element",
+      axutil_hash_set(binding_msg_ref_impl->methods, "to_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_msg_ref_to_element);
-      axis2_hash_set(binding_msg_ref_impl->methods, "set_direction",
+      axutil_hash_set(binding_msg_ref_impl->methods, "set_direction",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_msg_ref_set_direction);
-      axis2_hash_set(binding_msg_ref_impl->methods, "get_direction",
+      axutil_hash_set(binding_msg_ref_impl->methods, "get_direction",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_msg_ref_get_direction);
-      axis2_hash_set(binding_msg_ref_impl->methods, "set_qname",
+      axutil_hash_set(binding_msg_ref_impl->methods, "set_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_msg_ref_set_qname);
-      axis2_hash_set(binding_msg_ref_impl->methods, "get_qname",
+      axutil_hash_set(binding_msg_ref_impl->methods, "get_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_msg_ref_get_qname);
-      axis2_hash_set(binding_msg_ref_impl->methods, "set_interface_msg_ref_element",
+      axutil_hash_set(binding_msg_ref_impl->methods, "set_interface_msg_ref_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_msg_ref_set_interface_msg_ref_element);
 
@@ -548,21 +548,21 @@
 
       binding_msg_ref_impl->nested_configurable = woden_nested_configurable_create(env);
 
-      binding_msg_ref_impl->super = axis2_hash_make(env);
+      binding_msg_ref_impl->super = axutil_hash_make(env);
       if (!binding_msg_ref_impl->super)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(binding_msg_ref_impl->super, "WODEN_WSDL10_BINDING_MSG_REF",
+      axutil_hash_set(binding_msg_ref_impl->super, "WODEN_WSDL10_BINDING_MSG_REF",
 		     AXIS2_HASH_KEY_STRING,
 		     &(binding_msg_ref_impl->binding_msg_ref));
-      axis2_hash_set(binding_msg_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
+      axutil_hash_set(binding_msg_ref_impl->super, "WODEN_NESTED_CONFIGURABLE",
 		     AXIS2_HASH_KEY_STRING,
 		     binding_msg_ref_impl->nested_configurable);
       configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
 	    binding_msg_ref_impl->nested_configurable, env);
-      axis2_hash_set(binding_msg_ref_impl->super, "WODEN_CONFIGURABLE",
+      axutil_hash_set(binding_msg_ref_impl->super, "WODEN_CONFIGURABLE",
 		     AXIS2_HASH_KEY_STRING, configurable);
 
       return &(binding_msg_ref_impl->binding_msg_ref);
@@ -711,13 +711,13 @@
 
       if (binding_msg_ref_impl->super)
       {
-	    axis2_hash_free(binding_msg_ref_impl->super, env);
+	    axutil_hash_free(binding_msg_ref_impl->super, env);
 	    binding_msg_ref_impl->super = NULL;
       }
 
       if (binding_msg_ref_impl->methods)
       {
-	    axis2_hash_free(binding_msg_ref_impl->methods, env);
+	    axutil_hash_free(binding_msg_ref_impl->methods, env);
 	    binding_msg_ref_impl->methods = NULL;
       }
 
@@ -743,7 +743,7 @@
       return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_binding_msg_ref_super_objs(
       void *binding_msg_ref,
       const axutil_env_t *env)
@@ -787,7 +787,7 @@
       woden_wsdl10_binding_msg_ref_t *binding_msg_ref,
       const axutil_env_t *env,
       woden_wsdl10_binding_msg_ref_t *binding_msg_ref_impl,
-      axis2_hash_t *methods)
+      axutil_hash_t *methods)
 {
       woden_wsdl10_binding_msg_ref_impl_t *binding_msg_ref_impl_l = NULL;
 
@@ -795,26 +795,26 @@
       AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
       binding_msg_ref_impl_l = INTF_TO_IMPL(binding_msg_ref_impl);
 
-      binding_msg_ref->ops->free = axis2_hash_get(methods, "free",
+      binding_msg_ref->ops->free = axutil_hash_get(methods, "free",
 						  AXIS2_HASH_KEY_STRING);
-      binding_msg_ref->ops->super_objs = axis2_hash_get(methods, "super_objs",
+      binding_msg_ref->ops->super_objs = axutil_hash_get(methods, "super_objs",
 							AXIS2_HASH_KEY_STRING);
-      binding_msg_ref->ops->type = axis2_hash_get(methods, "type",
+      binding_msg_ref->ops->type = axutil_hash_get(methods, "type",
 						  AXIS2_HASH_KEY_STRING);
 
-      binding_msg_ref->ops->get_interface_msg_ref = axis2_hash_get(methods,
+      binding_msg_ref->ops->get_interface_msg_ref = axutil_hash_get(methods,
 								   "get_interface_msg_ref", AXIS2_HASH_KEY_STRING);
       if (!binding_msg_ref->ops->get_interface_msg_ref && binding_msg_ref_impl_l)
 	    binding_msg_ref->ops->get_interface_msg_ref =
 		  binding_msg_ref_impl_l->binding_msg_ref.ops->get_interface_msg_ref;
 
-      binding_msg_ref->ops->to_element = axis2_hash_get(methods,
+      binding_msg_ref->ops->to_element = axutil_hash_get(methods,
 							"to_element", AXIS2_HASH_KEY_STRING);
       if (!binding_msg_ref->ops->to_element && binding_msg_ref_impl_l)
 	    binding_msg_ref->ops->to_element =
 		  binding_msg_ref_impl_l->binding_msg_ref.ops->to_element;
 
-      binding_msg_ref->ops->set_interface_msg_ref_element = axis2_hash_get(methods,
+      binding_msg_ref->ops->set_interface_msg_ref_element = axutil_hash_get(methods,
 									   "set_interface_msg_ref_element", AXIS2_HASH_KEY_STRING);
       if (!binding_msg_ref->ops->set_interface_msg_ref_element && binding_msg_ref_impl_l)
 	    binding_msg_ref->ops->set_interface_msg_ref_element =
@@ -833,11 +833,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-      binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 							 "WODEN_WSDL10_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
       return binding_msg_ref_impl->f_interface_msg_ref;
@@ -849,11 +849,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-      binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 							 "WODEN_WSDL10_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
       return &(binding_msg_ref_impl->binding_msg_ref);
@@ -871,12 +871,12 @@
       void *dir)
 {
       woden_wsdl10_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, dir, AXIS2_FAILURE);
       super = WODEN_WSDL10_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-      binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 							 "WODEN_WSDL10_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
       if (!binding_msg_ref_impl->f_direction)
@@ -895,11 +895,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-      binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 							 "WODEN_WSDL10_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
       return binding_msg_ref_impl->f_direction;
@@ -912,12 +912,12 @@
       axis2_qname_t *qname)
 {
       woden_wsdl10_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
       super = WODEN_WSDL10_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-      binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 							 "WODEN_WSDL10_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
       if (binding_msg_ref_impl->f_qname)
@@ -937,11 +937,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-      binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 							 "WODEN_WSDL10_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
       return binding_msg_ref_impl->f_qname;
@@ -958,12 +958,12 @@
       void *int_msg_ref)
 {
       woden_wsdl10_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, int_msg_ref, AXIS2_FAILURE);
       super = WODEN_WSDL10_BINDING_MSG_REF_SUPER_OBJS(binding_msg_ref, env);
-      binding_msg_ref_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_msg_ref_impl = INTF_TO_IMPL(axutil_hash_get(super,
 							 "WODEN_WSDL10_BINDING_MSG_REF", AXIS2_HASH_KEY_STRING));
 
       if (!binding_msg_ref_impl->f_interface_msg_ref)

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c Fri Mar 30 11:28:18 2007
@@ -36,8 +36,8 @@
       woden_wsdl10_binding_op_t binding_op;
       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_qname;
       axutil_array_list_t *f_msg_refs;
       axutil_array_list_t *f_fault_refs;
@@ -51,7 +51,7 @@
       void *binding_op,
       const axutil_env_t *env);
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_binding_op_super_objs(
       void *binding_op,
       const axutil_env_t *env);
@@ -564,59 +564,59 @@
       binding_op_impl->binding_op.ops->set_interface_op_element =
 	    woden_wsdl10_binding_op_set_interface_op_element;
 
-      binding_op_impl->methods = axis2_hash_make(env);
+      binding_op_impl->methods = axutil_hash_make(env);
       if (!binding_op_impl->methods)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(binding_op_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+      axutil_hash_set(binding_op_impl->methods, "free", AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_free);
-      axis2_hash_set(binding_op_impl->methods, "super_objs",
+      axutil_hash_set(binding_op_impl->methods, "super_objs",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_binding_op_super_objs);
-      axis2_hash_set(binding_op_impl->methods, "type",
+      axutil_hash_set(binding_op_impl->methods, "type",
 		     AXIS2_HASH_KEY_STRING, woden_wsdl10_binding_op_type);
 
-      axis2_hash_set(binding_op_impl->methods, "get_interface_op",
+      axutil_hash_set(binding_op_impl->methods, "get_interface_op",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_get_interface_op);
-      axis2_hash_set(binding_op_impl->methods, "get_binding_msg_refs",
+      axutil_hash_set(binding_op_impl->methods, "get_binding_msg_refs",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_get_binding_msg_refs);
-      axis2_hash_set(binding_op_impl->methods, "get_binding_fault_refs",
+      axutil_hash_set(binding_op_impl->methods, "get_binding_fault_refs",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_get_binding_fault_refs);
-      axis2_hash_set(binding_op_impl->methods, "to_element",
+      axutil_hash_set(binding_op_impl->methods, "to_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_to_element);
-      axis2_hash_set(binding_op_impl->methods, "set_qname",
+      axutil_hash_set(binding_op_impl->methods, "set_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_set_qname);
-      axis2_hash_set(binding_op_impl->methods, "get_qname",
+      axutil_hash_set(binding_op_impl->methods, "get_qname",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_get_qname);
-      axis2_hash_set(binding_op_impl->methods, "get_interface_op_element",
+      axutil_hash_set(binding_op_impl->methods, "get_interface_op_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_get_interface_op_element);
-      axis2_hash_set(binding_op_impl->methods, "add_binding_msg_ref_element",
+      axutil_hash_set(binding_op_impl->methods, "add_binding_msg_ref_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_add_binding_msg_ref_element);
-      axis2_hash_set(binding_op_impl->methods, "remove_binding_msg_ref_element",
+      axutil_hash_set(binding_op_impl->methods, "remove_binding_msg_ref_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_remove_binding_msg_ref_element);
-      axis2_hash_set(binding_op_impl->methods, "get_binding_msg_ref_elements",
+      axutil_hash_set(binding_op_impl->methods, "get_binding_msg_ref_elements",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_get_binding_msg_ref_elements);
-      axis2_hash_set(binding_op_impl->methods, "add_binding_fault_ref_element",
+      axutil_hash_set(binding_op_impl->methods, "add_binding_fault_ref_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_add_binding_fault_ref_element);
-      axis2_hash_set(binding_op_impl->methods, "remove_binding_fault_ref_element",
+      axutil_hash_set(binding_op_impl->methods, "remove_binding_fault_ref_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_remove_binding_fault_ref_element);
-      axis2_hash_set(binding_op_impl->methods, "get_binding_fault_ref_elements",
+      axutil_hash_set(binding_op_impl->methods, "get_binding_fault_ref_elements",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_get_binding_fault_ref_elements);
-      axis2_hash_set(binding_op_impl->methods, "set_interface_op_element",
+      axutil_hash_set(binding_op_impl->methods, "set_interface_op_element",
 		     AXIS2_HASH_KEY_STRING,
 		     woden_wsdl10_binding_op_set_interface_op_element);
 
@@ -639,21 +639,21 @@
 
       binding_op_impl->nested_configurable = woden_nested_configurable_create(env);
 
-      binding_op_impl->super = axis2_hash_make(env);
+      binding_op_impl->super = axutil_hash_make(env);
       if (!binding_op_impl->super)
       {
 	    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
 	    return NULL;
       }
-      axis2_hash_set(binding_op_impl->super, "WODEN_WSDL10_BINDING_OP",
+      axutil_hash_set(binding_op_impl->super, "WODEN_WSDL10_BINDING_OP",
 		     AXIS2_HASH_KEY_STRING,
 		     &(binding_op_impl->binding_op));
-      axis2_hash_set(binding_op_impl->super, "WODEN_NESTED_CONFIGURABLE",
+      axutil_hash_set(binding_op_impl->super, "WODEN_NESTED_CONFIGURABLE",
 		     AXIS2_HASH_KEY_STRING,
 		     binding_op_impl->nested_configurable);
       configurable = WODEN_NESTED_CONFIGURABLE_GET_BASE_IMPL(
 	    binding_op_impl->nested_configurable, env);
-      axis2_hash_set(binding_op_impl->super, "WODEN_CONFIGURABLE",
+      axutil_hash_set(binding_op_impl->super, "WODEN_CONFIGURABLE",
 		     AXIS2_HASH_KEY_STRING, configurable);
 
       documentable = WODEN_CONFIGURABLE_GET_BASE_IMPL(configurable, env);
@@ -661,15 +661,15 @@
       wsdl_el = WODEN_WSDL_OBJ_GET_BASE_IMPL(wsdl_obj, env);
       element_extensible = WODEN_WSDL_ELEMENT_GET_ELEMENT_EXTENSIBLE(wsdl_el, env);
       attr_extensible = WODEN_WSDL_ELEMENT_GET_ATTR_EXTENSIBLE(wsdl_el, env);
-      axis2_hash_set(binding_op_impl->super, "WODEN_DOCUMENTABLE",
+      axutil_hash_set(binding_op_impl->super, "WODEN_DOCUMENTABLE",
 		     AXIS2_HASH_KEY_STRING, documentable);
-      axis2_hash_set(binding_op_impl->super, "WODEN_WSDL_OBJ",
+      axutil_hash_set(binding_op_impl->super, "WODEN_WSDL_OBJ",
 		     AXIS2_HASH_KEY_STRING, wsdl_obj);
-      axis2_hash_set(binding_op_impl->super, "WODEN_WSDL_ELEMENT",
+      axutil_hash_set(binding_op_impl->super, "WODEN_WSDL_ELEMENT",
 		     AXIS2_HASH_KEY_STRING, wsdl_el);
-      axis2_hash_set(binding_op_impl->super, "WODEN_ELEMENT_EXTENSIBLE",
+      axutil_hash_set(binding_op_impl->super, "WODEN_ELEMENT_EXTENSIBLE",
 		     AXIS2_HASH_KEY_STRING, element_extensible);
-      axis2_hash_set(binding_op_impl->super, "WODEN_ATTR_EXTENSIBLE",
+      axutil_hash_set(binding_op_impl->super, "WODEN_ATTR_EXTENSIBLE",
 		     AXIS2_HASH_KEY_STRING, attr_extensible);
 
       return &(binding_op_impl->binding_op);
@@ -824,13 +824,13 @@
 
       if (binding_op_impl->super)
       {
-	    axis2_hash_free(binding_op_impl->super, env);
+	    axutil_hash_free(binding_op_impl->super, env);
 	    binding_op_impl->super = NULL;
       }
 
       if (binding_op_impl->methods)
       {
-	    axis2_hash_free(binding_op_impl->methods, env);
+	    axutil_hash_free(binding_op_impl->methods, env);
 	    binding_op_impl->methods = NULL;
       }
 
@@ -856,7 +856,7 @@
       return AXIS2_SUCCESS;
 }
 
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
 woden_wsdl10_binding_op_super_objs(
       void *binding_op,
       const axutil_env_t *env)
@@ -900,7 +900,7 @@
       woden_wsdl10_binding_op_t *binding_op,
       const axutil_env_t *env,
       woden_wsdl10_binding_op_t *binding_op_impl,
-      axis2_hash_t *methods)
+      axutil_hash_t *methods)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl_l = NULL;
 
@@ -908,42 +908,42 @@
       AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
       binding_op_impl_l = INTF_TO_IMPL(binding_op_impl);
 
-      binding_op->ops->free = axis2_hash_get(methods, "free",
+      binding_op->ops->free = axutil_hash_get(methods, "free",
 					     AXIS2_HASH_KEY_STRING);
       binding_op->ops->to_binding_op_free =
-	    axis2_hash_get(methods, "to_binding_op_free",
+	    axutil_hash_get(methods, "to_binding_op_free",
 			   AXIS2_HASH_KEY_STRING);
-      binding_op->ops->super_objs = axis2_hash_get(methods, "super_objs",
+      binding_op->ops->super_objs = axutil_hash_get(methods, "super_objs",
 						   AXIS2_HASH_KEY_STRING);
-      binding_op->ops->type = axis2_hash_get(methods, "type",
+      binding_op->ops->type = axutil_hash_get(methods, "type",
 					     AXIS2_HASH_KEY_STRING);
 
-      binding_op->ops->get_interface_op = axis2_hash_get(methods,
+      binding_op->ops->get_interface_op = axutil_hash_get(methods,
 							 "get_interface_op", AXIS2_HASH_KEY_STRING);
       if (!binding_op->ops->get_interface_op && binding_op_impl_l)
 	    binding_op->ops->get_interface_op =
 		  binding_op_impl_l->binding_op.ops->get_interface_op;
 
-      binding_op->ops->get_binding_msg_refs = axis2_hash_get(methods,
+      binding_op->ops->get_binding_msg_refs = axutil_hash_get(methods,
 							     "get_binding_msg_refs", AXIS2_HASH_KEY_STRING);
       if (!binding_op->ops->get_binding_msg_refs && binding_op_impl_l)
 	    binding_op->ops->get_binding_msg_refs =
 		  binding_op_impl_l->binding_op.ops->get_binding_msg_refs;
 
-      binding_op->ops->get_binding_fault_refs = axis2_hash_get(methods,
+      binding_op->ops->get_binding_fault_refs = axutil_hash_get(methods,
 							       "get_binding_fault_refs", AXIS2_HASH_KEY_STRING);
       if (!binding_op->ops->get_binding_fault_refs && binding_op_impl_l)
 	    binding_op->ops->get_binding_fault_refs =
 		  binding_op_impl_l->binding_op.ops->get_binding_fault_refs;
 
 
-      binding_op->ops->to_element = axis2_hash_get(methods,
+      binding_op->ops->to_element = axutil_hash_get(methods,
 						   "to_element", AXIS2_HASH_KEY_STRING);
       if (!binding_op->ops->to_element && binding_op_impl_l)
 	    binding_op->ops->to_element =
 		  binding_op_impl_l->binding_op.ops->to_element;
 
-      binding_op->ops->set_interface_op_element = axis2_hash_get(methods,
+      binding_op->ops->set_interface_op_element = axutil_hash_get(methods,
 								 "set_interface_op_element", AXIS2_HASH_KEY_STRING);
       if (!binding_op->ops->set_interface_op_element && binding_op_impl_l)
 	    binding_op->ops->set_interface_op_element =
@@ -963,11 +963,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       return binding_op_impl->f_msg_refs;
@@ -979,11 +979,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       return binding_op_impl->f_fault_refs;
@@ -995,11 +995,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       return &(binding_op_impl->binding_op);
@@ -1011,11 +1011,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       return binding_op_impl->f_interface_op;
@@ -1031,12 +1031,12 @@
       axis2_qname_t *qname)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       if (binding_op_impl->f_qname)
@@ -1055,11 +1055,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       return binding_op_impl->f_qname;
@@ -1071,11 +1071,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       return binding_op_impl->f_interface_op;
@@ -1089,12 +1089,12 @@
       void *msg_ref)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, msg_ref, AXIS2_FAILURE);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       if (!binding_op_impl->f_msg_refs)
@@ -1118,13 +1118,13 @@
       void *msg_ref)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
       int index = 0;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, msg_ref, AXIS2_FAILURE);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       index = axutil_array_list_index_of(binding_op_impl->f_msg_refs, env, msg_ref);
@@ -1139,11 +1139,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       return binding_op_impl->f_msg_refs;
@@ -1156,12 +1156,12 @@
       void *fault_ref)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_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_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       if (!binding_op_impl->f_fault_refs)
@@ -1185,13 +1185,13 @@
       void *fault_ref)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
       int index = 0;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, fault_ref, AXIS2_FAILURE);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       index = axutil_array_list_index_of(binding_op_impl->f_fault_refs, env, fault_ref);
@@ -1206,11 +1206,11 @@
       const axutil_env_t *env)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, NULL);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       return binding_op_impl->f_fault_refs;
@@ -1229,12 +1229,12 @@
       void *int_op)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
-      axis2_hash_t *super = NULL;
+      axutil_hash_t *super = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, int_op, AXIS2_FAILURE);
       super = WODEN_WSDL10_BINDING_OP_SUPER_OBJS(binding_op, env);
-      binding_op_impl = INTF_TO_IMPL(axis2_hash_get(super,
+      binding_op_impl = INTF_TO_IMPL(axutil_hash_get(super,
 						    "WODEN_WSDL10_BINDING_OP", AXIS2_HASH_KEY_STRING));
 
       if (binding_op_impl->f_interface_op)



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