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 [1/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...
Author: dinesh
Date: Sat Mar 17 00:48:05 2007
New Revision: 519258
URL: http://svn.apache.org/viewvc?view=rev&rev=519258
Log:
patch applied, thanks Diluka
Modified:
webservices/axis2/trunk/c/woden/include/woden_direction.h
webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c
webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
webservices/axis2/trunk/c/woden/src/schema/woden_imported_schema.c
webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c
webservices/axis2/trunk/c/woden/src/schema/woden_schema.c
webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c
webservices/axis2/trunk/c/woden/src/types/woden_nc_name.c
webservices/axis2/trunk/c/woden/src/types/woden_xml_char.c
webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_fault_ref.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_component_exts.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_direction.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_feature.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_import.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_msg_label.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_obj.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_msg_ref.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_msg_ref.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_msg_ref.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_exts.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_exts.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_ref_exts.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_msg_ref_exts.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_deserializer.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_fault.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_endpoint.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_fault.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_fault_ref.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c
webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c
webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c
webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c
webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c
Modified: webservices/axis2/trunk/c/woden/include/woden_direction.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_direction.h?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_direction.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_direction.h Sat Mar 17 00:48:05 2007
@@ -41,7 +41,7 @@
* Examples:
* <pre>
* WODEN_INTERFACE_MSG_REF_SET_DIRECTION(intf_msg_ref, env, WODEN_IN);
- * if(0 == AXIS2_STRCMP(WODEN_IN,WODEN_INTERFACE_GET_DIRECTION(
+ * if(0 == axis2_strcmp(WODEN_IN,WODEN_INTERFACE_GET_DIRECTION(
* intf_msg_ref, env)) ...
* </pre>
*
Modified: webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/test_wsdl2.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/test_wsdl2.c (original)
+++ webservices/axis2/trunk/c/woden/samples/test_wsdl2.c Sat Mar 17 00:48:05 2007
@@ -70,7 +70,7 @@
om_doc = get_root_element_from_filename(env, filename);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- doc_base_uri = AXIS2_STRACAT(axis2c_home, "/woden", env);
+ doc_base_uri = axis2_stracat(axis2c_home, "/woden", env);
resolver = woden_resolver_create(env);
desc = WODEN_RESOLVER_READ(resolver, env, om_doc, doc_base_uri);
@@ -81,7 +81,7 @@
if (intface)
intface_qname = WODEN_INTERFACE_GET_QNAME(intface, env);
if (intface_qname)
- printf("Interface qname is %s\n", AXIS2_QNAME_TO_STRING(intface_qname,
+ printf("Interface qname is %s\n", axis2_qname_to_string(intface_qname,
env));
svc_list = WODEN_DESC_ELEMENT_GET_SVC_ELEMENTS(desc, env);
if (svc_list)
@@ -96,7 +96,7 @@
axis2_qname_t *svc_qname = WODEN_SVC_GET_QNAME(svc, env);
if (svc_qname)
{
- printf("First service qname is %s\n", AXIS2_QNAME_TO_STRING(
+ printf("First service qname is %s\n", axis2_qname_to_string(
svc_qname, env));
}
endpoints = WODEN_SVC_GET_ENDPOINTS(svc, env);
@@ -136,7 +136,7 @@
axis2_qname_t *binding_qname = WODEN_BINDING_GET_QNAME(binding, env);
if (binding_qname)
{
- printf("First binding qname is %s\n", AXIS2_QNAME_TO_STRING(
+ printf("First binding qname is %s\n", axis2_qname_to_string(
binding_qname, env));
}
}
@@ -159,7 +159,7 @@
axis2_qname_t *ed_qname = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
if (ed_qname)
{
- printf("Element declaration qname is %s\n", AXIS2_QNAME_TO_STRING(
+ printf("Element declaration qname is %s\n", axis2_qname_to_string(
ed_qname, env));
}
content_model = WODEN_ELEMENT_DECL_GET_CONTENT_MODEL(ed, env);
Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c Sat Mar 17 00:48:05 2007
@@ -70,7 +70,7 @@
om_doc = get_root_element_from_filename(env, filename);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- doc_base_uri = AXIS2_STRACAT(axis2c_home, "/woden", env);
+ doc_base_uri = axis2_stracat(axis2c_home, "/woden", env);
resolver = woden_resolver_create(env);
desc = WODEN_RESOLVER_READ(resolver, env, om_doc, doc_base_uri);
@@ -92,7 +92,7 @@
intface_qname = WODEN_INTERFACE_GET_QNAME(intface, env);
}
if (intface_qname)
- printf("Interface qname is %s\n", AXIS2_QNAME_TO_STRING(intface_qname,
+ printf("Interface qname is %s\n", axis2_qname_to_string(intface_qname,
env));
svc_list = WODEN_WSDL10_DESC_ELEMENT_GET_SVC_ELEMENTS(desc, env);
if (svc_list)
@@ -106,7 +106,7 @@
axis2_qname_t *svc_qname = WODEN_SVC_GET_QNAME(svc, env);
if (svc_qname)
{
- printf("First service qname is %s\n", AXIS2_QNAME_TO_STRING(
+ printf("First service qname is %s\n", axis2_qname_to_string(
svc_qname, env));
}
endpoints = WODEN_SVC_GET_ENDPOINTS(svc, env);
@@ -146,7 +146,7 @@
axis2_qname_t *binding_qname = WODEN_BINDING_GET_QNAME(binding, env);
if (binding_qname)
{
- printf("First binding qname is %s\n", AXIS2_QNAME_TO_STRING(
+ printf("First binding qname is %s\n", axis2_qname_to_string(
binding_qname, env));
}
}
@@ -169,7 +169,7 @@
axis2_qname_t *ed_qname = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
if (ed_qname)
{
- printf("Element declaration qname is %s\n", AXIS2_QNAME_TO_STRING(ed_qname, env));
+ printf("Element declaration qname is %s\n", axis2_qname_to_string(ed_qname, env));
}
content_model = WODEN_ELEMENT_DECL_GET_CONTENT_MODEL(ed, env);
if (content_model)
Modified: webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_reader.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Sat Mar 17 00:48:05 2007
@@ -505,7 +505,7 @@
if (reader_impl->f_temp_uri)
{
- AXIS2_URI_FREE(reader_impl->f_temp_uri, env);
+ axis2_uri_free(reader_impl->f_temp_uri, env);
reader_impl->f_temp_uri = NULL;
}
@@ -661,7 +661,7 @@
uri = get_uri(env, document_base_uri);
WODEN_DESC_ELEMENT_SET_DOCUMENT_BASE_URI(desc, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
uri = NULL;
desc_el = AXIOM_NODE_GET_DATA_ELEMENT(desc_el_node, env);
@@ -674,7 +674,7 @@
target_namespc_uri = get_uri(env, target_namespc);
WODEN_DESC_ELEMENT_SET_TARGET_NAMESPACE(desc, env, target_namespc_uri);
- AXIS2_URI_FREE(target_namespc_uri, env);
+ axis2_uri_free(target_namespc_uri, env);
}
/* parse the namespace declarations */
@@ -698,9 +698,9 @@
local_part = axiom_attribute_get_localname(attr, env);
value = axiom_attribute_get_value(attr, env);
uri = get_uri(env, value);
- if (0 == AXIS2_STRCMP(WODEN_NS_URI_XMLNS, namespc_uri))
+ if (0 == axis2_strcmp(WODEN_NS_URI_XMLNS, namespc_uri))
{
- if (0 == AXIS2_STRCMP(WODEN_ATTR_XMLNS, local_part))
+ if (0 == axis2_strcmp(WODEN_ATTR_XMLNS, local_part))
{
WODEN_DESC_ELEMENT_ADD_NAMESPACE(desc, env, local_part, uri);
/* a prefixed namespace */
@@ -710,7 +710,7 @@
WODEN_DESC_ELEMENT_ADD_NAMESPACE(desc, env, NULL, uri);
}
}
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
uri = NULL;
}
@@ -955,7 +955,7 @@
/* TODO handle missing namespace attribute (REQUIRED attr) */
uri = get_uri(env, namespc_uri);
WODEN_IMPORT_SET_NAMESPACE(imp, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
if (location_uri)
@@ -967,7 +967,7 @@
imp = woden_import_to_import_element(imp, env);
uri = get_uri(env, location_uri);
WODEN_IMPORT_ELEMENT_SET_LOCATION(imp, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
imported_desc = get_wsdl_from_location(reader, env, location_uri, desc,
wsdl_modules);
@@ -1010,7 +1010,7 @@
uri = get_uri(env, location_uri);
include = woden_include_to_include_element(include, env);
WODEN_INCLUDE_ELEMENT_SET_LOCATION(include, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
included_desc = get_wsdl_from_location(reader, env, location_uri, desc,
wsdl_modules);
@@ -1141,12 +1141,12 @@
void *base = WODEN_INLINED_SCHEMA_GET_BASE_IMPL(schema, env);
axis2_uri_t *uri = get_uri(env, tns);
WODEN_SCHEMA_SET_NAMESPACE(base, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
desc = woden_desc_to_desc_element(desc, env);
base_uri = WODEN_DESC_ELEMENT_GET_DOCUMENT_BASE_URI(desc, env);
if (base_uri)
- base_uri_str = AXIS2_URI_TO_STRING(base_uri, env,
+ base_uri_str = axis2_uri_to_string(base_uri, env,
AXIS2_URI_UNP_OMITUSERINFO);
xsc = xml_schema_collection_create(env);
@@ -1224,7 +1224,7 @@
uri = get_uri(env, ns);
schema = woden_imported_schema_to_schema(schema, env);
WODEN_SCHEMA_SET_NAMESPACE(schema, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
uri = NULL;
}
sloc = axiom_element_get_attribute_value_by_name(import_el, env,
@@ -1233,7 +1233,7 @@
{
uri = get_uri(env, sloc);
WODEN_IMPORTED_SCHEMA_SET_LOCATION(schema, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
uri = NULL;
}
@@ -1261,7 +1261,7 @@
desc = woden_desc_to_desc_element(desc, env);
context_uri = WODEN_DESC_ELEMENT_GET_DOCUMENT_BASE_URI(desc, env);
uri = WODEN_IMPORTED_SCHEMA_GET_LOCATION(schema, env);
- schema_loc = AXIS2_URI_TO_STRING(uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+ schema_loc = axis2_uri_to_string(uri, env, AXIS2_URI_UNP_OMITUSERINFO);
uri = axis2_uri_parse_relative(env, context_uri, schema_loc);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
@@ -1270,7 +1270,7 @@
return schema;
}
- schema_uri = AXIS2_URI_TO_STRING(uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+ schema_uri = axis2_uri_to_string(uri, env, AXIS2_URI_UNP_OMITUSERINFO);
/* If the schema has already been imported, reuse it. */
schema_def = axis2_hash_get(reader_impl->f_imported_schemas, schema_uri,
@@ -1358,7 +1358,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, namespc_str, NULL);
intface = woden_interface_to_interface_element(intface, env);
WODEN_INTERFACE_ELEMENT_SET_QNAME(intface, env, qname);
@@ -1383,7 +1383,7 @@
intface = woden_interface_to_interface_element(intface, env);
uri = get_uri(env, uri_str);
WODEN_INTERFACE_ELEMENT_ADD_STYLE_DEFAULT_URI(intface, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
}
@@ -1531,7 +1531,7 @@
ns = WODEN_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
if (!ns)
ns_str = WODEN_VALUE_EMPTY_STRING;
- ns_str = AXIS2_URI_TO_STRING(ns, env, AXIS2_URI_UNP_OMITUSERINFO);
+ ns_str = axis2_uri_to_string(ns, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, ns_str, NULL);
fault = woden_interface_fault_to_interface_fault_element(fault, env);
WODEN_INTERFACE_FAULT_ELEMENT_SET_QNAME(fault, env, qname);
@@ -1655,7 +1655,7 @@
axis2_char_t *ns_str = NULL;
ns = WODEN_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- ns_str = AXIS2_URI_TO_STRING(ns, env, AXIS2_URI_UNP_OMITUSERINFO);
+ ns_str = axis2_uri_to_string(ns, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, ns_str, NULL);
op = woden_interface_op_to_interface_op_element(op, env);
WODEN_INTERFACE_OP_ELEMENT_SET_QNAME(op, env, qname);
@@ -1678,7 +1678,7 @@
uri = get_uri(env, uri_str);
op = woden_interface_op_to_interface_op_element(op, env);
WODEN_INTERFACE_OP_ELEMENT_ADD_STYLE_URI(op, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
}
@@ -1691,7 +1691,7 @@
uri = get_uri(env, pat);
op = woden_interface_op_to_interface_op_element(op, env);
WODEN_INTERFACE_OP_ELEMENT_SET_PATTERN(op, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
op = woden_interface_op_to_attr_extensible(op, env);
status = parse_ext_attributes(reader, env, op_el_node, "interface_op_element",
@@ -1842,14 +1842,14 @@
fault_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(fault_ref_el_node, env);
localname = axiom_element_get_localname(fault_ref_el, env);
- if (0 == AXIS2_STRCMP(WODEN_ELEM_INFAULT, localname))
+ if (0 == axis2_strcmp(WODEN_ELEM_INFAULT, localname))
{
woden_direction_t *direction_in = NULL;
direction_in = woden_direction_get_direction_in(env);
WODEN_INTERFACE_FAULT_REF_ELEMENT_SET_DIRECTION(fault_ref, env, direction_in);
}
- if (0 == AXIS2_STRCMP(WODEN_ELEM_OUTFAULT, localname))
+ if (0 == axis2_strcmp(WODEN_ELEM_OUTFAULT, localname))
{
woden_direction_t *direction_out = NULL;
@@ -1891,7 +1891,7 @@
label_in_str = WODEN_MSG_LABEL_TO_STRING(msg_label_in, env);
msg_label_out = woden_msg_label_get_msg_label_out(env);
label_out_str = WODEN_MSG_LABEL_TO_STRING(msg_label_out, env);
- if (0 == AXIS2_STRCMP(msg_label_str, label_in_str))
+ if (0 == axis2_strcmp(msg_label_str, label_in_str))
{
fault_ref =
woden_interface_fault_ref_to_interface_fault_ref_element(
@@ -1899,7 +1899,7 @@
WODEN_INTERFACE_FAULT_REF_ELEMENT_SET_MSG_LABEL(fault_ref,
env, msg_label_in);
}
- else if (0 == AXIS2_STRCMP(msg_label_str, label_out_str))
+ else if (0 == axis2_strcmp(msg_label_str, label_out_str))
{
fault_ref =
woden_interface_fault_ref_to_interface_fault_ref_element(
@@ -2019,7 +2019,7 @@
msg_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(msg_ref_el_node, env);
localname = axiom_element_get_localname(msg_ref_el, env);
- if (0 == AXIS2_STRCMP(WODEN_ELEM_INPUT, localname))
+ if (0 == axis2_strcmp(WODEN_ELEM_INPUT, localname))
{
woden_direction_t *direction_in = NULL;
@@ -2028,7 +2028,7 @@
msg_ref, env);
WODEN_INTERFACE_MSG_REF_ELEMENT_SET_DIRECTION(msg_ref, env, direction_in);
}
- if (0 == AXIS2_STRCMP(WODEN_ELEM_OUTPUT, localname))
+ if (0 == axis2_strcmp(WODEN_ELEM_OUTPUT, localname))
{
woden_direction_t *direction_out = NULL;
@@ -2052,7 +2052,7 @@
label_in_str = WODEN_MSG_LABEL_TO_STRING(msg_label_in, env);
msg_label_out = woden_msg_label_get_msg_label_out(env);
label_out_str = WODEN_MSG_LABEL_TO_STRING(msg_label_out, env);
- if (0 == AXIS2_STRCMP(msg_label_str, label_in_str))
+ if (0 == axis2_strcmp(msg_label_str, label_in_str))
{
msg_ref =
woden_interface_msg_ref_to_interface_msg_ref_element(
@@ -2060,7 +2060,7 @@
WODEN_INTERFACE_MSG_REF_ELEMENT_SET_MSG_LABEL(msg_ref,
env, msg_label_in);
}
- else if (0 == AXIS2_STRCMP(msg_label_str, label_out_str))
+ else if (0 == axis2_strcmp(msg_label_str, label_out_str))
{
msg_ref =
woden_interface_msg_ref_to_interface_msg_ref_element(
@@ -2118,9 +2118,9 @@
if (element)
{
- if (0 == AXIS2_STRCMP(element, WODEN_NMTOKEN_ANY) ||
- 0 == AXIS2_STRCMP(element, WODEN_NMTOKEN_NONE) ||
- 0 == AXIS2_STRCMP(element, WODEN_NMTOKEN_OTHER))
+ if (0 == axis2_strcmp(element, WODEN_NMTOKEN_ANY) ||
+ 0 == axis2_strcmp(element, WODEN_NMTOKEN_NONE) ||
+ 0 == axis2_strcmp(element, WODEN_NMTOKEN_OTHER))
{
msg_ref =
woden_interface_msg_ref_to_interface_msg_ref_element(
@@ -2261,7 +2261,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, namespc_str, NULL);
binding = woden_binding_to_binding_element(binding, env);
WODEN_BINDING_ELEMENT_SET_QNAME(binding, env, qname);
@@ -2295,7 +2295,7 @@
intface = axis2_array_list_get(interfaces, env, i);
intface = woden_interface_to_interface_element(intface, env);
qname = WODEN_INTERFACE_ELEMENT_GET_QNAME(intface, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(intface_qn, env, qname))
+ if (AXIS2_TRUE == axis2_qname_equals(intface_qn, env, qname))
{
WODEN_BINDING_SET_INTERFACE_ELEMENT(binding, env, intface);
}
@@ -2311,7 +2311,7 @@
uri = get_uri(env, type);
binding = woden_binding_to_binding_element(binding, env);
WODEN_BINDING_ELEMENT_SET_TYPE(binding, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
/* TODO extends attribute */
@@ -2490,7 +2490,7 @@
qname = WODEN_INTERFACE_FAULT_ELEMENT_GET_QNAME(
intface_flt, env);
}
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(int_flt_qn, env, qname))
+ if (AXIS2_TRUE == axis2_qname_equals(int_flt_qn, env, qname))
{
WODEN_BINDING_FAULT_SET_INTERFACE_FAULT_ELEMENT(fault,
env, intface_flt);
@@ -2626,7 +2626,7 @@
if (intface_op)
qname = WODEN_INTERFACE_OP_ELEMENT_GET_QNAME(
intface_op, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(ref_qn, env, qname))
+ if (AXIS2_TRUE == axis2_qname_equals(ref_qn, env, qname))
{
WODEN_BINDING_OP_SET_INTERFACE_OP_ELEMENT(op,
env, intface_op);
@@ -2814,7 +2814,7 @@
label_in_str = WODEN_MSG_LABEL_TO_STRING(msg_label_in, env);
msg_label_out = woden_msg_label_get_msg_label_out(env);
label_out_str = WODEN_MSG_LABEL_TO_STRING(msg_label_out, env);
- if (0 == AXIS2_STRCMP(msg_label_str, label_in_str))
+ if (0 == axis2_strcmp(msg_label_str, label_in_str))
{
fault_ref =
woden_binding_fault_ref_to_binding_fault_ref_element(
@@ -2822,7 +2822,7 @@
WODEN_BINDING_FAULT_REF_ELEMENT_SET_MSG_LABEL(fault_ref,
env, msg_label_in);
}
- else if (0 == AXIS2_STRCMP(msg_label_str, label_out_str))
+ else if (0 == axis2_strcmp(msg_label_str, label_out_str))
{
fault_ref =
woden_binding_fault_ref_to_binding_fault_ref_element(
@@ -2887,7 +2887,7 @@
int_flt_ref, env);
label = WODEN_INTERFACE_FAULT_REF_ELEMENT_GET_MSG_LABEL(
int_flt_ref, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(qref, env, qname) &&
+ if (AXIS2_TRUE == axis2_qname_equals(qref, env, qname) &&
AXIS2_TRUE == WODEN_MSG_LABEL_EQUALS(msg_label, env, label))
{
WODEN_BINDING_FAULT_REF_SET_INTERFACE_FAULT_REF_ELEMENT(
@@ -2999,7 +2999,7 @@
msg_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(msg_ref_el_node, env);
localname = axiom_element_get_localname(msg_ref_el, env);
- if (0 == AXIS2_STRCMP(WODEN_ELEM_INPUT, localname))
+ if (0 == axis2_strcmp(WODEN_ELEM_INPUT, localname))
{
woden_direction_t *direction_in = NULL;
@@ -3007,7 +3007,7 @@
msg_ref = woden_binding_msg_ref_to_binding_msg_ref_element(msg_ref, env);
WODEN_BINDING_MSG_REF_ELEMENT_SET_DIRECTION(msg_ref, env, direction_in);
}
- if (0 == AXIS2_STRCMP(WODEN_ELEM_OUTPUT, localname))
+ if (0 == axis2_strcmp(WODEN_ELEM_OUTPUT, localname))
{
woden_direction_t *direction_out = NULL;
@@ -3030,7 +3030,7 @@
label_in_str = WODEN_MSG_LABEL_TO_STRING(msg_label_in, env);
msg_label_out = woden_msg_label_get_msg_label_out(env);
label_out_str = WODEN_MSG_LABEL_TO_STRING(msg_label_out, env);
- if (0 == AXIS2_STRCMP(msg_label_str, label_in_str))
+ if (0 == axis2_strcmp(msg_label_str, label_in_str))
{
msg_ref =
woden_binding_msg_ref_to_binding_msg_ref_element(
@@ -3038,7 +3038,7 @@
WODEN_BINDING_MSG_REF_ELEMENT_SET_MSG_LABEL(msg_ref,
env, msg_label_in);
}
- else if (0 == AXIS2_STRCMP(msg_label_str, label_out_str))
+ else if (0 == axis2_strcmp(msg_label_str, label_out_str))
{
msg_ref =
woden_binding_msg_ref_to_binding_msg_ref_element(
@@ -3249,7 +3249,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, namespc_str, NULL);
svc = woden_svc_to_svc_element(svc, env);
WODEN_SVC_ELEMENT_SET_QNAME(svc, env, qname);
@@ -3284,7 +3284,7 @@
intface = axis2_array_list_get(interfaces, env, i);
intface = woden_interface_to_interface_element(intface, env);
qname = WODEN_INTERFACE_ELEMENT_GET_QNAME(intface, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(intface_qn, env, qname))
+ if (AXIS2_TRUE == axis2_qname_equals(intface_qn, env, qname))
{
WODEN_SVC_SET_INTERFACE_ELEMENT(svc, env, intface);
}
@@ -3443,7 +3443,7 @@
binding = axis2_array_list_get(bindings, env, i);
binding = woden_binding_to_binding_element(binding, env);
qname = WODEN_BINDING_ELEMENT_GET_QNAME(binding, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(binding_qn, env, qname))
+ if (AXIS2_TRUE == axis2_qname_equals(binding_qn, env, qname))
{
WODEN_ENDPOINT_SET_BINDING_ELEMENT(endpoint, env, binding);
}
@@ -3461,7 +3461,7 @@
address_uri = get_uri(env, address);
endpoint = woden_endpoint_to_endpoint_element(endpoint, env);
WODEN_ENDPOINT_ELEMENT_SET_ADDRESS(endpoint, env, address_uri);
- AXIS2_URI_FREE(address_uri, env);
+ axis2_uri_free(address_uri, env);
}
endpoint = woden_endpoint_to_attr_extensible(endpoint, env);
@@ -3568,13 +3568,13 @@
axis2_uri_t *ref_uri = get_uri(env, ref);
feature = woden_feature_to_feature_element(feature, env);
WODEN_FEATURE_ELEMENT_SET_REF(feature, env, ref_uri);
- AXIS2_URI_FREE(ref_uri, env);
+ axis2_uri_free(ref_uri, env);
}
attr_req = axis2_qname_create_from_string(env, WODEN_ATTR_REQUIRED);
req = axiom_element_get_attribute_value_by_name(feature_el, env, WODEN_ATTR_REQUIRED);
- if (req && 0 == AXIS2_STRCMP(WODEN_VALUE_TRUE, req))
+ if (req && 0 == axis2_strcmp(WODEN_VALUE_TRUE, req))
required = AXIS2_TRUE;
else
required = AXIS2_FALSE;
@@ -3689,7 +3689,7 @@
axis2_uri_t *ref_uri = get_uri(env, ref);
property = woden_property_to_property_element(property, env);
WODEN_PROPERTY_ELEMENT_SET_REF(property, env, ref_uri);
- AXIS2_URI_FREE(ref_uri, env);
+ axis2_uri_free(ref_uri, env);
}
property = woden_property_to_attr_extensible(property, env);
@@ -3756,11 +3756,11 @@
text_node = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
temp_str = axiom_text_get_value(text_node, env);
- text_value = AXIS2_STRTRIM(env, temp_str, NULL);
- len = AXIS2_STRLEN(text_value);
+ text_value = axis2_strtrim(env, temp_str, NULL);
+ len = axis2_strlen(text_value);
if (len > 0)
{
- if (0 == AXIS2_STRCMP(text_value, WODEN_NMTOKEN_VALUE))
+ if (0 == axis2_strcmp(text_value, WODEN_NMTOKEN_VALUE))
{
property = woden_property_to_property_element(property, env);
WODEN_PROPERTY_ELEMENT_SET_HAS_VALUE_TOKEN(property, env, AXIS2_TRUE);
@@ -3842,11 +3842,11 @@
}
if (!prefix) prefix = "";
attr_type = axis2_qname_create(env, localname, namespc_uri_str, prefix);
- if (namespc_uri_str && 0 != AXIS2_STRCMP(namespc_uri_str,
+ if (namespc_uri_str && 0 != axis2_strcmp(namespc_uri_str,
WODEN_NS_URI_WSDL20))
{
- if (0 != AXIS2_STRCMP(namespc_uri_str, WODEN_NS_URI_XMLNS) &&
- 0 != AXIS2_STRCMP(namespc_uri_str, WODEN_NS_URI_XSI))
+ if (0 != axis2_strcmp(namespc_uri_str, WODEN_NS_URI_XMLNS) &&
+ 0 != axis2_strcmp(namespc_uri_str, WODEN_NS_URI_XSI))
{
void *xml_attr = NULL;
woden_ext_registry_t *ext_reg = NULL;
@@ -3911,7 +3911,7 @@
el = AXIOM_NODE_GET_DATA_ELEMENT(el_node, env);
namespc = axiom_element_get_namespace(el, env, el_node);
namespc_uri_str = axiom_namespace_get_uri(namespc, env);
- if (NULL == namespc_uri_str || (0 == AXIS2_STRCMP(namespc_uri_str, WODEN_NS_URI_WSDL20)))
+ if (NULL == namespc_uri_str || (0 == axis2_strcmp(namespc_uri_str, WODEN_NS_URI_WSDL20)))
{
/* TODO Set error message */
return NULL;
@@ -3988,7 +3988,7 @@
/* Can't continue import with a bad URL.*/
return NULL;
}
- location_str = AXIS2_URI_TO_STRING(location_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+ location_str = axis2_uri_to_string(location_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
/* Check if WSDL imported or included previously from this location.*/
referenced_desc = axis2_hash_get(wsdl_modules, location_str, AXIS2_HASH_KEY_STRING);
@@ -4017,10 +4017,10 @@
if (AXIS2_TRUE != axis2_qname_util_matches(env, qname, doc_el_node))
{
/* Cannot continue without a <description> element */
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
return NULL;
}
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
referenced_desc = parse_desc(reader, env, location_str,
doc_el_node, wsdl_modules);
Modified: webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c Sat Mar 17 00:48:05 2007
@@ -233,7 +233,7 @@
WODEN_READER_FREE(reader, env);
}
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DEFINITIONS);
check = check_element_qname(resolver, env, desc_el_node, qname);
if (AXIS2_TRUE == check)
Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Sat Mar 17 00:48:05 2007
@@ -654,7 +654,7 @@
uri = get_uri(env, document_base_uri);
WODEN_WSDL10_DESC_ELEMENT_SET_DOCUMENT_BASE_URI(desc, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
uri = NULL;
desc_el = AXIOM_NODE_GET_DATA_ELEMENT(desc_el_node, env);
@@ -667,7 +667,7 @@
target_namespc_uri = get_uri(env, target_namespc);
WODEN_WSDL10_DESC_ELEMENT_SET_TARGET_NAMESPACE(desc, env, target_namespc_uri);
- AXIS2_URI_FREE(target_namespc_uri, env);
+ axis2_uri_free(target_namespc_uri, env);
}
/* parse the namespace declarations */
@@ -691,9 +691,9 @@
local_part = axiom_attribute_get_localname(attr, env);
value = axiom_attribute_get_value(attr, env);
uri = get_uri(env, value);
- if (0 == AXIS2_STRCMP(WODEN_WSDL10_NS_URI_XMLNS, namespc_uri))
+ if (0 == axis2_strcmp(WODEN_WSDL10_NS_URI_XMLNS, namespc_uri))
{
- if (0 == AXIS2_STRCMP(WODEN_WSDL10_ATTR_XMLNS, local_part))
+ if (0 == axis2_strcmp(WODEN_WSDL10_ATTR_XMLNS, local_part))
{
WODEN_WSDL10_DESC_ELEMENT_ADD_NAMESPACE(desc, env, local_part, uri);
/* a prefixed namespace */
@@ -703,7 +703,7 @@
WODEN_WSDL10_DESC_ELEMENT_ADD_NAMESPACE(desc, env, NULL, uri);
}
}
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
uri = NULL;
}
@@ -973,7 +973,7 @@
/* TODO handle missing namespace attribute (REQUIRED attr) */
uri = get_uri(env, namespc_uri);
WODEN_IMPORT_SET_NAMESPACE(imp, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
if (location_uri)
@@ -985,7 +985,7 @@
imp = woden_import_to_import_element(imp, env);
uri = get_uri(env, location_uri);
WODEN_IMPORT_ELEMENT_SET_LOCATION(imp, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
imported_desc = get_wsdl_from_location(reader, env, location_uri, desc,
wsdl_modules);
@@ -1028,7 +1028,7 @@
uri = get_uri(env, location_uri);
include = woden_include_to_include_element(include, env);
WODEN_INCLUDE_ELEMENT_SET_LOCATION(include, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
included_desc = get_wsdl_from_location(reader, env, location_uri, desc,
wsdl_modules);
@@ -1167,12 +1167,12 @@
void *base = WODEN_INLINED_SCHEMA_GET_BASE_IMPL(schema, env);
axis2_uri_t *uri = get_uri(env, tns);
WODEN_SCHEMA_SET_NAMESPACE(base, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
desc = woden_wsdl10_desc_to_desc_element(desc, env);
base_uri = WODEN_WSDL10_DESC_ELEMENT_GET_DOCUMENT_BASE_URI(desc, env);
if (base_uri)
- base_uri_str = AXIS2_URI_TO_STRING(base_uri, env,
+ base_uri_str = axis2_uri_to_string(base_uri, env,
AXIS2_URI_UNP_OMITUSERINFO);
xsc = xml_schema_collection_create(env);
@@ -1251,7 +1251,7 @@
{
uri = get_uri(env, ns);
WODEN_SCHEMA_SET_NAMESPACE(base_schema, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
uri = NULL;
}
sloc = axiom_element_get_attribute_value_by_name(import_el, env,
@@ -1260,7 +1260,7 @@
{
uri = get_uri(env, sloc);
WODEN_IMPORTED_SCHEMA_SET_LOCATION(schema, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
uri = NULL;
}
@@ -1289,7 +1289,7 @@
desc = woden_wsdl10_desc_to_desc_element(desc, env);
context_uri = WODEN_WSDL10_DESC_ELEMENT_GET_DOCUMENT_BASE_URI(desc, env);
uri = WODEN_IMPORTED_SCHEMA_GET_LOCATION(schema, env);
- schema_loc = AXIS2_URI_TO_STRING(uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+ schema_loc = axis2_uri_to_string(uri, env, AXIS2_URI_UNP_OMITUSERINFO);
uri = axis2_uri_parse_relative(env, context_uri, schema_loc);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
@@ -1301,7 +1301,7 @@
return schema;
}
- schema_uri = AXIS2_URI_TO_STRING(uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+ schema_uri = axis2_uri_to_string(uri, env, AXIS2_URI_UNP_OMITUSERINFO);
/* If the schema has already been imported, reuse it. */
schema_def = axis2_hash_get(reader_impl->f_imported_schemas, schema_uri,
@@ -1381,7 +1381,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, namespc_str, NULL);
msg = woden_wsdl10_msg_ref_to_msg_ref_element(msg, env);
WODEN_WSDL10_MSG_REF_ELEMENT_SET_QNAME(msg, env, qname);
@@ -1491,7 +1491,7 @@
part_el = AXIOM_NODE_GET_DATA_ELEMENT(part_el_node, env);
localname = axiom_element_get_localname(part_el, env);
- if (0 != AXIS2_STRCMP(WODEN_WSDL10_ELEM_PART, localname))
+ if (0 != axis2_strcmp(WODEN_WSDL10_ELEM_PART, localname))
{
/* TODO Set No element error */
return NULL;
@@ -1505,7 +1505,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, namespc_str, NULL);
part = woden_wsdl10_part_to_part_element(part, env);
WODEN_WSDL10_PART_ELEMENT_SET_QNAME(part, env, qname);
@@ -1607,7 +1607,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, namespc_str, NULL);
intface = woden_interface_to_interface_element(intface, env);
WODEN_INTERFACE_ELEMENT_SET_QNAME(intface, env, qname);
@@ -1632,7 +1632,7 @@
intface = woden_interface_to_interface_element(intface, env);
uri = get_uri(env, uri_str);
WODEN_INTERFACE_ELEMENT_ADD_STYLE_DEFAULT_URI(intface, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
}
@@ -1767,7 +1767,7 @@
axis2_char_t *ns_str = NULL;
ns = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- ns_str = AXIS2_URI_TO_STRING(ns, env, AXIS2_URI_UNP_OMITUSERINFO);
+ ns_str = axis2_uri_to_string(ns, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, ns_str, NULL);
op = woden_interface_op_to_interface_op_element(op, env);
WODEN_INTERFACE_OP_ELEMENT_SET_QNAME(op, env, qname);
@@ -1790,7 +1790,7 @@
uri = get_uri(env, uri_str);
op = woden_interface_op_to_interface_op_element(op, env);
WODEN_INTERFACE_OP_ELEMENT_ADD_STYLE_URI(op, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
}
@@ -1803,7 +1803,7 @@
uri = get_uri(env, pat);
op = woden_interface_op_to_interface_op_element(op, env);
WODEN_INTERFACE_OP_ELEMENT_SET_PATTERN(op, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
op = woden_interface_op_to_attr_extensible(op, env);
status = parse_ext_attributes(reader, env, op_el_node, "interface_op_element",
@@ -1964,14 +1964,14 @@
fault_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(fault_ref_el_node, env);
localname = axiom_element_get_localname(fault_ref_el, env);
- if (0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_INFAULT, localname))
+ if (0 == axis2_strcmp(WODEN_WSDL10_ELEM_INFAULT, localname))
{
woden_direction_t *direction_in = NULL;
direction_in = woden_direction_get_direction_in(env);
WODEN_WSDL10_INTERFACE_FAULT_REF_ELEMENT_SET_DIRECTION(fault_ref, env, direction_in);
}
- if (0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_OUTFAULT, localname))
+ if (0 == axis2_strcmp(WODEN_WSDL10_ELEM_OUTFAULT, localname))
{
woden_direction_t *direction_out = NULL;
@@ -1989,7 +1989,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, namespc_str, NULL);
fault_ref =
woden_wsdl10_interface_fault_ref_to_interface_fault_ref_element(
@@ -2005,7 +2005,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, msg, namespc_str, NULL);
fault_ref =
woden_wsdl10_interface_fault_ref_to_interface_fault_ref_element(
@@ -2094,7 +2094,7 @@
msg_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(msg_ref_el_node, env);
localname = axiom_element_get_localname(msg_ref_el, env);
- if (0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_INPUT, localname))
+ if (0 == axis2_strcmp(WODEN_WSDL10_ELEM_INPUT, localname))
{
woden_direction_t *direction_in = NULL;
@@ -2103,7 +2103,7 @@
msg_ref, env);
WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_SET_DIRECTION(msg_ref, env, direction_in);
}
- if (0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_OUTPUT, localname))
+ if (0 == axis2_strcmp(WODEN_WSDL10_ELEM_OUTPUT, localname))
{
woden_direction_t *direction_out = NULL;
@@ -2121,7 +2121,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, namespc_str, NULL);
msg_ref = woden_wsdl10_interface_msg_ref_to_interface_msg_ref_element(
msg_ref, env);
@@ -2158,7 +2158,7 @@
msg++;
}
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, msg, namespc_str, NULL);
msg_ref = woden_wsdl10_interface_msg_ref_to_interface_msg_ref_element(
msg_ref, env);
@@ -2173,7 +2173,7 @@
msg = axis2_array_list_get(msgs, env, i);
msg_qname = WODEN_WSDL10_MSG_REF_GET_QNAME(msg, env);
- if (AXIS2_QNAME_EQUALS(msg_qname, env, qname))
+ if (axis2_qname_equals(msg_qname, env, qname))
{
WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_SET_MSG(msg_ref, env, msg);
}
@@ -2266,7 +2266,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, namespc_str, NULL);
binding = woden_binding_to_binding_element(binding, env);
WODEN_BINDING_ELEMENT_SET_QNAME(binding, env, qname);
@@ -2300,7 +2300,7 @@
intface = axis2_array_list_get(interfaces, env, i);
intface = woden_interface_to_interface_element(intface, env);
qname = WODEN_INTERFACE_ELEMENT_GET_QNAME(intface, env);
- if (AXIS2_QNAME_EQUALS(intface_qn, env, qname))
+ if (axis2_qname_equals(intface_qn, env, qname))
{
WODEN_BINDING_SET_INTERFACE_ELEMENT(binding, env, intface);
}
@@ -2316,7 +2316,7 @@
uri = get_uri(env, type);
binding = woden_binding_to_binding_element(binding, env);
WODEN_BINDING_ELEMENT_SET_TYPE(binding, env, uri);
- AXIS2_URI_FREE(uri, env);
+ axis2_uri_free(uri, env);
}
/* TODO extends attribute */
@@ -2446,7 +2446,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
ref_qn = axis2_qname_create(env, name, namespc_str, NULL);
op = woden_wsdl10_binding_op_to_binding_op_element(op, env);
WODEN_WSDL10_BINDING_OP_ELEMENT_SET_QNAME(op, env, ref_qn);
@@ -2473,7 +2473,7 @@
if (intface_op)
qname = WODEN_INTERFACE_OP_ELEMENT_GET_QNAME(
intface_op, env);
- if (AXIS2_QNAME_EQUALS(ref_qn, env, qname))
+ if (axis2_qname_equals(ref_qn, env, qname))
{
WODEN_WSDL10_BINDING_OP_SET_INTERFACE_OP_ELEMENT(op,
env, intface_op);
@@ -2662,7 +2662,7 @@
label_in_str = WODEN_MSG_LABEL_TO_STRING(msg_label_in, env);
msg_label_out = woden_msg_label_get_msg_label_out(env);
label_out_str = WODEN_MSG_LABEL_TO_STRING(msg_label_out, env);
- if (0 == AXIS2_STRCMP(msg_label_str, label_in_str))
+ if (0 == axis2_strcmp(msg_label_str, label_in_str))
{
fault_ref =
woden_binding_fault_ref_to_binding_fault_ref_element(
@@ -2670,7 +2670,7 @@
WODEN_BINDING_FAULT_REF_ELEMENT_SET_MSG_LABEL(fault_ref,
env, msg_label_in);
}
- else if (0 == AXIS2_STRCMP(msg_label_str, label_out_str))
+ else if (0 == axis2_strcmp(msg_label_str, label_out_str))
{
fault_ref =
woden_binding_fault_ref_to_binding_fault_ref_element(
@@ -2734,10 +2734,10 @@
int_flt_ref, env);
/*label = WODEN_WSDL10_INTERFACE_FAULT_REF_ELEMENT_GET_MSG_LABEL(
int_flt_ref, env);
- if(AXIS2_QNAME_EQUALS(qref, env, qname) &&
+ if(axis2_qname_equals(qref, env, qname) &&
WODEN_MSG_LABEL_EQUALS(msg_label, env, label))
*/
- if (AXIS2_QNAME_EQUALS(qref, env, qname))
+ if (axis2_qname_equals(qref, env, qname))
{
WODEN_BINDING_FAULT_REF_SET_INTERFACE_FAULT_REF_ELEMENT(
fault_ref, env, int_flt_ref);
@@ -2858,7 +2858,7 @@
msg_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(msg_ref_el_node, env);
localname = axiom_element_get_localname(msg_ref_el, env);
- if (0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_INPUT, localname))
+ if (0 == axis2_strcmp(WODEN_WSDL10_ELEM_INPUT, localname))
{
woden_direction_t *direction_in = NULL;
@@ -2866,7 +2866,7 @@
msg_ref = woden_wsdl10_binding_msg_ref_to_binding_msg_ref_element(msg_ref, env);
WODEN_WSDL10_BINDING_MSG_REF_ELEMENT_SET_DIRECTION(msg_ref, env, direction_in);
}
- if (0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_OUTPUT, localname))
+ if (0 == axis2_strcmp(WODEN_WSDL10_ELEM_OUTPUT, localname))
{
woden_direction_t *direction_out = NULL;
@@ -2885,7 +2885,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, namespc_str, NULL);
msg_ref = woden_wsdl10_binding_msg_ref_to_binding_msg_ref_element(
msg_ref, env);
@@ -2927,7 +2927,7 @@
binding_msg_qname = WODEN_WSDL10_BINDING_MSG_REF_ELEMENT_GET_QNAME(msg_ref, env);
if(intf_msg_qname != NULL &&
binding_msg_qname != NULL &&
- AXIS2_QNAME_EQUALS(intf_msg_qname, env, binding_msg_qname))
+ axis2_qname_equals(intf_msg_qname, env, binding_msg_qname))
{
WODEN_WSDL10_BINDING_MSG_REF_SET_INTERFACE_MSG_REF_ELEMENT(
msg_ref, env, int_msg_ref);
@@ -3049,7 +3049,7 @@
axis2_char_t *namespc_str = NULL;
namespc = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
- namespc_str = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
qname = axis2_qname_create(env, name, namespc_str, NULL);
svc = woden_wsdl10_svc_to_svc_element(svc, env);
WODEN_WSDL10_SVC_ELEMENT_SET_QNAME(svc, env, qname);
@@ -3084,7 +3084,7 @@
intface = axis2_array_list_get(interfaces, env, i);
intface = woden_interface_to_interface_element(intface, env);
qname = WODEN_INTERFACE_ELEMENT_GET_QNAME(intface, env);
- if (AXIS2_QNAME_EQUALS(intface_qn, env, qname))
+ if (axis2_qname_equals(intface_qn, env, qname))
{
WODEN_WSDL10_SVC_SET_INTERFACE_ELEMENT(svc, env, intface);
}
@@ -3252,7 +3252,7 @@
binding = axis2_array_list_get(bindings, env, i);
binding = woden_binding_to_binding_element(binding, env);
qname = WODEN_BINDING_ELEMENT_GET_QNAME(binding, env);
- if (AXIS2_QNAME_EQUALS(binding_qn, env, qname))
+ if (axis2_qname_equals(binding_qn, env, qname))
{
WODEN_WSDL10_ENDPOINT_SET_BINDING_ELEMENT(endpoint, env, binding);
}
@@ -3270,7 +3270,7 @@
address_uri = get_uri(env, address);
endpoint = woden_wsdl10_endpoint_to_endpoint_element(endpoint, env);
WODEN_WSDL10_ENDPOINT_ELEMENT_SET_ADDRESS(endpoint, env, address_uri);
- AXIS2_URI_FREE(address_uri, env);
+ axis2_uri_free(address_uri, env);
}
endpoint = woden_wsdl10_endpoint_to_attr_extensible(endpoint, env);
@@ -3378,13 +3378,13 @@
axis2_uri_t *ref_uri = get_uri(env, ref);
feature = woden_feature_to_feature_element(feature, env);
WODEN_FEATURE_ELEMENT_SET_REF(feature, env, ref_uri);
- AXIS2_URI_FREE(ref_uri, env);
+ axis2_uri_free(ref_uri, env);
}
attr_req = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_REQUIRED);
req = axiom_element_get_attribute_value_by_name(feature_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;
@@ -3506,7 +3506,7 @@
axis2_uri_t *ref_uri = get_uri(env, ref);
property = woden_property_to_property_element(property, env);
WODEN_PROPERTY_ELEMENT_SET_REF(property, env, ref_uri);
- AXIS2_URI_FREE(ref_uri, env);
+ axis2_uri_free(ref_uri, env);
}
property = woden_property_to_attr_extensible(property, env);
@@ -3573,11 +3573,11 @@
text_node = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
temp_str = axiom_text_get_value(text_node, env);
- text_value = AXIS2_STRTRIM(env, temp_str, NULL);
- len = AXIS2_STRLEN(text_value);
+ text_value = axis2_strtrim(env, temp_str, NULL);
+ len = axis2_strlen(text_value);
if (len > 0)
{
- if (0 == AXIS2_STRCMP(text_value, WODEN_WSDL10_NMTOKEN_VALUE))
+ if (0 == axis2_strcmp(text_value, WODEN_WSDL10_NMTOKEN_VALUE))
{
property = woden_property_to_property_element(property, env);
WODEN_PROPERTY_ELEMENT_SET_HAS_VALUE_TOKEN(property, env, AXIS2_TRUE);
@@ -3666,11 +3666,11 @@
}
if (!prefix) prefix = "";
attr_type = axis2_qname_create(env, localname, namespc_uri_str, prefix);
- if (namespc_uri_str && 0 != AXIS2_STRCMP(namespc_uri_str,
+ if (namespc_uri_str && 0 != axis2_strcmp(namespc_uri_str,
WODEN_WSDL10_NS_URI_WSDL20))
{
- if (0 != AXIS2_STRCMP(namespc_uri_str, WODEN_WSDL10_NS_URI_XMLNS) &&
- 0 != AXIS2_STRCMP(namespc_uri_str, WODEN_WSDL10_NS_URI_XSI))
+ if (0 != axis2_strcmp(namespc_uri_str, WODEN_WSDL10_NS_URI_XMLNS) &&
+ 0 != axis2_strcmp(namespc_uri_str, WODEN_WSDL10_NS_URI_XSI))
{
void *xml_attr = NULL;
woden_wsdl10_ext_registry_t *ext_reg = NULL;
@@ -3737,7 +3737,7 @@
el = AXIOM_NODE_GET_DATA_ELEMENT(el_node, env);
namespc = axiom_element_get_namespace(el, env, el_node);
namespc_uri_str = axiom_namespace_get_uri(namespc, env);
- if (!namespc_uri_str || (0 == AXIS2_STRCMP(namespc_uri_str,
+ if (!namespc_uri_str || (0 == axis2_strcmp(namespc_uri_str,
WODEN_WSDL10_NS_URI_WSDL20)))
{
/* TODO Set error message */
@@ -3818,7 +3818,7 @@
/* Can't continue import with a bad URL.*/
return NULL;
}
- location_str = AXIS2_URI_TO_STRING(location_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+ location_str = axis2_uri_to_string(location_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
/* Check if WSDL imported or included previously from this location.*/
referenced_desc = axis2_hash_get(wsdl_modules, location_str, AXIS2_HASH_KEY_STRING);
@@ -3847,10 +3847,10 @@
if (AXIS2_TRUE != axis2_qname_util_matches(env, qname, doc_el_node))
{
/* Cannot continue without a <description> element */
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
return NULL;
}
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
referenced_desc = parse_desc(reader, env, location_str,
doc_el_node, wsdl_modules);
Modified: webservices/axis2/trunk/c/woden/src/schema/woden_imported_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/woden_imported_schema.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/woden_imported_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/woden_imported_schema.c Sat Mar 17 00:48:05 2007
@@ -233,7 +233,7 @@
if (schema_impl->f_schema_location)
{
- AXIS2_URI_FREE(schema_impl->f_schema_location, env);
+ axis2_uri_free(schema_impl->f_schema_location, env);
schema_impl->f_schema_location = NULL;
}
@@ -337,7 +337,7 @@
if (schema_impl->f_schema_location)
{
- AXIS2_URI_FREE(schema_impl->f_schema_location, env);
+ axis2_uri_free(schema_impl->f_schema_location, env);
schema_impl->f_schema_location = NULL;
}
schema_impl->f_schema_location = AXIS2_URI_CLONE(location, env);
Modified: webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/woden_inlined_schema.c Sat Mar 17 00:48:05 2007
@@ -344,7 +344,7 @@
AXIS2_FREE(env->allocator, schema_impl->f_schema_id);
schema_impl->f_schema_id = NULL;
}
- schema_impl->f_schema_id = AXIS2_STRDUP(id, env);
+ schema_impl->f_schema_id = axis2_strdup(id, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/schema/woden_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/woden_schema.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/woden_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/woden_schema.c Sat Mar 17 00:48:05 2007
@@ -147,7 +147,7 @@
if (schema_impl->f_namespc)
{
- AXIS2_URI_FREE(schema_impl->f_namespc, env);
+ axis2_uri_free(schema_impl->f_namespc, env);
schema_impl->f_namespc = NULL;
}
@@ -278,10 +278,10 @@
if (schema_impl->f_namespc)
{
- AXIS2_URI_FREE(schema_impl->f_namespc, env);
+ axis2_uri_free(schema_impl->f_namespc, env);
schema_impl->f_namespc = NULL;
}
- schema_impl->f_namespc = AXIS2_URI_CLONE(namespc, env);
+ schema_impl->f_namespc = axis2_uri_clone(namespc, env);
return AXIS2_SUCCESS;
}
@@ -392,6 +392,6 @@
"WODEN_SCHEMA", AXIS2_HASH_KEY_STRING));
return schema_impl->f_namespc ?
- AXIS2_URI_TO_STRING(schema_impl->f_namespc, env, AXIS2_URI_UNP_OMITUSERINFO) : NULL;
+ axis2_uri_to_string(schema_impl->f_namespc, env, AXIS2_URI_UNP_OMITUSERINFO) : NULL;
}
Modified: webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c Sat Mar 17 00:48:05 2007
@@ -40,18 +40,18 @@
q2000 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_XSD_2000);
q2001 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_XSD_2001);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(schema, env, q1999) ||
- AXIS2_TRUE == AXIS2_QNAME_EQUALS(schema, env, q2000) ||
- AXIS2_TRUE == AXIS2_QNAME_EQUALS(schema, env, q2001))
+ if (AXIS2_TRUE == axis2_qname_equals(schema, env, q1999) ||
+ AXIS2_TRUE == axis2_qname_equals(schema, env, q2000) ||
+ AXIS2_TRUE == axis2_qname_equals(schema, env, q2001))
{
ret = AXIS2_TRUE;
}
if (q1999)
- AXIS2_QNAME_FREE(q1999, env);
+ axis2_qname_free(q1999, env);
if (q2000)
- AXIS2_QNAME_FREE(q2000, env);
+ axis2_qname_free(q2000, env);
if (q2001)
- AXIS2_QNAME_FREE(q2001, env);
+ axis2_qname_free(q2001, env);
return ret;
}
@@ -70,18 +70,18 @@
q2000 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_INCLUDE_XSD_2000);
q2001 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_INCLUDE_XSD_2001);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(include, env, q1999) ||
- AXIS2_TRUE == AXIS2_QNAME_EQUALS(include, env, q2000) ||
- AXIS2_TRUE == AXIS2_QNAME_EQUALS(include, env, q2001))
+ if (AXIS2_TRUE == axis2_qname_equals(include, env, q1999) ||
+ AXIS2_TRUE == axis2_qname_equals(include, env, q2000) ||
+ AXIS2_TRUE == axis2_qname_equals(include, env, q2001))
{
ret = AXIS2_TRUE;
}
if (q1999)
- AXIS2_QNAME_FREE(q1999, env);
+ axis2_qname_free(q1999, env);
if (q2000)
- AXIS2_QNAME_FREE(q2000, env);
+ axis2_qname_free(q2000, env);
if (q2001)
- AXIS2_QNAME_FREE(q2001, env);
+ axis2_qname_free(q2001, env);
return ret;
}
@@ -100,18 +100,18 @@
q2000 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_IMPORT_XSD_2000);
q2001 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_IMPORT_XSD_2001);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(import, env, q1999) ||
- AXIS2_TRUE == AXIS2_QNAME_EQUALS(import, env, q2000) ||
- AXIS2_TRUE == AXIS2_QNAME_EQUALS(import, env, q2001))
+ if (AXIS2_TRUE == axis2_qname_equals(import, env, q1999) ||
+ AXIS2_TRUE == axis2_qname_equals(import, env, q2000) ||
+ AXIS2_TRUE == axis2_qname_equals(import, env, q2001))
{
ret = AXIS2_TRUE;
}
if (q1999)
- AXIS2_QNAME_FREE(q1999, env);
+ axis2_qname_free(q1999, env);
if (q2000)
- AXIS2_QNAME_FREE(q2000, env);
+ axis2_qname_free(q2000, env);
if (q2001)
- AXIS2_QNAME_FREE(q2001, env);
+ axis2_qname_free(q2001, env);
return ret;
}
@@ -130,18 +130,18 @@
q2000 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_REDEFINE_XSD_2000);
q2001 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_REDEFINE_XSD_2001);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(redefine, env, q1999) ||
- AXIS2_TRUE == AXIS2_QNAME_EQUALS(redefine, env, q2000) ||
- AXIS2_TRUE == AXIS2_QNAME_EQUALS(redefine, env, q2001))
+ if (AXIS2_TRUE == axis2_qname_equals(redefine, env, q1999) ||
+ AXIS2_TRUE == axis2_qname_equals(redefine, env, q2000) ||
+ AXIS2_TRUE == axis2_qname_equals(redefine, env, q2001))
{
ret = AXIS2_TRUE;
}
if (q1999)
- AXIS2_QNAME_FREE(q1999, env);
+ axis2_qname_free(q1999, env);
if (q2000)
- AXIS2_QNAME_FREE(q2000, env);
+ axis2_qname_free(q2000, env);
if (q2001)
- AXIS2_QNAME_FREE(q2001, env);
+ axis2_qname_free(q2001, env);
return ret;
}
Modified: webservices/axis2/trunk/c/woden/src/types/woden_nc_name.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/types/woden_nc_name.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/types/woden_nc_name.c (original)
+++ webservices/axis2/trunk/c/woden/src/types/woden_nc_name.c Sat Mar 17 00:48:05 2007
@@ -123,7 +123,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
nc_name_impl = INTF_TO_IMPL(nc_name);
- for (scan = 0; scan < AXIS2_STRLEN(st_value); scan++)
+ for (scan = 0; scan < axis2_strlen(st_value); scan++)
{
if (scan == 0)
b_valid = woden_xml_char_is_nc_name_start(st_value[scan]);
@@ -156,7 +156,7 @@
AXIS2_FREE(env->allocator, nc_name_impl->f_value);
nc_name_impl->f_value = NULL;
}
- nc_name_impl->f_value = AXIS2_STRDUP(value, env);
+ nc_name_impl->f_value = axis2_strdup(value, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/types/woden_xml_char.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/types/woden_xml_char.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/types/woden_xml_char.c (original)
+++ webservices/axis2/trunk/c/woden/src/types/woden_xml_char.c Sat Mar 17 00:48:05 2007
@@ -477,12 +477,12 @@
axis2_char_t ch = 0;
int i = 0;
- if (AXIS2_STRLEN(name) == 0)
+ if (axis2_strlen(name) == 0)
return AXIS2_FALSE;
ch = name[0];
if (woden_xml_char_is_name_start(ch) == AXIS2_FALSE)
return AXIS2_FALSE;
- for (i = 1; i < AXIS2_STRLEN(name); i++)
+ for (i = 1; i < axis2_strlen(name); i++)
{
ch = name[i];
if (woden_xml_char_is_name(ch) == AXIS2_FALSE)
@@ -501,12 +501,12 @@
axis2_char_t ch = 0;
int i = 0;
- if (AXIS2_STRLEN(nc_name) == 0)
+ if (axis2_strlen(nc_name) == 0)
return AXIS2_FALSE;
ch = nc_name[0];
if (woden_xml_char_is_nc_name_start(ch) == AXIS2_FALSE)
return AXIS2_FALSE;
- for (i = 1; i < AXIS2_STRLEN(nc_name); i++)
+ for (i = 1; i < axis2_strlen(nc_name); i++)
{
ch = nc_name[i];
if (woden_xml_char_is_nc_name(ch) == AXIS2_FALSE)
@@ -524,9 +524,9 @@
axis2_char_t ch = 0;
int i = 0;
- if (AXIS2_STRLEN(nmtoken) == 0)
+ if (axis2_strlen(nmtoken) == 0)
return AXIS2_FALSE;
- for (i = 0; i < AXIS2_STRLEN(nmtoken); i++)
+ for (i = 0; i < axis2_strlen(nmtoken); i++)
{
ch = nmtoken[i];
if (! woden_xml_char_is_name(ch))
Modified: webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_om_util.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_om_util.c Sat Mar 17 00:48:05 2007
@@ -72,22 +72,22 @@
ns_uri = axis2_hash_get(namespcs, prefix, AXIS2_HASH_KEY_STRING);
if (ns_uri)
- ns_uri_str = AXIS2_URI_TO_STRING(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
- if (ns_uri_str && 0 == AXIS2_STRCMP(ns_uri_str, namespc_uri_str))
+ ns_uri_str = axis2_uri_to_string(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+ if (ns_uri_str && 0 == axis2_strcmp(ns_uri_str, namespc_uri_str))
{
/* Namespace already registerd */
return AXIS2_SUCCESS;
}
- tmp_prefix = AXIS2_STRDUP(prefix, env);
- while (ns_uri_str && 0 != AXIS2_STRCMP(ns_uri_str, namespc_uri_str))
+ tmp_prefix = axis2_strdup(prefix, env);
+ while (ns_uri_str && 0 != axis2_strcmp(ns_uri_str, namespc_uri_str))
{
axis2_char_t *temp = NULL;
- temp = AXIS2_STRACAT(tmp_prefix, "_", env);
+ temp = axis2_stracat(tmp_prefix, "_", env);
ns_uri = axis2_hash_get(namespcs, temp, AXIS2_HASH_KEY_STRING);
- ns_uri_str = AXIS2_URI_TO_STRING(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+ ns_uri_str = axis2_uri_to_string(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
AXIS2_FREE(env->allocator, tmp_prefix);
- tmp_prefix = AXIS2_STRDUP(temp, env);
+ tmp_prefix = axis2_strdup(temp, env);
AXIS2_FREE(env->allocator, temp);
}
uri = axis2_uri_parse_string(env, namespc_uri_str);
Modified: webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c Sat Mar 17 00:48:05 2007
@@ -30,9 +30,9 @@
axis2_bool_t ret = AXIS2_FALSE;
qname_l = axis2_qname_util_new_qname(env, node);
- if (node && AXIS2_TRUE == AXIS2_QNAME_EQUALS(qname, env, qname_l))
+ if (node && AXIS2_TRUE == axis2_qname_equals(qname, env, qname_l))
ret = AXIS2_TRUE;
- AXIS2_QNAME_FREE(qname_l, env);
+ axis2_qname_free(qname_l, env);
return ret;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c Sat Mar 17 00:48:05 2007
@@ -284,7 +284,7 @@
extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_ATTR_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
- str_attr_type = AXIS2_QNAME_TO_STRING(attr_type, env);
+ str_attr_type = axis2_qname_to_string(attr_type, env);
if (attr)
axis2_hash_set(extensible_impl->f_ext_attrs, str_attr_type,
AXIS2_HASH_KEY_STRING, attr);
@@ -310,7 +310,7 @@
extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_ATTR_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
- str_attr_type = AXIS2_QNAME_TO_STRING(attr_type, env);
+ str_attr_type = axis2_qname_to_string(attr_type, env);
return (woden_xml_attr_t *)axis2_hash_get(extensible_impl->f_ext_attrs,
str_attr_type, AXIS2_HASH_KEY_STRING);
}
@@ -371,7 +371,7 @@
extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_ATTR_EXTENSIBLE", 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 (extensible_impl->temp_attrs)
{
int size = 0, i = 0;
@@ -417,7 +417,7 @@
extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_ATTR_EXTENSIBLE", 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);
for (index = axis2_hash_first(extensible_impl->f_ext_attrs, env); index;
index = axis2_hash_next(env, index))
{
@@ -427,8 +427,8 @@
axis2_hash_this(index, &v, NULL, NULL);
key = (axis2_qname_t *) v;
- str_ns = AXIS2_QNAME_GET_URI(key, env);
- if (0 == AXIS2_STRCMP(str_ns, str_namespc))
+ str_ns = axis2_qname_get_uri(key, env);
+ if (0 == axis2_strcmp(str_ns, str_namespc))
{
result = AXIS2_TRUE;
break;
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c Sat Mar 17 00:48:05 2007
@@ -600,13 +600,13 @@
if (binding_impl->f_qname)
{
- AXIS2_QNAME_FREE(binding_impl->f_qname, env);
+ axis2_qname_free(binding_impl->f_qname, env);
binding_impl->f_qname = NULL;
}
if (binding_impl->f_interface_qname)
{
- AXIS2_QNAME_FREE(binding_impl->f_interface_qname, env);
+ axis2_qname_free(binding_impl->f_interface_qname, env);
binding_impl->f_interface_qname = NULL;
}
@@ -618,7 +618,7 @@
if (binding_impl->f_type)
{
- AXIS2_URI_FREE(binding_impl->f_type, env);
+ axis2_uri_free(binding_impl->f_type, env);
binding_impl->f_type = NULL;
}
@@ -904,9 +904,9 @@
if (binding_impl->f_qname)
{
- AXIS2_QNAME_FREE(binding_impl->f_qname, env);
+ axis2_qname_free(binding_impl->f_qname, env);
}
- binding_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ binding_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
@@ -927,9 +927,9 @@
if (binding_impl->f_interface_qname)
{
- AXIS2_QNAME_FREE(binding_impl->f_interface_qname, env);
+ axis2_qname_free(binding_impl->f_interface_qname, env);
}
- binding_impl->f_interface_qname = AXIS2_QNAME_CLONE(qname, env);
+ binding_impl->f_interface_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
@@ -984,10 +984,10 @@
if (binding_impl->f_type)
{
- AXIS2_URI_FREE(binding_impl->f_type, env);
+ axis2_uri_free(binding_impl->f_type, env);
binding_impl->f_type = NULL;
}
- binding_impl->f_type = AXIS2_URI_CLONE(type, env);
+ binding_impl->f_type = axis2_uri_clone(type, env);
return AXIS2_SUCCESS;
}
@@ -1112,7 +1112,7 @@
env, i);
qname_l = (axis2_qname_t *) WODEN_BINDING_FAULT_ELEMENT_GET_REF(
bind_fault, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(qname, env, qname_l))
+ if (AXIS2_TRUE == axis2_qname_equals(qname, env, qname_l))
{
fault = bind_fault;
break;
@@ -1149,7 +1149,7 @@
env, i);
qname_l = (axis2_qname_t *) WODEN_BINDING_OP_ELEMENT_GET_REF(
bind_op, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(qname, env, qname_l))
+ if (AXIS2_TRUE == axis2_qname_equals(qname, env, qname_l))
{
op = bind_op;
break;
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_fault_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_fault_ref.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_fault_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_fault_ref.c Sat Mar 17 00:48:05 2007
@@ -676,7 +676,7 @@
if (binding_fault_ref_impl->f_ref)
{
- AXIS2_QNAME_FREE(binding_fault_ref_impl->f_ref, env);
+ axis2_qname_free(binding_fault_ref_impl->f_ref, env);
binding_fault_ref_impl->f_ref = NULL;
}
@@ -890,9 +890,9 @@
if (binding_fault_ref_impl->f_ref)
{
- AXIS2_QNAME_FREE(binding_fault_ref_impl->f_ref, env);
+ axis2_qname_free(binding_fault_ref_impl->f_ref, env);
}
- binding_fault_ref_impl->f_ref = AXIS2_QNAME_CLONE(fault_qname, env);
+ binding_fault_ref_impl->f_ref = axis2_qname_clone(fault_qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_component_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_component_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_component_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_component_exts.c Sat Mar 17 00:48:05 2007
@@ -103,7 +103,7 @@
if (component_exts_impl->f_namespc)
{
- AXIS2_URI_FREE(component_exts_impl->f_namespc, env);
+ axis2_uri_free(component_exts_impl->f_namespc, env);
component_exts_impl->f_namespc = NULL;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_direction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_direction.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_direction.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_direction.c Sat Mar 17 00:48:05 2007
@@ -77,7 +77,7 @@
AXIS2_ENV_CHECK(env, NULL);
direction_impl = (woden_direction_impl_t *) create(env);
- direction_impl->f_value = AXIS2_STRDUP(value, env);
+ direction_impl->f_value = axis2_strdup(value, env);
return &(direction_impl->direction);
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c Sat Mar 17 00:48:05 2007
@@ -382,10 +382,10 @@
if (decl_impl->f_qname)
{
- AXIS2_QNAME_FREE(decl_impl->f_qname, env);
+ axis2_qname_free(decl_impl->f_qname, env);
decl_impl->f_qname = NULL;
}
- decl_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ decl_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
@@ -406,7 +406,7 @@
if (decl_impl->f_system)
{
- AXIS2_URI_FREE(decl_impl->f_system, env);
+ axis2_uri_free(decl_impl->f_system, env);
}
decl_impl->f_system = type_system_uri;
return AXIS2_SUCCESS;
@@ -432,7 +432,7 @@
AXIS2_FREE(env->allocator, decl_impl->f_content_model);
decl_impl->f_content_model = NULL;
}
- decl_impl->f_content_model = AXIS2_STRDUP(content_model, env);
+ decl_impl->f_content_model = axis2_strdup(content_model, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c Sat Mar 17 00:48:05 2007
@@ -360,7 +360,7 @@
ext_elem = (woden_ext_element_t *)axis2_array_list_get(
extensible_impl->f_ext_elements, env, i);
ext_type_l = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_elem, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(ext_type, env, ext_type_l))
+ if (AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l))
{
axis2_array_list_add(extensible_impl->temp_elems, env, ext_elem);
}
@@ -387,7 +387,7 @@
extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_ELEMENT_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
- ext_ns = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ ext_ns = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
size = axis2_array_list_size(extensible_impl->f_ext_elements, env);
for (i = 0; i < size; i++)
{
@@ -398,8 +398,8 @@
ext_elem = (woden_ext_element_t *) axis2_array_list_get(
extensible_impl->f_ext_elements, env, i);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_elem, env);
- uri = AXIS2_QNAME_GET_URI(ext_type, env);
- if (0 == AXIS2_STRCMP(uri, ext_ns))
+ uri = axis2_qname_get_uri(ext_type, env);
+ if (0 == axis2_strcmp(uri, ext_ns))
{
result = AXIS2_TRUE;
break;
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_feature.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_feature.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_feature.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_feature.c Sat Mar 17 00:48:05 2007
@@ -546,7 +546,7 @@
if (feature_impl->f_ref)
{
- AXIS2_URI_FREE(feature_impl->f_ref, env);
+ axis2_uri_free(feature_impl->f_ref, env);
feature_impl->f_ref = NULL;
}
@@ -688,10 +688,10 @@
if (feature_impl->f_ref)
{
- AXIS2_URI_FREE(feature_impl->f_ref, env);
+ axis2_uri_free(feature_impl->f_ref, env);
feature_impl->f_ref = NULL;
}
- feature_impl->f_ref = AXIS2_URI_CLONE(ref, env);
+ feature_impl->f_ref = axis2_uri_clone(ref, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_import.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_import.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_import.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_import.c Sat Mar 17 00:48:05 2007
@@ -316,7 +316,7 @@
if (import_impl->f_namespc)
{
- AXIS2_URI_FREE(import_impl->f_namespc, env);
+ axis2_uri_free(import_impl->f_namespc, env);
import_impl->f_namespc = NULL;
}
@@ -444,10 +444,10 @@
if (import_impl->f_namespc)
{
- AXIS2_URI_FREE(import_impl->f_namespc, env);
+ axis2_uri_free(import_impl->f_namespc, env);
import_impl->f_namespc = NULL;
}
- import_impl->f_namespc = AXIS2_URI_CLONE(ns_uri, env);
+ import_impl->f_namespc = axis2_uri_clone(ns_uri, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c Sat Mar 17 00:48:05 2007
@@ -522,7 +522,7 @@
if (interface_impl->f_qname)
{
- AXIS2_QNAME_FREE(interface_impl->f_qname, env);
+ axis2_qname_free(interface_impl->f_qname, env);
interface_impl->f_qname = NULL;
}
@@ -759,7 +759,7 @@
flt = axis2_array_list_get(interface_impl->f_interface_fault_elements,
env, i);
qname_l = (axis2_qname_t *) WODEN_INTERFACE_FAULT_GET_QNAME(flt, env);
- if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(qname, env, qname_l))
+ if (AXIS2_TRUE == axis2_qname_equals(qname, env, qname_l))
{
fault = flt;
break;
@@ -821,9 +821,9 @@
if (interface_impl->f_qname)
{
- AXIS2_QNAME_FREE(interface_impl->f_qname, env);
+ axis2_qname_free(interface_impl->f_qname, env);
}
- interface_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ interface_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
@@ -851,7 +851,7 @@
return AXIS2_FAILURE;
}
}
- axis2_array_list_add(interface_impl->f_style_default, env, AXIS2_URI_CLONE(
+ axis2_array_list_add(interface_impl->f_style_default, env, axis2_uri_clone(
uri, env));
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c Sat Mar 17 00:48:05 2007
@@ -724,13 +724,13 @@
if (interface_op_impl->f_qname)
{
- AXIS2_QNAME_FREE(interface_op_impl->f_qname, env);
+ axis2_qname_free(interface_op_impl->f_qname, env);
interface_op_impl->f_qname = NULL;
}
if (interface_op_impl->f_msg_exchange_pattern)
{
- AXIS2_URI_FREE(interface_op_impl->f_msg_exchange_pattern, env);
+ axis2_uri_free(interface_op_impl->f_msg_exchange_pattern, env);
interface_op_impl->f_msg_exchange_pattern = NULL;
}
@@ -1006,10 +1006,10 @@
if (interface_op_impl->f_qname)
{
- AXIS2_QNAME_FREE(interface_op_impl->f_qname, env);
+ axis2_qname_free(interface_op_impl->f_qname, env);
interface_op_impl->f_qname = NULL;
}
- interface_op_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ interface_op_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
@@ -1031,10 +1031,10 @@
if (interface_op_impl->f_msg_exchange_pattern)
{
- AXIS2_URI_FREE(interface_op_impl->f_msg_exchange_pattern, env);
+ axis2_uri_free(interface_op_impl->f_msg_exchange_pattern, env);
interface_op_impl->f_msg_exchange_pattern = NULL;
}
- interface_op_impl->f_msg_exchange_pattern = AXIS2_URI_CLONE(uri, env);
+ interface_op_impl->f_msg_exchange_pattern = axis2_uri_clone(uri, env);
return AXIS2_SUCCESS;
@@ -1080,7 +1080,7 @@
return AXIS2_FAILURE;
}
}
- axis2_array_list_add(interface_op_impl->f_style, env, AXIS2_URI_CLONE(uri, env));
+ axis2_array_list_add(interface_op_impl->f_style, env, axis2_uri_clone(uri, env));
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_msg_label.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_msg_label.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_msg_label.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_msg_label.c Sat Mar 17 00:48:05 2007
@@ -93,7 +93,7 @@
AXIS2_ENV_CHECK(env, NULL);
msg_label_impl = (woden_msg_label_impl_t *) create(env);
- msg_label_impl->f_value = AXIS2_STRDUP(value, env);
+ msg_label_impl->f_value = axis2_strdup(value, env);
msg_label_impl->f_valid = valid;
return &(msg_label_impl->msg_label);
@@ -209,7 +209,7 @@
msg_label_impl = INTF_TO_IMPL(msg_label);
value = WODEN_MSG_LABEL_TO_STRING(other, env);
- if (0 == AXIS2_STRCMP(msg_label_impl->f_value, value))
+ if (0 == axis2_strcmp(msg_label_impl->f_value, value))
{
return AXIS2_TRUE;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c Sat Mar 17 00:48:05 2007
@@ -633,7 +633,7 @@
if (property_impl->f_ref)
{
- AXIS2_URI_FREE(property_impl->f_ref, env);
+ axis2_uri_free(property_impl->f_ref, env);
property_impl->f_ref = NULL;
}
@@ -780,10 +780,10 @@
if (property_impl->f_ref)
{
- AXIS2_URI_FREE(property_impl->f_ref, env);
+ axis2_uri_free(property_impl->f_ref, env);
property_impl->f_ref = NULL;
}
- property_impl->f_ref = AXIS2_URI_CLONE(ref, env);
+ property_impl->f_ref = axis2_uri_clone(ref, env);
return AXIS2_SUCCESS;
}
@@ -968,10 +968,10 @@
if (property_impl->f_constraint_qname)
{
- AXIS2_QNAME_FREE(property_impl->f_constraint_qname, env);
+ axis2_qname_free(property_impl->f_constraint_qname, env);
property_impl->f_constraint_qname = NULL;
}
- property_impl->f_constraint_qname = AXIS2_QNAME_CLONE(constraint, env);
+ property_impl->f_constraint_qname = axis2_qname_clone(constraint, 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