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 di...@apache.org on 2007/03/17 08:48:08 UTC
svn commit: r519258 [2/4] - in /webservices/axis2/trunk/c/woden: include/
samples/ samples/wsdl10/ src/builder/ src/builder/wsdl10/ src/schema/
src/types/ src/util/ src/wsdl/ src/wsdl10/ src/wsdl10/extensions/
src/wsdl10/extensions/soap/ src/wsdl20/ sr...
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c Sat Mar 17 00:48:05 2007
@@ -102,8 +102,8 @@
AXIS2_ENV_CHECK(env, NULL);
soap_fault_code_impl = (woden_soap_fault_code_impl_t *) create(env);
- soap_fault_code_impl->f_token = AXIS2_STRDUP(token, env);
- soap_fault_code_impl->f_code_qn = AXIS2_QNAME_CLONE(code_qn, env);
+ soap_fault_code_impl->f_token = axis2_strdup(token, env);
+ soap_fault_code_impl->f_code_qn = axis2_qname_clone(code_qn, env);
return &(soap_fault_code_impl->soap_fault_code);
}
@@ -126,7 +126,7 @@
if (soap_fault_code_impl->f_code_qn)
{
- AXIS2_QNAME_FREE(soap_fault_code_impl->f_code_qn, env);
+ axis2_qname_free(soap_fault_code_impl->f_code_qn, env);
soap_fault_code_impl->f_code_qn = NULL;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c Sat Mar 17 00:48:05 2007
@@ -102,7 +102,7 @@
AXIS2_ENV_CHECK(env, NULL);
soap_fault_subcodes_impl = (woden_soap_fault_subcodes_impl_t *) create(env);
- soap_fault_subcodes_impl->f_token = AXIS2_STRDUP(token, env);
+ soap_fault_subcodes_impl->f_token = axis2_strdup(token, env);
soap_fault_subcodes_impl->f_subcode_qns = subcode_qns;
return &(soap_fault_subcodes_impl->soap_fault_subcodes);
@@ -134,7 +134,7 @@
{
axis2_qname_t *qname = axis2_array_list_get(soap_fault_subcodes_impl->
f_subcode_qns, env, i);
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
}
axis2_array_list_free(soap_fault_subcodes_impl->f_subcode_qns, env);
soap_fault_subcodes_impl->f_subcode_qns = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c Sat Mar 17 00:48:05 2007
@@ -347,10 +347,10 @@
if (type_def_impl->f_qname)
{
- AXIS2_QNAME_FREE(type_def_impl->f_qname, env);
+ axis2_qname_free(type_def_impl->f_qname, env);
type_def_impl->f_qname = NULL;
}
- type_def_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ type_def_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c Sat Mar 17 00:48:05 2007
@@ -733,7 +733,7 @@
{
AXIS2_FREE(env->allocator, types_impl->f_type_system);
}
- types_impl->f_type_system = AXIS2_STRDUP(type_system, env);
+ types_impl->f_type_system = axis2_strdup(type_system, env);
if (!types_impl->f_type_system)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE)
@@ -830,7 +830,7 @@
"WODEN_TYPES", AXIS2_HASH_KEY_STRING));
if (namespc)
- str_namespc = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ str_namespc = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
size = axis2_array_list_size(types_impl->f_schemas, env);
for (i = 0; i < size; i++)
{
@@ -841,7 +841,7 @@
/* get schemas whose namespace is missing */
if (!str_namespc && !str_namespc_l)
axis2_array_list_add(types_impl->schema_defs, env, schema);
- else if (str_namespc && str_namespc_l && 0 == AXIS2_STRCMP(str_namespc,
+ else if (str_namespc && str_namespc_l && 0 == axis2_strcmp(str_namespc,
str_namespc_l))
{
axis2_array_list_add(types_impl->schema_defs , env, schema);
@@ -923,7 +923,7 @@
if (NULL == qname)
return NULL;
- uri = AXIS2_QNAME_GET_URI(qname, env);
+ uri = axis2_qname_get_uri(qname, env);
schemas = woden_types_get_referenceable_schema_defs_with_namespace(
types, env, uri);
if (schemas)
@@ -965,7 +965,7 @@
if (qname)
{
- axis2_char_t *uri = AXIS2_QNAME_GET_URI(qname, env);
+ axis2_char_t *uri = axis2_qname_get_uri(qname, env);
schema_refs =
woden_types_get_referenceable_schema_defs_with_namespace(
types, env, uri);
@@ -1065,7 +1065,7 @@
xml_schema_t *schema_def =
WODEN_SCHEMA_GET_SCHEMA_DEF(schema, env);
if (AXIS2_TRUE == WODEN_SCHEMA_IS_REFERENCEABLE(schema, env) &&
- 0 == AXIS2_STRCMP(namespc, namespc_l) && schema_def)
+ 0 == axis2_strcmp(namespc, namespc_l) && schema_def)
{
axis2_array_list_add(types_impl->schema_defs, env, schema_def);
}
@@ -1090,7 +1090,7 @@
types_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_TYPES", AXIS2_HASH_KEY_STRING));
- str_uri = AXIS2_URI_TO_STRING(namespc_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+ str_uri = axis2_uri_to_string(namespc_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
return woden_types_is_namespace_in_scope_with_namespace(types, env, str_uri);
}
@@ -1111,7 +1111,7 @@
types_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_TYPES", AXIS2_HASH_KEY_STRING));
- str_uri = AXIS2_QNAME_GET_URI(qname, env);
+ str_uri = axis2_qname_get_uri(qname, env);
uri = axis2_uri_parse_string(env, str_uri);
return woden_types_is_namespace_in_scope_with_namespace_uri(types, env, uri);
}
@@ -1148,7 +1148,7 @@
}
namespc_l = WODEN_SCHEMA_GET_NAMESPACE_AS_STRING(s, env);
if (AXIS2_TRUE == WODEN_SCHEMA_IS_REFERENCEABLE(s, env) &&
- 0 == AXIS2_STRCMP(namespc, namespc_l))
+ 0 == axis2_strcmp(namespc, namespc_l))
{
result = AXIS2_TRUE;
break;
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_obj.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_obj.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_obj.c Sat Mar 17 00:48:05 2007
@@ -231,7 +231,7 @@
wsdl_obj_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_WSDL_OBJ", AXIS2_HASH_KEY_STRING));
- str_namespc = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ str_namespc = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
return (woden_component_exts_t *)axis2_hash_get(wsdl_obj_impl->
f_comp_exts, str_namespc, AXIS2_HASH_KEY_STRING);
}
@@ -253,7 +253,7 @@
wsdl_obj_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_WSDL_OBJ", AXIS2_HASH_KEY_STRING));
- str_namespc = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ str_namespc = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
if (str_namespc)
{
if (exts)
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c Sat Mar 17 00:48:05 2007
@@ -254,13 +254,13 @@
if (address_exts_impl->address)
{
- AXIS2_URI_FREE(address_exts_impl->address, env);
+ axis2_uri_free(address_exts_impl->address, env);
address_exts_impl->address = NULL;
}
if (address_exts_impl->qname)
{
- AXIS2_QNAME_FREE(address_exts_impl->qname, env);
+ axis2_qname_free(address_exts_impl->qname, env);
address_exts_impl->qname = NULL;
}
woden_wsdl10_soap_address_exts_free_ops(address_exts, env);
@@ -359,7 +359,7 @@
AXIS2_PARAM_CHECK(env->error, address, AXIS2_FAILURE);
address_exts_impl = INTF_TO_IMPL(address_exts);
- address_exts_impl->address = AXIS2_URI_CLONE(address, env);
+ address_exts_impl->address = axis2_uri_clone(address, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c Sat Mar 17 00:48:05 2007
@@ -257,7 +257,7 @@
if (binding_exts_impl->qname)
{
- AXIS2_QNAME_FREE(binding_exts_impl->qname, env);
+ axis2_qname_free(binding_exts_impl->qname, env);
binding_exts_impl->qname = NULL;
}
woden_wsdl10_soap_binding_exts_free_ops(binding_exts, env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c Sat Mar 17 00:48:05 2007
@@ -260,7 +260,7 @@
if (binding_fault_exts_impl->qname)
{
- AXIS2_QNAME_FREE(binding_fault_exts_impl->qname, env);
+ axis2_qname_free(binding_fault_exts_impl->qname, env);
binding_fault_exts_impl->qname = NULL;
}
woden_wsdl10_soap_binding_fault_exts_free_ops(binding_fault_exts, env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c Sat Mar 17 00:48:05 2007
@@ -228,7 +228,7 @@
if (binding_fault_ref_exts_impl->qname)
{
- AXIS2_QNAME_FREE(binding_fault_ref_exts_impl->qname, env);
+ axis2_qname_free(binding_fault_ref_exts_impl->qname, env);
binding_fault_ref_exts_impl->qname = NULL;
}
woden_wsdl10_soap_binding_fault_ref_exts_free_ops(binding_fault_ref_exts, env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c Sat Mar 17 00:48:05 2007
@@ -238,7 +238,7 @@
if (binding_msg_ref_exts_impl->qname)
{
- AXIS2_QNAME_FREE(binding_msg_ref_exts_impl->qname, env);
+ axis2_qname_free(binding_msg_ref_exts_impl->qname, env);
binding_msg_ref_exts_impl->qname = NULL;
}
woden_wsdl10_soap_binding_msg_ref_exts_free_ops(binding_msg_ref_exts, env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c Sat Mar 17 00:48:05 2007
@@ -264,13 +264,13 @@
if (binding_op_exts_impl->action)
{
- AXIS2_URI_FREE(binding_op_exts_impl->action, env);
+ axis2_uri_free(binding_op_exts_impl->action, env);
binding_op_exts_impl->action = NULL;
}
if (binding_op_exts_impl->qname)
{
- AXIS2_QNAME_FREE(binding_op_exts_impl->qname, env);
+ axis2_qname_free(binding_op_exts_impl->qname, env);
binding_op_exts_impl->qname = NULL;
}
woden_wsdl10_soap_binding_op_exts_free_ops(binding_op_exts, env);
@@ -393,7 +393,7 @@
AXIS2_PARAM_CHECK(env->error, action, AXIS2_FAILURE);
binding_op_exts_impl = INTF_TO_IMPL(binding_op_exts);
- binding_op_exts_impl->action = AXIS2_URI_CLONE(action, env);
+ binding_op_exts_impl->action = axis2_uri_clone(action, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c Sat Mar 17 00:48:05 2007
@@ -628,7 +628,7 @@
if (header_block_impl->f_ext_element_type)
{
- AXIS2_QNAME_FREE(header_block_impl->f_ext_element_type, env);
+ axis2_qname_free(header_block_impl->f_ext_element_type, env);
header_block_impl->f_ext_element_type = NULL;
}
@@ -646,7 +646,7 @@
if (header_block_impl->f_element_decl_qn)
{
- AXIS2_QNAME_FREE(header_block_impl->f_element_decl_qn, env);
+ axis2_qname_free(header_block_impl->f_element_decl_qn, env);
header_block_impl->f_element_decl_qn = NULL;
}
@@ -876,11 +876,11 @@
if (header_block_impl->f_element_decl_qn)
{
- AXIS2_QNAME_FREE(header_block_impl->f_element_decl_qn, env);
+ axis2_qname_free(header_block_impl->f_element_decl_qn, env);
header_block_impl->f_element_decl_qn = NULL;
}
- header_block_impl->f_element_decl_qn = AXIS2_QNAME_CLONE(qname, env);
+ header_block_impl->f_element_decl_qn = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
@@ -1046,11 +1046,11 @@
if (header_block_impl->f_ext_element_type)
{
- AXIS2_QNAME_FREE(header_block_impl->f_ext_element_type, env);
+ axis2_qname_free(header_block_impl->f_ext_element_type, env);
header_block_impl->f_ext_element_type = NULL;
}
- header_block_impl->f_ext_element_type = AXIS2_QNAME_CLONE(qname, env);
+ header_block_impl->f_ext_element_type = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c Sat Mar 17 00:48:05 2007
@@ -357,7 +357,7 @@
}
must_understand = axiom_element_get_attribute_value_by_name(ext_el, env,
WODEN_WSDL10_ATTR_MUSTUNDERSTAND);
- if (must_understand && 0 == AXIS2_STRCMP(WODEN_WSDL10_VALUE_TRUE, must_understand))
+ if (must_understand && 0 == axis2_strcmp(WODEN_WSDL10_VALUE_TRUE, must_understand))
understood = AXIS2_TRUE;
else
understood = AXIS2_FALSE;
@@ -366,7 +366,7 @@
req = axiom_element_get_attribute_value_by_name(ext_el, env,
WODEN_WSDL10_ATTR_REQUIRED);
- if (req && 0 == AXIS2_STRCMP(WODEN_WSDL10_VALUE_TRUE, req))
+ if (req && 0 == axis2_strcmp(WODEN_WSDL10_VALUE_TRUE, req))
required = AXIS2_TRUE;
else
required = AXIS2_FALSE;
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c Sat Mar 17 00:48:05 2007
@@ -611,7 +611,7 @@
if (module_impl->f_ext_element_type)
{
- AXIS2_QNAME_FREE(module_impl->f_ext_element_type, env);
+ axis2_qname_free(module_impl->f_ext_element_type, env);
module_impl->f_ext_element_type = NULL;
}
@@ -629,7 +629,7 @@
if (module_impl->f_ref)
{
- AXIS2_URI_FREE(module_impl->f_ref, env);
+ axis2_uri_free(module_impl->f_ref, env);
module_impl->f_ref = NULL;
}
@@ -812,11 +812,11 @@
if (module_impl->f_ref)
{
- AXIS2_URI_FREE(module_impl->f_ref, env);
+ axis2_uri_free(module_impl->f_ref, env);
module_impl->f_ref = NULL;
}
- module_impl->f_ref = AXIS2_URI_CLONE(uri, env);
+ module_impl->f_ref = axis2_uri_clone(uri, env);
return AXIS2_SUCCESS;
@@ -995,11 +995,11 @@
if (module_impl->f_ext_element_type)
{
- AXIS2_QNAME_FREE(module_impl->f_ext_element_type, env);
+ axis2_qname_free(module_impl->f_ext_element_type, env);
module_impl->f_ext_element_type = NULL;
}
- module_impl->f_ext_element_type = AXIS2_QNAME_CLONE(qname, env);
+ module_impl->f_ext_element_type = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c Sat Mar 17 00:48:05 2007
@@ -357,7 +357,7 @@
}
req = axiom_element_get_attribute_value_by_name(el, env,
WODEN_WSDL10_ATTR_REQUIRED);
- if (req && 0 == AXIS2_STRCMP(WODEN_WSDL10_VALUE_TRUE, req))
+ if (req && 0 == axis2_strcmp(WODEN_WSDL10_VALUE_TRUE, req))
required = AXIS2_TRUE;
else
required = AXIS2_FALSE;
@@ -366,7 +366,7 @@
WODEN_EXT_ELEMENT_SET_REQUIRED(soap_mod, env, required);
element_type_l = axis2_qname_create(env, "operation",
"http://schemas.xmlsoap.org/wsdl/soap/", NULL);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(element_type, env, element_type_l))
+ if (AXIS2_TRUE == axis2_qname_equals(element_type, env, element_type_l))
{
axis2_char_t *action_str = NULL;
axis2_uri_t *soap_action = NULL;
@@ -380,7 +380,7 @@
env, soap_action);
if( soap_action != NULL)
{
- AXIS2_URI_FREE(soap_action, env);
+ axis2_uri_free(soap_action, env);
}
@@ -392,7 +392,7 @@
}
element_type_l = axis2_qname_create(env, "address",
"http://schemas.xmlsoap.org/wsdl/soap/", NULL);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(element_type, env, element_type_l))
+ if (AXIS2_TRUE == axis2_qname_equals(element_type, env, element_type_l))
{
axis2_char_t *address_str = NULL;
axis2_uri_t *soap_address = NULL;
@@ -404,7 +404,7 @@
address_exts = woden_wsdl10_soap_address_exts_create(env);
WODEN_WSDL10_SOAP_ADDRESS_EXTS_SET_SOAP_ADDRESS(address_exts,
env, soap_address);
- AXIS2_URI_FREE(soap_address, env);
+ axis2_uri_free(soap_address, env);
soap_mod = woden_wsdl10_soap_module_to_soap_module_element(soap_mod,
env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c Sat Mar 17 00:48:05 2007
@@ -339,7 +339,7 @@
axis2_hash_set(registry_impl->deserializer_reg, parent_type,
AXIS2_HASH_KEY_STRING, inner_deserializer_reg);
}
- element_type = AXIS2_QNAME_TO_STRING(element_qtype, env);
+ element_type = axis2_qname_to_string(element_qtype, env);
axis2_hash_set(inner_deserializer_reg, element_type, AXIS2_HASH_KEY_STRING,
ed);
return AXIS2_SUCCESS;
@@ -379,13 +379,13 @@
inner_deserializer_reg = axis2_hash_get(registry_impl->deserializer_reg,
parent_type, AXIS2_HASH_KEY_STRING);
- /*elem_name = AXIS2_QNAME_TO_STRING(element_type, env); */
+ /*elem_name = axis2_qname_to_string(element_type, env); */
if (inner_deserializer_reg)
{
element_qtype = axis2_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
- elem_name = AXIS2_QNAME_TO_STRING(element_qtype, env);
+ elem_name = axis2_qname_to_string(element_qtype, env);
ed = axis2_hash_get(inner_deserializer_reg, elem_name,
AXIS2_HASH_KEY_STRING);
}
@@ -424,7 +424,7 @@
inner_ext_element_reg = axis2_hash_get(registry_impl->ext_element_reg,
parent_class, AXIS2_HASH_KEY_STRING);
- /*elem_name = AXIS2_QNAME_TO_STRING(elem_qn, env);*/
+ /*elem_name = axis2_qname_to_string(elem_qn, env);*/
if (inner_ext_element_reg)
{
element = axis2_hash_get(inner_ext_element_reg,
@@ -511,7 +511,7 @@
axis2_hash_set(registry_impl->ext_element_reg, parent_type,
AXIS2_HASH_KEY_STRING, inner_ext_type_reg);
}
- element_type = AXIS2_QNAME_TO_STRING(element_qtype, env);
+ element_type = axis2_qname_to_string(element_qtype, env);
axis2_hash_set(inner_ext_type_reg, element_type, AXIS2_HASH_KEY_STRING,
element);
return AXIS2_SUCCESS;
@@ -554,7 +554,7 @@
axis2_hash_set(registry_impl->ext_attr_reg, owner_class,
AXIS2_HASH_KEY_STRING, inner_ext_attr_reg);
}
- attr_name = AXIS2_QNAME_TO_STRING(attr_qname, env);
+ attr_name = axis2_qname_to_string(attr_qname, env);
axis2_hash_set(inner_ext_attr_reg, attr_name, AXIS2_HASH_KEY_STRING, attr);
return AXIS2_SUCCESS;
}
@@ -588,7 +588,7 @@
inner_ext_attr_reg = axis2_hash_get(registry_impl->ext_attr_reg,
parent_class, AXIS2_HASH_KEY_STRING);
- attr_name = AXIS2_QNAME_TO_STRING(attr_qn, env);
+ attr_name = axis2_qname_to_string(attr_qn, env);
if (inner_ext_attr_reg)
{
attr = axis2_hash_get(inner_ext_attr_reg, attr_name,
@@ -628,7 +628,7 @@
axis2_hash_set(registry_impl->comp_ext_reg, parent_class,
AXIS2_HASH_KEY_STRING, inner_comp_ext_reg);
}
- namespc = AXIS2_URI_TO_STRING(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
axis2_hash_set(inner_comp_ext_reg, namespc, AXIS2_HASH_KEY_STRING, comp_ext);
return AXIS2_SUCCESS;
}
@@ -658,7 +658,7 @@
inner_comp_ext_reg = axis2_hash_get(registry_impl->comp_ext_reg,
parent_class, AXIS2_HASH_KEY_STRING);
- namespc = AXIS2_URI_TO_STRING(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
if (inner_comp_ext_reg)
{
comp_ext = axis2_hash_get(inner_comp_ext_reg, namespc,
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=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_msg_ref.c Sat Mar 17 00:48:05 2007
@@ -637,7 +637,7 @@
if (msg_ref_impl->f_qname)
{
- AXIS2_QNAME_FREE(msg_ref_impl->f_qname, env);
+ axis2_qname_free(msg_ref_impl->f_qname, env);
msg_ref_impl->f_qname = NULL;
}
@@ -817,10 +817,10 @@
if (msg_ref_impl->f_qname)
{
- AXIS2_QNAME_FREE(msg_ref_impl->f_qname, env);
+ axis2_qname_free(msg_ref_impl->f_qname, env);
msg_ref_impl->f_qname = NULL;
}
- msg_ref_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ msg_ref_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
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=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c Sat Mar 17 00:48:05 2007
@@ -629,7 +629,7 @@
if (part_impl->f_qname)
{
- AXIS2_QNAME_FREE(part_impl->f_qname, env);
+ axis2_qname_free(part_impl->f_qname, env);
part_impl->f_qname = NULL;
}
@@ -641,7 +641,7 @@
if (part_impl->f_element_qname)
{
- AXIS2_QNAME_FREE(part_impl->f_element_qname, env);
+ axis2_qname_free(part_impl->f_element_qname, env);
part_impl->f_element_qname = NULL;
}
@@ -851,10 +851,10 @@
if (part_impl->f_qname)
{
- AXIS2_QNAME_FREE(part_impl->f_qname, env);
+ axis2_qname_free(part_impl->f_qname, env);
part_impl->f_qname = NULL;
}
- part_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ part_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
@@ -877,9 +877,9 @@
if (part_impl->f_element_qname)
{
- AXIS2_QNAME_FREE(part_impl->f_element_qname, env);
+ axis2_qname_free(part_impl->f_element_qname, env);
}
- part_impl->f_element_qname = AXIS2_QNAME_CLONE(element, env);
+ part_impl->f_element_qname = axis2_qname_clone(element, env);
return AXIS2_SUCCESS;
}
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=519258&r1=519257&r2=519258
==============================================================================
--- 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 Sat Mar 17 00:48:05 2007
@@ -698,7 +698,7 @@
if (binding_msg_ref_impl->f_qname)
{
- AXIS2_QNAME_FREE(binding_msg_ref_impl->
+ axis2_qname_free(binding_msg_ref_impl->
f_qname, env);
binding_msg_ref_impl->f_qname = NULL;
}
@@ -922,10 +922,10 @@
if (binding_msg_ref_impl->f_qname)
{
- AXIS2_QNAME_FREE(binding_msg_ref_impl->f_qname, env);
+ axis2_qname_free(binding_msg_ref_impl->f_qname, env);
binding_msg_ref_impl->f_qname = NULL;
}
- binding_msg_ref_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ binding_msg_ref_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
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=519258&r1=519257&r2=519258
==============================================================================
--- 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 Sat Mar 17 00:48:05 2007
@@ -800,7 +800,7 @@
if (binding_op_impl->f_qname)
{
- AXIS2_QNAME_FREE(binding_op_impl->f_qname, env);
+ axis2_qname_free(binding_op_impl->f_qname, env);
binding_op_impl->f_qname = NULL;
}
@@ -1041,10 +1041,10 @@
if (binding_op_impl->f_qname)
{
- AXIS2_QNAME_FREE(binding_op_impl->f_qname, env);
+ axis2_qname_free(binding_op_impl->f_qname, env);
binding_op_impl->f_qname = NULL;
}
- binding_op_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ binding_op_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org