You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2007/03/30 20:28:34 UTC
svn commit: r524225 [16/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/wsdl20/extensions/soap/woden_soap_binding_msg_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_msg_ref_exts.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_msg_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_msg_ref_exts.c Fri Mar 30 11:28:18 2007
@@ -33,8 +33,8 @@
{
woden_soap_binding_msg_ref_exts_t binding_msg_ref_exts;
woden_component_exts_t *component_exts;
- axis2_hash_t *methods;
- axis2_hash_t *super;
+ axutil_hash_t *methods;
+ axutil_hash_t *super;
woden_obj_types_t obj_type;
axis2_qname_t *qname;
@@ -47,7 +47,7 @@
void *binding_msg_ref_exts,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_binding_msg_ref_exts_super_objs(
void *binding_msg_ref_exts,
const axutil_env_t *env);
@@ -141,23 +141,23 @@
binding_msg_ref_exts_impl->binding_msg_ref_exts.ops->get_soap_headers =
woden_soap_binding_msg_ref_exts_get_soap_headers;
- binding_msg_ref_exts_impl->methods = axis2_hash_make(env);
+ binding_msg_ref_exts_impl->methods = axutil_hash_make(env);
if (!binding_msg_ref_exts_impl->methods)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(binding_msg_ref_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(binding_msg_ref_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
woden_soap_binding_msg_ref_exts_free);
- axis2_hash_set(binding_msg_ref_exts_impl->methods, "super_objs",
+ axutil_hash_set(binding_msg_ref_exts_impl->methods, "super_objs",
AXIS2_HASH_KEY_STRING, woden_soap_binding_msg_ref_exts_super_objs);
- axis2_hash_set(binding_msg_ref_exts_impl->methods, "type",
+ axutil_hash_set(binding_msg_ref_exts_impl->methods, "type",
AXIS2_HASH_KEY_STRING, woden_soap_binding_msg_ref_exts_type);
- axis2_hash_set(binding_msg_ref_exts_impl->methods, "get_modules",
+ axutil_hash_set(binding_msg_ref_exts_impl->methods, "get_modules",
AXIS2_HASH_KEY_STRING,
woden_soap_binding_msg_ref_exts_get_soap_modules);
- axis2_hash_set(binding_msg_ref_exts_impl->methods, "get_soap_headers",
+ axutil_hash_set(binding_msg_ref_exts_impl->methods, "get_soap_headers",
AXIS2_HASH_KEY_STRING,
woden_soap_binding_msg_ref_exts_get_soap_headers);
@@ -174,15 +174,15 @@
binding_msg_ref_exts_impl->component_exts = woden_component_exts_create(env);
- binding_msg_ref_exts_impl->super = axis2_hash_make(env);
+ binding_msg_ref_exts_impl->super = axutil_hash_make(env);
if (!binding_msg_ref_exts_impl->super)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(binding_msg_ref_exts_impl->super, "WODEN_SOAP_BINDING_MSG_REF_EXTS", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(binding_msg_ref_exts_impl->super, "WODEN_SOAP_BINDING_MSG_REF_EXTS", AXIS2_HASH_KEY_STRING,
&(binding_msg_ref_exts_impl->binding_msg_ref_exts));
- axis2_hash_set(binding_msg_ref_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(binding_msg_ref_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
binding_msg_ref_exts_impl->component_exts);
return &(binding_msg_ref_exts_impl->binding_msg_ref_exts);
@@ -220,13 +220,13 @@
if (binding_msg_ref_exts_impl->super)
{
- axis2_hash_free(binding_msg_ref_exts_impl->super, env);
+ axutil_hash_free(binding_msg_ref_exts_impl->super, env);
binding_msg_ref_exts_impl->super = NULL;
}
if (binding_msg_ref_exts_impl->methods)
{
- axis2_hash_free(binding_msg_ref_exts_impl->methods, env);
+ axutil_hash_free(binding_msg_ref_exts_impl->methods, env);
binding_msg_ref_exts_impl->methods = NULL;
}
@@ -257,7 +257,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_binding_msg_ref_exts_super_objs(
void *binding_msg_ref_exts,
const axutil_env_t *env)
@@ -301,7 +301,7 @@
woden_soap_binding_msg_ref_exts_t *binding_msg_ref_exts,
const axutil_env_t *env,
woden_soap_binding_msg_ref_exts_t *binding_msg_ref_exts_impl,
- axis2_hash_t *methods)
+ axutil_hash_t *methods)
{
woden_soap_binding_msg_ref_exts_impl_t *binding_msg_ref_exts_impl_l = NULL;
@@ -309,20 +309,20 @@
AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
binding_msg_ref_exts_impl_l = INTF_TO_IMPL(binding_msg_ref_exts_impl);
- binding_msg_ref_exts->ops->free = axis2_hash_get(methods, "free",
+ binding_msg_ref_exts->ops->free = axutil_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- binding_msg_ref_exts->ops->super_objs = axis2_hash_get(methods, "super_objs",
+ binding_msg_ref_exts->ops->super_objs = axutil_hash_get(methods, "super_objs",
AXIS2_HASH_KEY_STRING);
- binding_msg_ref_exts->ops->type = axis2_hash_get(methods, "type",
+ binding_msg_ref_exts->ops->type = axutil_hash_get(methods, "type",
AXIS2_HASH_KEY_STRING);
- binding_msg_ref_exts->ops->get_soap_modules = axis2_hash_get(methods,
+ binding_msg_ref_exts->ops->get_soap_modules = axutil_hash_get(methods,
"get_soap_modules", AXIS2_HASH_KEY_STRING);
if (!binding_msg_ref_exts->ops->get_soap_modules && binding_msg_ref_exts_impl_l)
binding_msg_ref_exts->ops->get_soap_modules =
binding_msg_ref_exts_impl_l->binding_msg_ref_exts.ops->get_soap_modules;
- binding_msg_ref_exts->ops->get_soap_headers = axis2_hash_get(methods,
+ binding_msg_ref_exts->ops->get_soap_headers = axutil_hash_get(methods,
"get_soap_headers", AXIS2_HASH_KEY_STRING);
if (!binding_msg_ref_exts->ops->get_soap_headers && binding_msg_ref_exts_impl_l)
binding_msg_ref_exts->ops->get_soap_headers =
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c Fri Mar 30 11:28:18 2007
@@ -34,8 +34,8 @@
{
woden_soap_binding_op_exts_t binding_op_exts;
woden_component_exts_t *component_exts;
- axis2_hash_t *methods;
- axis2_hash_t *super;
+ axutil_hash_t *methods;
+ axutil_hash_t *super;
woden_obj_types_t obj_type;
axis2_qname_t *qname;
@@ -48,7 +48,7 @@
void *binding_op_exts,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_binding_op_exts_super_objs(
void *binding_op_exts,
const axutil_env_t *env);
@@ -149,26 +149,26 @@
binding_op_exts_impl->binding_op_exts.ops->get_soap_action =
woden_soap_binding_op_exts_get_soap_action;
- binding_op_exts_impl->methods = axis2_hash_make(env);
+ binding_op_exts_impl->methods = axutil_hash_make(env);
if (!binding_op_exts_impl->methods)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(binding_op_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(binding_op_exts_impl->methods, "free", AXIS2_HASH_KEY_STRING,
woden_soap_binding_op_exts_free);
- axis2_hash_set(binding_op_exts_impl->methods, "super_objs",
+ axutil_hash_set(binding_op_exts_impl->methods, "super_objs",
AXIS2_HASH_KEY_STRING, woden_soap_binding_op_exts_super_objs);
- axis2_hash_set(binding_op_exts_impl->methods, "type",
+ axutil_hash_set(binding_op_exts_impl->methods, "type",
AXIS2_HASH_KEY_STRING, woden_soap_binding_op_exts_type);
- axis2_hash_set(binding_op_exts_impl->methods, "get_soap_modules",
+ axutil_hash_set(binding_op_exts_impl->methods, "get_soap_modules",
AXIS2_HASH_KEY_STRING,
woden_soap_binding_op_exts_get_soap_modules);
- axis2_hash_set(binding_op_exts_impl->methods, "get_soap_mep",
+ axutil_hash_set(binding_op_exts_impl->methods, "get_soap_mep",
AXIS2_HASH_KEY_STRING,
woden_soap_binding_op_exts_get_soap_mep);
- axis2_hash_set(binding_op_exts_impl->methods, "get_soap_action",
+ axutil_hash_set(binding_op_exts_impl->methods, "get_soap_action",
AXIS2_HASH_KEY_STRING,
woden_soap_binding_op_exts_get_soap_action);
@@ -185,15 +185,15 @@
binding_op_exts_impl->component_exts = woden_component_exts_create(env);
- binding_op_exts_impl->super = axis2_hash_make(env);
+ binding_op_exts_impl->super = axutil_hash_make(env);
if (!binding_op_exts_impl->super)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(binding_op_exts_impl->super, "WODEN_SOAP_BINDING_OP_EXTS", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(binding_op_exts_impl->super, "WODEN_SOAP_BINDING_OP_EXTS", AXIS2_HASH_KEY_STRING,
&(binding_op_exts_impl->binding_op_exts));
- axis2_hash_set(binding_op_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(binding_op_exts_impl->super, "WODEN_COMPONENT_EXTS", AXIS2_HASH_KEY_STRING,
binding_op_exts_impl->component_exts);
return &(binding_op_exts_impl->binding_op_exts);
@@ -231,13 +231,13 @@
if (binding_op_exts_impl->super)
{
- axis2_hash_free(binding_op_exts_impl->super, env);
+ axutil_hash_free(binding_op_exts_impl->super, env);
binding_op_exts_impl->super = NULL;
}
if (binding_op_exts_impl->methods)
{
- axis2_hash_free(binding_op_exts_impl->methods, env);
+ axutil_hash_free(binding_op_exts_impl->methods, env);
binding_op_exts_impl->methods = NULL;
}
@@ -268,7 +268,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_binding_op_exts_super_objs(
void *binding_op_exts,
const axutil_env_t *env)
@@ -312,7 +312,7 @@
woden_soap_binding_op_exts_t *binding_op_exts,
const axutil_env_t *env,
woden_soap_binding_op_exts_t *binding_op_exts_impl,
- axis2_hash_t *methods)
+ axutil_hash_t *methods)
{
woden_soap_binding_op_exts_impl_t *binding_op_exts_impl_l = NULL;
@@ -320,14 +320,14 @@
AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
binding_op_exts_impl_l = INTF_TO_IMPL(binding_op_exts_impl);
- binding_op_exts->ops->free = axis2_hash_get(methods, "free",
+ binding_op_exts->ops->free = axutil_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- binding_op_exts->ops->super_objs = axis2_hash_get(methods, "super_objs",
+ binding_op_exts->ops->super_objs = axutil_hash_get(methods, "super_objs",
AXIS2_HASH_KEY_STRING);
- binding_op_exts->ops->type = axis2_hash_get(methods, "type",
+ binding_op_exts->ops->type = axutil_hash_get(methods, "type",
AXIS2_HASH_KEY_STRING);
- binding_op_exts->ops->get_soap_modules = axis2_hash_get(methods,
+ binding_op_exts->ops->get_soap_modules = axutil_hash_get(methods,
"get_soap_modules", AXIS2_HASH_KEY_STRING);
if (!binding_op_exts->ops->get_soap_modules && binding_op_exts_impl_l)
binding_op_exts->ops->get_soap_modules =
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c Fri Mar 30 11:28:18 2007
@@ -32,8 +32,8 @@
struct woden_soap_header_block_impl
{
woden_soap_header_block_t header_block;
- axis2_hash_t *methods;
- axis2_hash_t *super;
+ axutil_hash_t *methods;
+ axutil_hash_t *super;
woden_obj_types_t obj_type;
void *f_parent;
@@ -55,7 +55,7 @@
void *header_block,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_header_block_super_objs(
void *header_block,
const axutil_env_t *env);
@@ -403,128 +403,128 @@
header_block_impl->header_block.ops->set_types =
woden_soap_header_block_set_types;
- header_block_impl->methods = axis2_hash_make(env);
+ header_block_impl->methods = axutil_hash_make(env);
if (!header_block_impl->methods)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(header_block_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(header_block_impl->methods, "free", AXIS2_HASH_KEY_STRING,
woden_soap_header_block_free);
- axis2_hash_set(header_block_impl->methods, "super_objs",
+ axutil_hash_set(header_block_impl->methods, "super_objs",
AXIS2_HASH_KEY_STRING, woden_soap_header_block_super_objs);
- axis2_hash_set(header_block_impl->methods, "type",
+ axutil_hash_set(header_block_impl->methods, "type",
AXIS2_HASH_KEY_STRING, woden_soap_header_block_type);
- axis2_hash_set(header_block_impl->methods, "get_element_decl",
+ axutil_hash_set(header_block_impl->methods, "get_element_decl",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_element_decl);
- axis2_hash_set(header_block_impl->methods, "must_understand",
+ axutil_hash_set(header_block_impl->methods, "must_understand",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_must_understand);
- axis2_hash_set(header_block_impl->methods, "is_required",
+ axutil_hash_set(header_block_impl->methods, "is_required",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_is_required);
- axis2_hash_set(header_block_impl->methods, "get_parent",
+ axutil_hash_set(header_block_impl->methods, "get_parent",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_parent);
- axis2_hash_set(header_block_impl->methods, "to_element",
+ axutil_hash_set(header_block_impl->methods, "to_element",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_to_element);
- axis2_hash_set(header_block_impl->methods, "set_element_qname",
+ axutil_hash_set(header_block_impl->methods, "set_element_qname",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_set_element_qname);
- axis2_hash_set(header_block_impl->methods, "get_element_qname",
+ axutil_hash_set(header_block_impl->methods, "get_element_qname",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_element_qname);
- axis2_hash_set(header_block_impl->methods, "get_element",
+ axutil_hash_set(header_block_impl->methods, "get_element",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_element);
- axis2_hash_set(header_block_impl->methods, "set_must_understand",
+ axutil_hash_set(header_block_impl->methods, "set_must_understand",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_set_must_understand);
- axis2_hash_set(header_block_impl->methods, "set_parent_element",
+ axutil_hash_set(header_block_impl->methods, "set_parent_element",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_set_parent_element);
- axis2_hash_set(header_block_impl->methods, "get_parent_element",
+ axutil_hash_set(header_block_impl->methods, "get_parent_element",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_parent_element);
- axis2_hash_set(header_block_impl->methods, "add_documentation_element",
+ axutil_hash_set(header_block_impl->methods, "add_documentation_element",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_add_documentation_element);
- axis2_hash_set(header_block_impl->methods, "get_documentation_elements",
+ axutil_hash_set(header_block_impl->methods, "get_documentation_elements",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_documentation_elements);
- axis2_hash_set(header_block_impl->methods, "set_extension_type",
+ axutil_hash_set(header_block_impl->methods, "set_extension_type",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_set_extension_type);
- axis2_hash_set(header_block_impl->methods, "get_extension_type",
+ axutil_hash_set(header_block_impl->methods, "get_extension_type",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_extension_type);
- axis2_hash_set(header_block_impl->methods, "set_required",
+ axutil_hash_set(header_block_impl->methods, "set_required",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_set_required);
- axis2_hash_set(header_block_impl->methods, "set_ext_attr",
+ axutil_hash_set(header_block_impl->methods, "set_ext_attr",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_set_ext_attr);
- axis2_hash_set(header_block_impl->methods, "get_ext_attr",
+ axutil_hash_set(header_block_impl->methods, "get_ext_attr",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_ext_attr);
- axis2_hash_set(header_block_impl->methods, "get_ext_attrs_for_namespace",
+ axutil_hash_set(header_block_impl->methods, "get_ext_attrs_for_namespace",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_ext_attrs_for_namespace);
- axis2_hash_set(header_block_impl->methods, "get_ext_attrs",
+ axutil_hash_set(header_block_impl->methods, "get_ext_attrs",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_ext_attrs);
- axis2_hash_set(header_block_impl->methods, "has_ext_attrs_for_namespace",
+ axutil_hash_set(header_block_impl->methods, "has_ext_attrs_for_namespace",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_has_ext_attrs_for_namespace);
- axis2_hash_set(header_block_impl->methods, "add_ext_element",
+ axutil_hash_set(header_block_impl->methods, "add_ext_element",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_add_ext_element);
- axis2_hash_set(header_block_impl->methods, "remove_ext_element",
+ axutil_hash_set(header_block_impl->methods, "remove_ext_element",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_remove_ext_element);
- axis2_hash_set(header_block_impl->methods, "get_ext_elements",
+ axutil_hash_set(header_block_impl->methods, "get_ext_elements",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_ext_elements);
- axis2_hash_set(header_block_impl->methods, "get_ext_elements_of_type",
+ axutil_hash_set(header_block_impl->methods, "get_ext_elements_of_type",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_get_ext_elements_of_type);
- axis2_hash_set(header_block_impl->methods, "has_ext_elements_for_namespace",
+ axutil_hash_set(header_block_impl->methods, "has_ext_elements_for_namespace",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_has_ext_elements_for_namespace);
- axis2_hash_set(header_block_impl->methods, "set_element_decl",
+ axutil_hash_set(header_block_impl->methods, "set_element_decl",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_set_element_decl);
- axis2_hash_set(header_block_impl->methods, "set_types",
+ axutil_hash_set(header_block_impl->methods, "set_types",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_set_types);
@@ -539,13 +539,13 @@
AXIS2_ENV_CHECK(env, NULL);
header_block_impl = (woden_soap_header_block_impl_t *) create(env);
- header_block_impl->super = axis2_hash_make(env);
+ header_block_impl->super = axutil_hash_make(env);
if (!header_block_impl->super)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(header_block_impl->super, "WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(header_block_impl->super, "WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING,
&(header_block_impl->header_block));
return &(header_block_impl->header_block);
@@ -604,13 +604,13 @@
if (header_block_impl->super)
{
- axis2_hash_free(header_block_impl->super, env);
+ axutil_hash_free(header_block_impl->super, env);
header_block_impl->super = NULL;
}
if (header_block_impl->methods)
{
- axis2_hash_free(header_block_impl->methods, env);
+ axutil_hash_free(header_block_impl->methods, env);
header_block_impl->methods = NULL;
}
@@ -678,7 +678,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_header_block_super_objs(
void *header_block,
const axutil_env_t *env)
@@ -709,7 +709,7 @@
woden_soap_header_block_t *header_block,
const axutil_env_t *env,
woden_soap_header_block_t *header_block_impl,
- axis2_hash_t *methods)
+ axutil_hash_t *methods)
{
woden_soap_header_block_impl_t *header_block_impl_l = NULL;
@@ -717,50 +717,50 @@
AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
header_block_impl_l = INTF_TO_IMPL(header_block_impl);
- header_block->ops->free = axis2_hash_get(methods, "free",
+ header_block->ops->free = axutil_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- header_block->ops->super_objs = axis2_hash_get(methods, "super_objs",
+ header_block->ops->super_objs = axutil_hash_get(methods, "super_objs",
AXIS2_HASH_KEY_STRING);
- header_block->ops->type = axis2_hash_get(methods, "type",
+ header_block->ops->type = axutil_hash_get(methods, "type",
AXIS2_HASH_KEY_STRING);
- header_block->ops->get_element_decl = axis2_hash_get(methods,
+ header_block->ops->get_element_decl = axutil_hash_get(methods,
"get_element_decl", AXIS2_HASH_KEY_STRING);
if (!header_block->ops->get_element_decl && header_block_impl_l)
header_block->ops->get_element_decl =
header_block_impl_l->header_block.ops->get_element_decl;
- header_block->ops->must_understand = axis2_hash_get(methods,
+ header_block->ops->must_understand = axutil_hash_get(methods,
"must_understand", AXIS2_HASH_KEY_STRING);
if (!header_block->ops->must_understand && header_block_impl_l)
header_block->ops->must_understand =
header_block_impl_l->header_block.ops->must_understand;
- header_block->ops->is_required = axis2_hash_get(methods,
+ header_block->ops->is_required = axutil_hash_get(methods,
"is_required", AXIS2_HASH_KEY_STRING);
if (!header_block->ops->is_required && header_block_impl_l)
header_block->ops->is_required =
header_block_impl_l->header_block.ops->is_required;
- header_block->ops->get_parent = axis2_hash_get(methods,
+ header_block->ops->get_parent = axutil_hash_get(methods,
"get_parent", AXIS2_HASH_KEY_STRING);
if (!header_block->ops->get_parent && header_block_impl_l)
header_block->ops->get_parent =
header_block_impl_l->header_block.ops->get_parent;
- header_block->ops->to_element = axis2_hash_get(methods,
+ header_block->ops->to_element = axutil_hash_get(methods,
"to_element", AXIS2_HASH_KEY_STRING);
if (!header_block->ops->to_element && header_block_impl_l)
header_block->ops->to_element =
header_block_impl_l->header_block.ops->to_element;
- header_block->ops->set_element_decl = axis2_hash_get(methods,
+ header_block->ops->set_element_decl = axutil_hash_get(methods,
"set_element_decl", AXIS2_HASH_KEY_STRING);
if (!header_block->ops->set_element_decl && header_block_impl_l)
header_block->ops->set_element_decl =
header_block_impl_l->header_block.ops->set_element_decl;
- header_block->ops->set_types = axis2_hash_get(methods,
+ header_block->ops->set_types = axutil_hash_get(methods,
"set_types", AXIS2_HASH_KEY_STRING);
if (!header_block->ops->set_types && header_block_impl_l)
header_block->ops->set_types =
@@ -781,11 +781,11 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return header_block_impl->f_element_decl;
@@ -797,11 +797,11 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return header_block_impl->f_must_understand;
@@ -813,11 +813,11 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return header_block_impl->f_required;
@@ -829,11 +829,11 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return header_block_impl->f_parent;
@@ -845,11 +845,11 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return &(header_block_impl->header_block);
@@ -867,11 +867,11 @@
axis2_qname_t *qname)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
if (header_block_impl->f_element_decl_qn)
@@ -892,11 +892,11 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return header_block_impl->f_element_decl_qn;
@@ -908,12 +908,12 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
void *xse = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
if (header_block_impl->f_types)
@@ -932,11 +932,11 @@
axis2_bool_t understood)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
header_block_impl->f_must_understand = understood;
@@ -952,11 +952,11 @@
void *wsdl_el)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
if (header_block_impl->f_parent)
@@ -975,11 +975,11 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return header_block_impl->f_parent;
@@ -992,12 +992,12 @@
void *doc_el)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, doc_el, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
if (!header_block_impl->f_documentation_elements)
@@ -1020,11 +1020,11 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return header_block_impl->f_documentation_elements;
@@ -1037,11 +1037,11 @@
axis2_qname_t *qname)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
if (header_block_impl->f_ext_element_type)
@@ -1061,11 +1061,11 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return header_block_impl->f_ext_element_type;
@@ -1078,11 +1078,11 @@
axis2_bool_t required)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
header_block_impl->f_required = required;
@@ -1102,13 +1102,13 @@
void *attr)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, attr_type, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, attr, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return WODEN_ATTR_EXTENSIBLE_SET_EXT_ATTR(
@@ -1122,12 +1122,12 @@
axis2_qname_t *attr_type)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, attr_type, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(
@@ -1141,12 +1141,12 @@
axis2_uri_t *namespc)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, namespc, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTRS_FOR_NAMESPACE(
@@ -1159,11 +1159,11 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTRS(
@@ -1177,12 +1177,12 @@
axis2_uri_t *namespc)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -1196,12 +1196,12 @@
void *ext_el)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ext_el, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return WODEN_ELEMENT_EXTENSIBLE_ADD_EXT_ELEMENT(
@@ -1215,12 +1215,12 @@
void *ext_el)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ext_el, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return WODEN_ELEMENT_EXTENSIBLE_REMOVE_EXT_ELEMENT(
@@ -1235,11 +1235,11 @@
const axutil_env_t *env)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(
@@ -1253,12 +1253,12 @@
axis2_qname_t *ext_type)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, ext_type, NULL);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
@@ -1272,12 +1272,12 @@
axis2_uri_t *namespc)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
return WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ELEMENTS_FOR_NAMESPACE(
@@ -1295,12 +1295,12 @@
void *element_decl)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, element_decl, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
if (header_block_impl->f_element_decl)
@@ -1321,12 +1321,12 @@
void *types)
{
woden_soap_header_block_impl_t *header_block_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, types, AXIS2_FAILURE);
super = WODEN_SOAP_HEADER_BLOCK_SUPER_OBJS(header_block, env);
- header_block_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_block_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK", AXIS2_HASH_KEY_STRING));
if (header_block_impl->f_types)
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_deserializer.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_deserializer.c Fri Mar 30 11:28:18 2007
@@ -41,8 +41,8 @@
{
woden_soap_header_block_deserializer_t header_deser;
woden_obj_types_t obj_type;
- axis2_hash_t *super;
- axis2_hash_t *methods;
+ axutil_hash_t *super;
+ axutil_hash_t *methods;
};
#define INTF_TO_IMPL(header_deser) \
@@ -58,7 +58,7 @@
void *header_deser,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_header_block_deserializer_super_objs(
void *header_deser,
const axutil_env_t *env);
@@ -147,20 +147,20 @@
header_deser_impl->header_deser.ops->marshall =
woden_soap_header_block_deserializer_marshall;
- header_deser_impl->methods = axis2_hash_make(env);
+ header_deser_impl->methods = axutil_hash_make(env);
if (!header_deser_impl->methods)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(header_deser_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(header_deser_impl->methods, "free", AXIS2_HASH_KEY_STRING,
woden_soap_header_block_deserializer_free);
- axis2_hash_set(header_deser_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(header_deser_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
woden_soap_header_block_deserializer_super_objs);
- axis2_hash_set(header_deser_impl->methods, "type",
+ axutil_hash_set(header_deser_impl->methods, "type",
AXIS2_HASH_KEY_STRING, woden_soap_header_block_deserializer_type);
- axis2_hash_set(header_deser_impl->methods, "marshall",
+ axutil_hash_set(header_deser_impl->methods, "marshall",
AXIS2_HASH_KEY_STRING,
woden_soap_header_block_deserializer_marshall);
@@ -175,13 +175,13 @@
AXIS2_ENV_CHECK(env, NULL);
header_deser_impl = (woden_soap_header_block_deserializer_impl_t *) create(env);
- header_deser_impl->super = axis2_hash_make(env);
+ header_deser_impl->super = axutil_hash_make(env);
if (!header_deser_impl->super)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(header_deser_impl->super, "WODEN_SOAP_HEADER_BLOCK_DESERIALIZER",
+ axutil_hash_set(header_deser_impl->super, "WODEN_SOAP_HEADER_BLOCK_DESERIALIZER",
AXIS2_HASH_KEY_STRING, &(header_deser_impl->header_deser));
return &(header_deser_impl->header_deser);
@@ -221,13 +221,13 @@
if (header_deser_impl->super)
{
- axis2_hash_free(header_deser_impl->super, env);
+ axutil_hash_free(header_deser_impl->super, env);
header_deser_impl->super = NULL;
}
if (header_deser_impl->methods)
{
- axis2_hash_free(header_deser_impl->methods, env);
+ axutil_hash_free(header_deser_impl->methods, env);
header_deser_impl->methods = NULL;
}
@@ -247,7 +247,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_header_block_deserializer_super_objs(
void *header_deser,
const axutil_env_t *env)
@@ -278,7 +278,7 @@
woden_soap_header_block_deserializer_t *header_deser,
const axutil_env_t *env,
woden_soap_header_block_deserializer_t *header_deser_impl,
- axis2_hash_t *methods)
+ axutil_hash_t *methods)
{
woden_soap_header_block_deserializer_impl_t *header_deser_impl_l = NULL;
@@ -286,14 +286,14 @@
AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
header_deser_impl_l = INTF_TO_IMPL(header_deser_impl);
- header_deser->ops->free = axis2_hash_get(methods, "free",
+ header_deser->ops->free = axutil_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- header_deser->ops->super_objs = axis2_hash_get(methods, "super_objs",
+ header_deser->ops->super_objs = axutil_hash_get(methods, "super_objs",
AXIS2_HASH_KEY_STRING);
- header_deser->ops->type = axis2_hash_get(methods, "type",
+ header_deser->ops->type = axutil_hash_get(methods, "type",
AXIS2_HASH_KEY_STRING);
- header_deser->ops->marshall = axis2_hash_get(methods,
+ header_deser->ops->marshall = axutil_hash_get(methods,
"marshall", AXIS2_HASH_KEY_STRING);
if (!header_deser->ops->marshall && header_deser_impl_l)
header_deser->ops->marshall =
@@ -314,7 +314,7 @@
woden_ext_registry_t *ext_reg)
{
woden_soap_header_block_deserializer_impl_t *header_deser_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
void *soap_hdr = NULL;
axis2_char_t *element_decl_qn = NULL;
axis2_char_t *must_understand = NULL;
@@ -328,7 +328,7 @@
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_HEADER_BLOCK_DESERIALIZER_SUPER_OBJS(header_deser, env);
- header_deser_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ header_deser_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_HEADER_BLOCK_DESERIALIZER", AXIS2_HASH_KEY_STRING));
soap_hdr = WODEN_EXT_REGISTRY_QUERY_EXT_ELEMENT_TYPE(ext_reg, env,
@@ -344,7 +344,7 @@
if (element_decl_qn)
{
axis2_qname_t *qname = NULL;
- axis2_hash_t *namespcs = NULL;
+ axutil_hash_t *namespcs = NULL;
desc = woden_desc_to_desc_element(desc, env);
namespcs = WODEN_DESC_ELEMENT_GET_NAMESPACES(desc, env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_element.c Fri Mar 30 11:28:18 2007
@@ -21,50 +21,50 @@
woden_soap_header_block_element_resolve_methods(
woden_soap_header_block_element_t *soap_header_block_element,
const axutil_env_t *env,
- axis2_hash_t *methods)
+ axutil_hash_t *methods)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
- soap_header_block_element->ops->free = axis2_hash_get(methods, "free",
+ soap_header_block_element->ops->free = axutil_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- soap_header_block_element->ops->type = axis2_hash_get(methods, "type",
+ soap_header_block_element->ops->type = axutil_hash_get(methods, "type",
AXIS2_HASH_KEY_STRING);
soap_header_block_element->ops->set_element_qname =
- axis2_hash_get(methods, "set_element_qname",
+ axutil_hash_get(methods, "set_element_qname",
AXIS2_HASH_KEY_STRING);
soap_header_block_element->ops->get_element_qname =
- axis2_hash_get(methods, "get_element_qname",
+ axutil_hash_get(methods, "get_element_qname",
AXIS2_HASH_KEY_STRING);
soap_header_block_element->ops->get_element =
- axis2_hash_get(methods, "get_element",
+ axutil_hash_get(methods, "get_element",
AXIS2_HASH_KEY_STRING);
soap_header_block_element->ops->set_must_understand =
- axis2_hash_get(methods, "set_must understand",
+ axutil_hash_get(methods, "set_must understand",
AXIS2_HASH_KEY_STRING);
soap_header_block_element->ops->must_understand =
- axis2_hash_get(methods, "must_understand",
+ axutil_hash_get(methods, "must_understand",
AXIS2_HASH_KEY_STRING);
soap_header_block_element->ops->set_parent_element =
- axis2_hash_get(methods, "set_parent_element",
+ axutil_hash_get(methods, "set_parent_element",
AXIS2_HASH_KEY_STRING);
soap_header_block_element->ops->get_parent_element =
- axis2_hash_get(methods, "get_parent_element",
+ axutil_hash_get(methods, "get_parent_element",
AXIS2_HASH_KEY_STRING);
soap_header_block_element->ops->add_documentation_element =
- axis2_hash_get(methods, "add_documentation_element",
+ axutil_hash_get(methods, "add_documentation_element",
AXIS2_HASH_KEY_STRING);
soap_header_block_element->ops->get_documentation_elements =
- axis2_hash_get(methods, "get_documentation_elements",
+ axutil_hash_get(methods, "get_documentation_elements",
AXIS2_HASH_KEY_STRING);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c Fri Mar 30 11:28:18 2007
@@ -31,8 +31,8 @@
struct woden_soap_module_impl
{
woden_soap_module_t module;
- axis2_hash_t *methods;
- axis2_hash_t *super;
+ axutil_hash_t *methods;
+ axutil_hash_t *super;
woden_obj_types_t obj_type;
void *f_parent;
@@ -51,7 +51,7 @@
void *module,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_module_super_objs(
void *module,
const axutil_env_t *env);
@@ -350,104 +350,104 @@
module_impl->module.ops->to_element =
woden_soap_module_to_element;
- module_impl->methods = axis2_hash_make(env);
+ module_impl->methods = axutil_hash_make(env);
if (!module_impl->methods)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(module_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(module_impl->methods, "free", AXIS2_HASH_KEY_STRING,
woden_soap_module_free);
- axis2_hash_set(module_impl->methods, "super_objs",
+ axutil_hash_set(module_impl->methods, "super_objs",
AXIS2_HASH_KEY_STRING, woden_soap_module_super_objs);
- axis2_hash_set(module_impl->methods, "type",
+ axutil_hash_set(module_impl->methods, "type",
AXIS2_HASH_KEY_STRING, woden_soap_module_type);
- axis2_hash_set(module_impl->methods, "get_ref",
+ axutil_hash_set(module_impl->methods, "get_ref",
AXIS2_HASH_KEY_STRING,
woden_soap_module_get_ref);
- axis2_hash_set(module_impl->methods, "is_required",
+ axutil_hash_set(module_impl->methods, "is_required",
AXIS2_HASH_KEY_STRING,
woden_soap_module_is_required);
- axis2_hash_set(module_impl->methods, "get_parent",
+ axutil_hash_set(module_impl->methods, "get_parent",
AXIS2_HASH_KEY_STRING,
woden_soap_module_get_parent);
- axis2_hash_set(module_impl->methods, "to_element",
+ axutil_hash_set(module_impl->methods, "to_element",
AXIS2_HASH_KEY_STRING,
woden_soap_module_to_element);
- axis2_hash_set(module_impl->methods, "set_ref",
+ axutil_hash_set(module_impl->methods, "set_ref",
AXIS2_HASH_KEY_STRING,
woden_soap_module_set_ref);
- axis2_hash_set(module_impl->methods, "set_parent_element",
+ axutil_hash_set(module_impl->methods, "set_parent_element",
AXIS2_HASH_KEY_STRING,
woden_soap_module_set_parent_element);
- axis2_hash_set(module_impl->methods, "get_parent_element",
+ axutil_hash_set(module_impl->methods, "get_parent_element",
AXIS2_HASH_KEY_STRING,
woden_soap_module_get_parent_element);
- axis2_hash_set(module_impl->methods, "add_documentation_element",
+ axutil_hash_set(module_impl->methods, "add_documentation_element",
AXIS2_HASH_KEY_STRING,
woden_soap_module_add_documentation_element);
- axis2_hash_set(module_impl->methods, "get_documentation_elements",
+ axutil_hash_set(module_impl->methods, "get_documentation_elements",
AXIS2_HASH_KEY_STRING,
woden_soap_module_get_documentation_elements);
- axis2_hash_set(module_impl->methods, "set_extension_type",
+ axutil_hash_set(module_impl->methods, "set_extension_type",
AXIS2_HASH_KEY_STRING,
woden_soap_module_set_extension_type);
- axis2_hash_set(module_impl->methods, "get_extension_type",
+ axutil_hash_set(module_impl->methods, "get_extension_type",
AXIS2_HASH_KEY_STRING,
woden_soap_module_get_extension_type);
- axis2_hash_set(module_impl->methods, "set_required",
+ axutil_hash_set(module_impl->methods, "set_required",
AXIS2_HASH_KEY_STRING,
woden_soap_module_set_required);
- axis2_hash_set(module_impl->methods, "set_ext_attr",
+ axutil_hash_set(module_impl->methods, "set_ext_attr",
AXIS2_HASH_KEY_STRING,
woden_soap_module_set_ext_attr);
- axis2_hash_set(module_impl->methods, "get_ext_attr",
+ axutil_hash_set(module_impl->methods, "get_ext_attr",
AXIS2_HASH_KEY_STRING,
woden_soap_module_get_ext_attr);
- axis2_hash_set(module_impl->methods, "get_ext_attrs_for_namespace",
+ axutil_hash_set(module_impl->methods, "get_ext_attrs_for_namespace",
AXIS2_HASH_KEY_STRING,
woden_soap_module_get_ext_attrs_for_namespace);
- axis2_hash_set(module_impl->methods, "get_ext_attrs",
+ axutil_hash_set(module_impl->methods, "get_ext_attrs",
AXIS2_HASH_KEY_STRING,
woden_soap_module_get_ext_attrs);
- axis2_hash_set(module_impl->methods, "has_ext_attrs_for_namespace",
+ axutil_hash_set(module_impl->methods, "has_ext_attrs_for_namespace",
AXIS2_HASH_KEY_STRING,
woden_soap_module_has_ext_attrs_for_namespace);
- axis2_hash_set(module_impl->methods, "add_ext_element",
+ axutil_hash_set(module_impl->methods, "add_ext_element",
AXIS2_HASH_KEY_STRING,
woden_soap_module_add_ext_element);
- axis2_hash_set(module_impl->methods, "remove_ext_element",
+ axutil_hash_set(module_impl->methods, "remove_ext_element",
AXIS2_HASH_KEY_STRING,
woden_soap_module_remove_ext_element);
- axis2_hash_set(module_impl->methods, "get_ext_elements",
+ axutil_hash_set(module_impl->methods, "get_ext_elements",
AXIS2_HASH_KEY_STRING,
woden_soap_module_get_ext_elements);
- axis2_hash_set(module_impl->methods, "get_ext_elements_of_type",
+ axutil_hash_set(module_impl->methods, "get_ext_elements_of_type",
AXIS2_HASH_KEY_STRING,
woden_soap_module_get_ext_elements_of_type);
- axis2_hash_set(module_impl->methods, "has_ext_elements_for_namespace",
+ axutil_hash_set(module_impl->methods, "has_ext_elements_for_namespace",
AXIS2_HASH_KEY_STRING,
woden_soap_module_has_ext_elements_for_namespace);
@@ -462,13 +462,13 @@
AXIS2_ENV_CHECK(env, NULL);
module_impl = (woden_soap_module_impl_t *) create(env);
- module_impl->super = axis2_hash_make(env);
+ module_impl->super = axutil_hash_make(env);
if (!module_impl->super)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(module_impl->super, "WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(module_impl->super, "WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING,
&(module_impl->module));
return &(module_impl->module);
@@ -527,13 +527,13 @@
if (module_impl->super)
{
- axis2_hash_free(module_impl->super, env);
+ axutil_hash_free(module_impl->super, env);
module_impl->super = NULL;
}
if (module_impl->methods)
{
- axis2_hash_free(module_impl->methods, env);
+ axutil_hash_free(module_impl->methods, env);
module_impl->methods = NULL;
}
@@ -589,7 +589,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_module_super_objs(
void *module,
const axutil_env_t *env)
@@ -620,7 +620,7 @@
woden_soap_module_t *module,
const axutil_env_t *env,
woden_soap_module_t *module_impl,
- axis2_hash_t *methods)
+ axutil_hash_t *methods)
{
woden_soap_module_impl_t *module_impl_l = NULL;
@@ -628,32 +628,32 @@
AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
module_impl_l = INTF_TO_IMPL(module_impl);
- module->ops->free = axis2_hash_get(methods, "free",
+ module->ops->free = axutil_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- module->ops->super_objs = axis2_hash_get(methods, "super_objs",
+ module->ops->super_objs = axutil_hash_get(methods, "super_objs",
AXIS2_HASH_KEY_STRING);
- module->ops->type = axis2_hash_get(methods, "type",
+ module->ops->type = axutil_hash_get(methods, "type",
AXIS2_HASH_KEY_STRING);
- module->ops->get_ref = axis2_hash_get(methods,
+ module->ops->get_ref = axutil_hash_get(methods,
"get_ref", AXIS2_HASH_KEY_STRING);
if (!module->ops->get_ref && module_impl_l)
module->ops->get_ref =
module_impl_l->module.ops->get_ref;
- module->ops->is_required = axis2_hash_get(methods,
+ module->ops->is_required = axutil_hash_get(methods,
"is_required", AXIS2_HASH_KEY_STRING);
if (!module->ops->is_required && module_impl_l)
module->ops->is_required =
module_impl_l->module.ops->is_required;
- module->ops->get_parent = axis2_hash_get(methods,
+ module->ops->get_parent = axutil_hash_get(methods,
"get_parent", AXIS2_HASH_KEY_STRING);
if (!module->ops->get_parent && module_impl_l)
module->ops->get_parent =
module_impl_l->module.ops->get_parent;
- module->ops->to_element = axis2_hash_get(methods,
+ module->ops->to_element = axutil_hash_get(methods,
"to_element", AXIS2_HASH_KEY_STRING);
if (!module->ops->to_element && module_impl_l)
module->ops->to_element =
@@ -672,11 +672,11 @@
axutil_env_t *env)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return module_impl->f_ref;
@@ -688,11 +688,11 @@
axutil_env_t *env)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return module_impl->f_required;
@@ -704,11 +704,11 @@
axutil_env_t *env)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return module_impl->f_parent;
@@ -720,11 +720,11 @@
axutil_env_t *env)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return &(module_impl->module);
@@ -742,12 +742,12 @@
axis2_uri_t *uri)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, uri, AXIS2_FAILURE);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
if (module_impl->f_ref)
@@ -769,11 +769,11 @@
void *wsdl_el)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
if (module_impl->f_parent)
@@ -792,11 +792,11 @@
axutil_env_t *env)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return module_impl->f_parent;
@@ -809,12 +809,12 @@
void *doc_el)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, doc_el, AXIS2_FAILURE);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
if (!module_impl->f_documentation_elements)
@@ -837,11 +837,11 @@
axutil_env_t *env)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return module_impl->f_documentation_elements;
@@ -854,11 +854,11 @@
axis2_qname_t *qname)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
if (module_impl->f_ext_element_type)
@@ -878,11 +878,11 @@
axutil_env_t *env)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return module_impl->f_ext_element_type;
@@ -895,11 +895,11 @@
axis2_bool_t required)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
module_impl->f_required = required;
@@ -919,13 +919,13 @@
void *attr)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, attr_type, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, attr, AXIS2_FAILURE);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return WODEN_ATTR_EXTENSIBLE_SET_EXT_ATTR(
@@ -939,12 +939,12 @@
axis2_qname_t *attr_type)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, attr_type, NULL);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(
@@ -958,12 +958,12 @@
axis2_uri_t *namespc)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, namespc, NULL);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTRS_FOR_NAMESPACE(
@@ -976,11 +976,11 @@
axutil_env_t *env)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTRS(
@@ -994,12 +994,12 @@
axis2_uri_t *namespc)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -1013,12 +1013,12 @@
void *ext_el)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ext_el, AXIS2_FAILURE);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return WODEN_ELEMENT_EXTENSIBLE_ADD_EXT_ELEMENT(
@@ -1032,12 +1032,12 @@
void *ext_el)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ext_el, AXIS2_FAILURE);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return WODEN_ELEMENT_EXTENSIBLE_REMOVE_EXT_ELEMENT(
@@ -1052,11 +1052,11 @@
axutil_env_t *env)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(
@@ -1070,12 +1070,12 @@
axis2_qname_t *ext_type)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, ext_type, NULL);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
@@ -1089,12 +1089,12 @@
axis2_uri_t *namespc)
{
woden_soap_module_impl_t *module_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
super = WODEN_SOAP_MODULE_SUPER_OBJS(module, env);
- module_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ module_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE", AXIS2_HASH_KEY_STRING));
return WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ELEMENTS_FOR_NAMESPACE(
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c Fri Mar 30 11:28:18 2007
@@ -39,8 +39,8 @@
{
woden_soap_module_deserializer_t mod_deser;
woden_obj_types_t obj_type;
- axis2_hash_t *super;
- axis2_hash_t *methods;
+ axutil_hash_t *super;
+ axutil_hash_t *methods;
};
#define INTF_TO_IMPL(mod_deser) \
@@ -56,7 +56,7 @@
void *mod_deser,
const axutil_env_t *env);
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_module_deserializer_super_objs(
void *mod_deser,
const axutil_env_t *env);
@@ -145,20 +145,20 @@
mod_deser_impl->mod_deser.ops->unmarshall =
woden_soap_module_deserializer_unmarshall;
- mod_deser_impl->methods = axis2_hash_make(env);
+ mod_deser_impl->methods = axutil_hash_make(env);
if (!mod_deser_impl->methods)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(mod_deser_impl->methods, "free", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(mod_deser_impl->methods, "free", AXIS2_HASH_KEY_STRING,
woden_soap_module_deserializer_free);
- axis2_hash_set(mod_deser_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(mod_deser_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
woden_soap_module_deserializer_super_objs);
- axis2_hash_set(mod_deser_impl->methods, "type",
+ axutil_hash_set(mod_deser_impl->methods, "type",
AXIS2_HASH_KEY_STRING, woden_soap_module_deserializer_type);
- axis2_hash_set(mod_deser_impl->methods, "unmarshall",
+ axutil_hash_set(mod_deser_impl->methods, "unmarshall",
AXIS2_HASH_KEY_STRING,
woden_soap_module_deserializer_unmarshall);
@@ -173,13 +173,13 @@
AXIS2_ENV_CHECK(env, NULL);
mod_deser_impl = (woden_soap_module_deserializer_impl_t *) create(env);
- mod_deser_impl->super = axis2_hash_make(env);
+ mod_deser_impl->super = axutil_hash_make(env);
if (!mod_deser_impl->super)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_hash_set(mod_deser_impl->super, "WODEN_SOAP_MODULE_DESERIALIZER",
+ axutil_hash_set(mod_deser_impl->super, "WODEN_SOAP_MODULE_DESERIALIZER",
AXIS2_HASH_KEY_STRING, &(mod_deser_impl->mod_deser));
return &(mod_deser_impl->mod_deser);
@@ -219,13 +219,13 @@
if (mod_deser_impl->super)
{
- axis2_hash_free(mod_deser_impl->super, env);
+ axutil_hash_free(mod_deser_impl->super, env);
mod_deser_impl->super = NULL;
}
if (mod_deser_impl->methods)
{
- axis2_hash_free(mod_deser_impl->methods, env);
+ axutil_hash_free(mod_deser_impl->methods, env);
mod_deser_impl->methods = NULL;
}
@@ -245,7 +245,7 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t *AXIS2_CALL
+axutil_hash_t *AXIS2_CALL
woden_soap_module_deserializer_super_objs(
void *mod_deser,
const axutil_env_t *env)
@@ -276,7 +276,7 @@
woden_soap_module_deserializer_t *mod_deser,
const axutil_env_t *env,
woden_soap_module_deserializer_t *mod_deser_impl,
- axis2_hash_t *methods)
+ axutil_hash_t *methods)
{
woden_soap_module_deserializer_impl_t *mod_deser_impl_l = NULL;
@@ -284,14 +284,14 @@
AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
mod_deser_impl_l = INTF_TO_IMPL(mod_deser_impl);
- mod_deser->ops->free = axis2_hash_get(methods, "free",
+ mod_deser->ops->free = axutil_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- mod_deser->ops->super_objs = axis2_hash_get(methods, "super_objs",
+ mod_deser->ops->super_objs = axutil_hash_get(methods, "super_objs",
AXIS2_HASH_KEY_STRING);
- mod_deser->ops->type = axis2_hash_get(methods, "type",
+ mod_deser->ops->type = axutil_hash_get(methods, "type",
AXIS2_HASH_KEY_STRING);
- mod_deser->ops->unmarshall = axis2_hash_get(methods,
+ mod_deser->ops->unmarshall = axutil_hash_get(methods,
"unmarshall", AXIS2_HASH_KEY_STRING);
if (!mod_deser->ops->unmarshall && mod_deser_impl_l)
mod_deser->ops->unmarshall =
@@ -312,7 +312,7 @@
woden_ext_registry_t *ext_reg)
{
woden_soap_module_deserializer_impl_t *mod_deser_impl = NULL;
- axis2_hash_t *super = NULL;
+ axutil_hash_t *super = NULL;
void *soap_mod = NULL;
axis2_char_t *ref = NULL;
axis2_char_t *req = NULL;
@@ -323,7 +323,7 @@
AXIS2_ENV_CHECK(env, NULL);
super = WODEN_SOAP_MODULE_DESERIALIZER_SUPER_OBJS(mod_deser, env);
- mod_deser_impl = INTF_TO_IMPL(axis2_hash_get(super,
+ mod_deser_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_SOAP_MODULE_DESERIALIZER", AXIS2_HASH_KEY_STRING));
/*soap_mod = WODEN_EXT_REGISTRY_QUERY_EXT_ELEMENT_TYPE(ext_reg, env,
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_element.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_element.c Fri Mar 30 11:28:18 2007
@@ -21,38 +21,38 @@
woden_soap_module_element_resolve_methods(
woden_soap_module_element_t *soap_module_element,
const axutil_env_t *env,
- axis2_hash_t *methods)
+ axutil_hash_t *methods)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
- soap_module_element->ops->free = axis2_hash_get(methods, "free",
+ soap_module_element->ops->free = axutil_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- soap_module_element->ops->type = axis2_hash_get(methods, "type",
+ soap_module_element->ops->type = axutil_hash_get(methods, "type",
AXIS2_HASH_KEY_STRING);
soap_module_element->ops->set_ref =
- axis2_hash_get(methods, "set_ref",
+ axutil_hash_get(methods, "set_ref",
AXIS2_HASH_KEY_STRING);
soap_module_element->ops->get_ref =
- axis2_hash_get(methods, "get_ref",
+ axutil_hash_get(methods, "get_ref",
AXIS2_HASH_KEY_STRING);
soap_module_element->ops->set_parent_element =
- axis2_hash_get(methods, "set_parent_element",
+ axutil_hash_get(methods, "set_parent_element",
AXIS2_HASH_KEY_STRING);
soap_module_element->ops->get_parent_element =
- axis2_hash_get(methods, "get_parent_element",
+ axutil_hash_get(methods, "get_parent_element",
AXIS2_HASH_KEY_STRING);
soap_module_element->ops->add_documentation_element =
- axis2_hash_get(methods, "add_documentation_element",
+ axutil_hash_get(methods, "add_documentation_element",
AXIS2_HASH_KEY_STRING);
soap_module_element->ops->get_documentation_elements =
- axis2_hash_get(methods, "get_documentation_elements",
+ axutil_hash_get(methods, "get_documentation_elements",
AXIS2_HASH_KEY_STRING);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_deserializer.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_deserializer.c Fri Mar 30 11:28:18 2007
@@ -21,18 +21,18 @@
woden_ext_deserializer_resolve_methods(
woden_ext_deserializer_t *ext_deserializer,
const axutil_env_t *env,
- axis2_hash_t *methods)
+ axutil_hash_t *methods)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
- ext_deserializer->ops->free = axis2_hash_get(methods, "free",
+ ext_deserializer->ops->free = axutil_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- ext_deserializer->ops->type = axis2_hash_get(methods, "type",
+ ext_deserializer->ops->type = axutil_hash_get(methods, "type",
AXIS2_HASH_KEY_STRING);
- ext_deserializer->ops->unmarshall = axis2_hash_get(methods, "unmarshall",
+ ext_deserializer->ops->unmarshall = axutil_hash_get(methods, "unmarshall",
AXIS2_HASH_KEY_STRING);
return AXIS2_SUCCESS;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org