You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/03/30 21:24:23 UTC
svn commit: r524243 [14/17] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/test/om/ axiom/test/soap/ guththila/include/
guththila/samples/ guththila/src/ include/ mod...
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Fri Mar 30 12:24:00 2007
@@ -119,7 +119,7 @@
#include <axis2_utils.h>
#include <axutil_generic_obj.h>
-#include <axis2_string_util.h>
+#include <axutil_string_util.h>
typedef struct woden_wsdl10_reader_impl woden_wsdl10_reader_impl_t;
@@ -415,7 +415,7 @@
void *reader,
const axutil_env_t *env,
axiom_node_t *el_node,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
/*
* Retrieve a WSDL document by resolving the location URI specified
@@ -615,7 +615,7 @@
axiom_element_t *temp_el = NULL;
axiom_node_t *temp_el_node = NULL;
void *types = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
void *schema = NULL;
axiom_attribute_t *attr_ns = NULL;
axiom_attribute_t *attr_loc = NULL;
@@ -631,7 +631,7 @@
AXIS2_PARAM_CHECK(env->error, desc_el_node, NULL);
reader_impl = INTF_TO_IMPL(reader);
- qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DEFINITIONS);
+ qname = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DEFINITIONS);
check_element_qname(reader, env, desc_el_node, qname);
desc = woden_wsdl10_desc_create(env);
@@ -721,25 +721,25 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_import = NULL;
- axis2_qname_t *q_elem_include = NULL;
- axis2_qname_t *q_elem_types = NULL;
- axis2_qname_t *q_elem_msg_ref = NULL;
- axis2_qname_t *q_elem_interface = NULL;
- axis2_qname_t *q_elem_binding = NULL;
- axis2_qname_t *q_elem_svc = NULL;
-
- q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- q_elem_import = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_IMPORT);
- q_elem_include = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_INCLUDE);
- q_elem_types = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_TYPES);
- q_elem_msg_ref = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_MSG_REF);
- q_elem_interface = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_INTERFACE);
- q_elem_binding = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_BINDING);
- q_elem_svc = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SERVICE);
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_import = NULL;
+ axutil_qname_t *q_elem_include = NULL;
+ axutil_qname_t *q_elem_types = NULL;
+ axutil_qname_t *q_elem_msg_ref = NULL;
+ axutil_qname_t *q_elem_interface = NULL;
+ axutil_qname_t *q_elem_binding = NULL;
+ axutil_qname_t *q_elem_svc = NULL;
+
+ q_elem_documentation = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+ q_elem_import = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_IMPORT);
+ q_elem_include = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_INCLUDE);
+ q_elem_types = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_TYPES);
+ q_elem_msg_ref = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_MSG_REF);
+ q_elem_interface = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_INTERFACE);
+ q_elem_binding = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_BINDING);
+ q_elem_svc = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SERVICE);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -749,7 +749,7 @@
desc = woden_wsdl10_desc_to_documentable(desc, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(desc, env, documentation);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_import, temp_el_node))
{
void *import_element = NULL;
@@ -766,7 +766,7 @@
desc = woden_wsdl10_desc_to_desc_element(desc, env);
WODEN_WSDL10_DESC_ELEMENT_ADD_IMPORT_ELEMENT(desc, env, import_element);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_include, temp_el_node))
{
void *include_element = NULL;
@@ -782,7 +782,7 @@
wsdl_modules);
WODEN_WSDL10_DESC_ELEMENT_ADD_INCLUDE_ELEMENT(desc, env, include_element);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_types, temp_el_node))
{
void *types = NULL;
@@ -790,7 +790,7 @@
types = parse_types(reader, env, temp_el_node, desc);
WODEN_WSDL10_DESC_ELEMENT_SET_TYPES_ELEMENT(desc, env, types);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_msg_ref, temp_el_node))
{
void *msg_ref = NULL;
@@ -798,7 +798,7 @@
msg_ref = parse_msg_ref(reader, env, temp_el_node, desc);
WODEN_WSDL10_DESC_ELEMENT_ADD_MSG_ELEMENT(desc, env, msg_ref);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_interface, temp_el_node))
{
void *interface = NULL;
@@ -806,7 +806,7 @@
interface = parse_interface(reader, env, temp_el_node, desc);
WODEN_WSDL10_DESC_ELEMENT_ADD_INTERFACE_ELEMENT(desc, env, interface);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_binding, temp_el_node))
{
void *binding = NULL;
@@ -814,7 +814,7 @@
binding = parse_binding(reader, env, temp_el_node, desc);
WODEN_WSDL10_DESC_ELEMENT_ADD_BINDING_ELEMENT(desc, env, binding);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_svc, temp_el_node))
{
void *svc = NULL;
@@ -1074,14 +1074,14 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_temp_el_type = NULL;
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_temp_el_type = NULL;
- q_temp_el_type = axis2_qname_util_new_qname(env, temp_el_node);
- q_elem_documentation = axis2_qname_create_from_string(env,
+ q_temp_el_type = axutil_qname_util_new_qname(env, temp_el_node);
+ q_elem_documentation = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -1376,13 +1376,13 @@
if (name)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *namespc = NULL;
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);
- qname = axis2_qname_create(env, name, namespc_str, NULL);
+ qname = axutil_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);
}
@@ -1406,13 +1406,13 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_part = NULL;
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_part = NULL;
- q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- q_elem_part = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PART);
+ q_elem_documentation = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+ q_elem_part = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PART);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -1421,7 +1421,7 @@
msg = woden_wsdl10_msg_ref_to_documentable(msg, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(msg, env, documentation);
}
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_part, temp_el_node))
{
void *part = NULL;
@@ -1500,13 +1500,13 @@
if (name)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *namespc = NULL;
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);
- qname = axis2_qname_create(env, name, namespc_str, NULL);
+ qname = axutil_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);
}
@@ -1514,7 +1514,7 @@
if (element)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axutil_hash_t *namespcs = NULL;
desc = woden_wsdl10_desc_to_desc_element(desc, env);
@@ -1537,12 +1537,12 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_documentation = NULL;
- q_elem_documentation = axis2_qname_create_from_string(env,
+ q_elem_documentation = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -1602,13 +1602,13 @@
if (name)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *namespc = NULL;
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);
- qname = axis2_qname_create(env, name, namespc_str, NULL);
+ qname = axutil_qname_create(env, name, namespc_str, NULL);
intface = woden_interface_to_interface_element(intface, env);
WODEN_INTERFACE_ELEMENT_SET_QNAME(intface, env, qname);
}
@@ -1655,17 +1655,17 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_op = NULL;
- axis2_qname_t *q_elem_feature = NULL;
- axis2_qname_t *q_elem_property = NULL;
-
- q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- q_elem_op = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_OPERATION);
- q_elem_feature = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_op = NULL;
+ axutil_qname_t *q_elem_feature = NULL;
+ axutil_qname_t *q_elem_property = NULL;
+
+ q_elem_documentation = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+ q_elem_op = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_OPERATION);
+ q_elem_feature = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
+ q_elem_property = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -1674,7 +1674,7 @@
intface = woden_interface_to_documentable(intface, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(intface, env, documentation);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_op, temp_el_node))
{
void *intface_op = NULL;
@@ -1684,7 +1684,7 @@
intface = woden_interface_to_interface_element(intface, env);
WODEN_INTERFACE_ELEMENT_ADD_INTERFACE_OP_ELEMENT(intface, env, intface_op);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -1695,7 +1695,7 @@
configurable = woden_configurable_to_configurable_element(configurable, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(configurable, env, feature);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -1762,13 +1762,13 @@
if (name)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *ns = NULL;
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);
- qname = axis2_qname_create(env, name, ns_str, NULL);
+ qname = axutil_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);
}
@@ -1822,30 +1822,30 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_feature = NULL;
- axis2_qname_t *q_elem_property = NULL;
- axis2_qname_t *q_elem_input = NULL;
- axis2_qname_t *q_elem_output = NULL;
- axis2_qname_t *q_elem_infault = NULL;
- axis2_qname_t *q_elem_outfault = NULL;
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_feature = NULL;
+ axutil_qname_t *q_elem_property = NULL;
+ axutil_qname_t *q_elem_input = NULL;
+ axutil_qname_t *q_elem_output = NULL;
+ axutil_qname_t *q_elem_infault = NULL;
+ axutil_qname_t *q_elem_outfault = NULL;
- q_elem_documentation = axis2_qname_create_from_string(env,
+ q_elem_documentation = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_PROPERTY);
- q_elem_input = axis2_qname_create_from_string(env,
+ q_elem_input = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_INPUT);
- q_elem_output = axis2_qname_create_from_string(env,
+ q_elem_output = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_OUTPUT);
- q_elem_infault = axis2_qname_create_from_string(env,
+ q_elem_infault = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_INFAULT);
- q_elem_outfault = axis2_qname_create_from_string(env,
+ q_elem_outfault = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_OUTFAULT);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -1854,7 +1854,7 @@
op = woden_interface_op_to_documentable(op, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(op, env, documentation);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -1863,7 +1863,7 @@
op = woden_interface_op_to_configurable_element(op, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(op, env, feature);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -1872,7 +1872,7 @@
op = woden_interface_op_to_configurable_element(op, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_PROPERTY_ELEMENT(op, env, property);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_input, temp_el_node))
{
void *input = NULL;
@@ -1881,7 +1881,7 @@
op = woden_interface_op_to_interface_op_element(op, env);
WODEN_INTERFACE_OP_ELEMENT_ADD_INTERFACE_MSG_REF_ELEMENT(op, env, input);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_output, temp_el_node))
{
void *output = NULL;
@@ -1890,7 +1890,7 @@
op = woden_interface_op_to_interface_op_element(op, env);
WODEN_INTERFACE_OP_ELEMENT_ADD_INTERFACE_MSG_REF_ELEMENT(op, env, output);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_infault, temp_el_node))
{
void *infault = NULL;
@@ -1899,7 +1899,7 @@
op = woden_interface_op_to_interface_op_element(op, env);
WODEN_INTERFACE_OP_ELEMENT_ADD_INTERFACE_FAULT_REF_ELEMENT(op, env, infault);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_outfault, temp_el_node))
{
void *outfault = NULL;
@@ -1984,13 +1984,13 @@
name = axiom_element_get_attribute_value_by_name(fault_ref_el, env, WODEN_WSDL10_ATTR_NAME);
if (name)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *namespc = NULL;
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);
- qname = axis2_qname_create(env, name, namespc_str, NULL);
+ qname = axutil_qname_create(env, name, namespc_str, NULL);
fault_ref =
woden_wsdl10_interface_fault_ref_to_interface_fault_ref_element(
fault_ref, env);
@@ -2000,13 +2000,13 @@
msg = axiom_element_get_attribute_value_by_name(fault_ref_el, env, WODEN_WSDL10_ATTR_MSG);
if (msg)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *namespc = NULL;
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);
- qname = axis2_qname_create(env, msg, namespc_str, NULL);
+ qname = axutil_qname_create(env, msg, namespc_str, NULL);
fault_ref =
woden_wsdl10_interface_fault_ref_to_interface_fault_ref_element(
fault_ref, env);
@@ -2024,12 +2024,12 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_documentation = NULL;
- q_elem_documentation = axis2_qname_create_from_string(env,
+ q_elem_documentation = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -2116,13 +2116,13 @@
name = axiom_element_get_attribute_value_by_name(msg_ref_el, env, WODEN_WSDL10_ATTR_NAME);
if (name)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *namespc = NULL;
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);
- qname = axis2_qname_create(env, name, namespc_str, NULL);
+ qname = axutil_qname_create(env, name, namespc_str, NULL);
msg_ref = woden_wsdl10_interface_msg_ref_to_interface_msg_ref_element(
msg_ref, env);
WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_SET_QNAME(msg_ref, env, qname);
@@ -2131,7 +2131,7 @@
msg = axiom_element_get_attribute_value_by_name(msg_ref_el, env, WODEN_WSDL10_ATTR_MSG);
if (msg)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *namespc = NULL;
axis2_char_t *namespc_str = NULL;
axutil_array_list_t *msgs = NULL;
@@ -2159,7 +2159,7 @@
}
namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
- qname = axis2_qname_create(env, msg, namespc_str, NULL);
+ qname = axutil_qname_create(env, msg, namespc_str, NULL);
msg_ref = woden_wsdl10_interface_msg_ref_to_interface_msg_ref_element(
msg_ref, env);
desc = woden_wsdl10_desc_to_desc_element(desc, env);
@@ -2169,11 +2169,11 @@
for (i = 0; i < size; i++)
{
void *msg = NULL;
- axis2_qname_t *msg_qname = NULL;
+ axutil_qname_t *msg_qname = NULL;
msg = axutil_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 (axutil_qname_equals(msg_qname, env, qname))
{
WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_SET_MSG(msg_ref, env, msg);
}
@@ -2191,12 +2191,12 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_documentation = NULL;
- q_elem_documentation = axis2_qname_create_from_string(env,
+ q_elem_documentation = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -2247,7 +2247,7 @@
axiom_element_t *binding_el;
axiom_element_t *temp_el;
axiom_node_t *temp_el_node;
- axis2_qname_t *intface_qn = NULL;
+ axutil_qname_t *intface_qn = NULL;
void *configurable = NULL;
void *documentable = NULL;
void *wsdl_obj = NULL;
@@ -2261,13 +2261,13 @@
if (name)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *namespc = NULL;
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);
- qname = axis2_qname_create(env, name, namespc_str, NULL);
+ qname = axutil_qname_create(env, name, namespc_str, NULL);
binding = woden_binding_to_binding_element(binding, env);
WODEN_BINDING_ELEMENT_SET_QNAME(binding, env, qname);
}
@@ -2295,12 +2295,12 @@
for (i = 0; i < size; i++)
{
void *intface = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
intface = axutil_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 (axutil_qname_equals(intface_qn, env, qname))
{
WODEN_BINDING_SET_INTERFACE_ELEMENT(binding, env, intface);
}
@@ -2340,17 +2340,17 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_op = NULL;
- axis2_qname_t *q_elem_feature = NULL;
- axis2_qname_t *q_elem_property = NULL;
-
- q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- q_elem_op = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_OPERATION);
- q_elem_feature = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_op = NULL;
+ axutil_qname_t *q_elem_feature = NULL;
+ axutil_qname_t *q_elem_property = NULL;
+
+ q_elem_documentation = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+ q_elem_op = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_OPERATION);
+ q_elem_feature = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
+ q_elem_property = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -2359,7 +2359,7 @@
binding = woden_binding_to_documentable(binding, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(binding, env, documentation);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_op, temp_el_node))
{
void *binding_op = NULL;
@@ -2369,7 +2369,7 @@
binding = woden_binding_to_binding_element(binding, env);
WODEN_BINDING_ELEMENT_ADD_BINDING_OP_ELEMENT(binding, env, binding_op);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -2378,7 +2378,7 @@
binding = woden_binding_to_configurable_element(binding, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(binding, env, feature);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -2426,7 +2426,7 @@
axiom_element_t *op_el;
axiom_element_t *temp_el;
axiom_node_t *temp_el_node;
- axis2_qname_t *ref_qn = NULL;
+ axutil_qname_t *ref_qn = NULL;
void *nested_configurable = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -2447,7 +2447,7 @@
namespc = WODEN_WSDL10_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
namespc_str = axis2_uri_to_string(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
- ref_qn = axis2_qname_create(env, name, namespc_str, NULL);
+ ref_qn = axutil_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);
}
@@ -2467,13 +2467,13 @@
for (i = 0; i < size; i++)
{
void *intface_op = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
intface_op = axutil_array_list_get(int_ops, env, i);
if (intface_op)
qname = WODEN_INTERFACE_OP_ELEMENT_GET_QNAME(
intface_op, env);
- if (axis2_qname_equals(ref_qn, env, qname))
+ if (axutil_qname_equals(ref_qn, env, qname))
{
WODEN_WSDL10_BINDING_OP_SET_INTERFACE_OP_ELEMENT(op,
env, intface_op);
@@ -2498,30 +2498,30 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_feature = NULL;
- axis2_qname_t *q_elem_property = NULL;
- axis2_qname_t *q_elem_input = NULL;
- axis2_qname_t *q_elem_output = NULL;
- axis2_qname_t *q_elem_infault = NULL;
- axis2_qname_t *q_elem_outfault = NULL;
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_feature = NULL;
+ axutil_qname_t *q_elem_property = NULL;
+ axutil_qname_t *q_elem_input = NULL;
+ axutil_qname_t *q_elem_output = NULL;
+ axutil_qname_t *q_elem_infault = NULL;
+ axutil_qname_t *q_elem_outfault = NULL;
- q_elem_documentation = axis2_qname_create_from_string(env,
+ q_elem_documentation = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_PROPERTY);
- q_elem_input = axis2_qname_create_from_string(env,
+ q_elem_input = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_INPUT);
- q_elem_output = axis2_qname_create_from_string(env,
+ q_elem_output = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_OUTPUT);
- q_elem_infault = axis2_qname_create_from_string(env,
+ q_elem_infault = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_INFAULT);
- q_elem_outfault = axis2_qname_create_from_string(env,
+ q_elem_outfault = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_OUTFAULT);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -2530,7 +2530,7 @@
op = woden_wsdl10_binding_op_to_documentable(op, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(op, env, documentation);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -2539,7 +2539,7 @@
op = woden_wsdl10_binding_op_to_configurable_element(op, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(op, env, feature);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -2548,7 +2548,7 @@
op = woden_wsdl10_binding_op_to_configurable_element(op, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_PROPERTY_ELEMENT(op, env, property);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_input, temp_el_node))
{
void *input = NULL;
@@ -2557,7 +2557,7 @@
op = woden_wsdl10_binding_op_to_binding_op_element(op, env);
WODEN_WSDL10_BINDING_OP_ELEMENT_ADD_BINDING_MSG_REF_ELEMENT(op, env, input);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_output, temp_el_node))
{
void *output = NULL;
@@ -2566,7 +2566,7 @@
op = woden_wsdl10_binding_op_to_binding_op_element(op, env);
WODEN_WSDL10_BINDING_OP_ELEMENT_ADD_BINDING_MSG_REF_ELEMENT(op, env, output);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_infault, temp_el_node))
{
void *infault = NULL;
@@ -2575,7 +2575,7 @@
op = woden_wsdl10_binding_op_to_binding_op_element(op, env);
WODEN_WSDL10_BINDING_OP_ELEMENT_ADD_BINDING_FAULT_REF_ELEMENT(op, env, infault);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_outfault, temp_el_node))
{
void *outfault = NULL;
@@ -2616,9 +2616,9 @@
axiom_element_t *fault_ref_el = NULL;
axiom_element_t *temp_el = NULL;
axiom_node_t *temp_el_node = NULL;
- axis2_qname_t *attr_ref = NULL;
- axis2_qname_t *ref_qn = NULL;
- axis2_qname_t *qref = NULL;
+ axutil_qname_t *attr_ref = NULL;
+ axutil_qname_t *ref_qn = NULL;
+ axutil_qname_t *qref = NULL;
woden_msg_label_t *msg_label = NULL;
woden_msg_label_t *msg_label_in = NULL;
woden_msg_label_t *msg_label_out = NULL;
@@ -2633,7 +2633,7 @@
WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(nested_configurable, env, parent);
fault_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(fault_ref_el_node, env);
- attr_ref = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_REF);
+ attr_ref = axutil_qname_create_from_string(env, WODEN_WSDL10_ATTR_REF);
ref = axiom_element_get_attribute_value_by_name(fault_ref_el, env, WODEN_WSDL10_ATTR_REF);
if (ref)
@@ -2724,7 +2724,7 @@
for (i = 0; i < size; i++)
{
void *int_flt_ref = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
int_flt_ref = axutil_array_list_get(int_flt_refs, env, i);
int_flt_ref =
@@ -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(axutil_qname_equals(qref, env, qname) &&
WODEN_MSG_LABEL_EQUALS(msg_label, env, label))
*/
- if (axis2_qname_equals(qref, env, qname))
+ if (axutil_qname_equals(qref, env, qname))
{
WODEN_BINDING_FAULT_REF_SET_INTERFACE_FAULT_REF_ELEMENT(
fault_ref, env, int_flt_ref);
@@ -2764,18 +2764,18 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_feature = NULL;
- axis2_qname_t *q_elem_property = NULL;
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_feature = NULL;
+ axutil_qname_t *q_elem_property = NULL;
- q_elem_documentation = axis2_qname_create_from_string(env,
+ q_elem_documentation = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_PROPERTY);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -2784,7 +2784,7 @@
fault_ref = woden_binding_fault_ref_to_documentable(fault_ref, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(fault_ref, env, documentation);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -2793,7 +2793,7 @@
fault_ref = woden_binding_fault_ref_to_configurable_element(fault_ref, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(fault_ref, env, feature);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -2880,13 +2880,13 @@
if (name)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *namespc = NULL;
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);
- qname = axis2_qname_create(env, name, namespc_str, NULL);
+ qname = axutil_qname_create(env, name, namespc_str, NULL);
msg_ref = woden_wsdl10_binding_msg_ref_to_binding_msg_ref_element(
msg_ref, env);
WODEN_WSDL10_BINDING_MSG_REF_ELEMENT_SET_QNAME(msg_ref, env, qname);
@@ -2914,8 +2914,8 @@
for (i = 0; i < size; i++)
{
void *int_msg_ref = NULL;
- axis2_qname_t *intf_msg_qname = NULL;
- axis2_qname_t *binding_msg_qname = NULL;
+ axutil_qname_t *intf_msg_qname = NULL;
+ axutil_qname_t *binding_msg_qname = NULL;
int_msg_ref = axutil_array_list_get(int_msg_refs, env, i);
int_msg_ref =
@@ -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))
+ axutil_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);
@@ -2952,18 +2952,18 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_feature = NULL;
- axis2_qname_t *q_elem_property = NULL;
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_feature = NULL;
+ axutil_qname_t *q_elem_property = NULL;
- q_elem_documentation = axis2_qname_create_from_string(env,
+ q_elem_documentation = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_PROPERTY);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -2972,7 +2972,7 @@
msg_ref = woden_wsdl10_binding_msg_ref_to_documentable(msg_ref, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(msg_ref, env, documentation);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -2981,7 +2981,7 @@
msg_ref = woden_wsdl10_binding_msg_ref_to_configurable_element(msg_ref, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(msg_ref, env, feature);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -3029,7 +3029,7 @@
void *svc = NULL;
axis2_char_t *name = NULL;
axis2_char_t *intface = NULL;
- axis2_qname_t *intface_qn = NULL;
+ axutil_qname_t *intface_qn = NULL;
axiom_element_t *svc_el = NULL;
axiom_element_t *temp_el = NULL;
axiom_node_t *temp_el_node = NULL;
@@ -3044,13 +3044,13 @@
if (name)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *namespc = NULL;
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);
- qname = axis2_qname_create(env, name, namespc_str, NULL);
+ qname = axutil_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);
}
@@ -3079,12 +3079,12 @@
for (i = 0; i < size; i++)
{
void *intface = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
intface = axutil_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 (axutil_qname_equals(intface_qn, env, qname))
{
WODEN_WSDL10_SVC_SET_INTERFACE_ELEMENT(svc, env, intface);
}
@@ -3110,17 +3110,17 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_endpoint = NULL;
- axis2_qname_t *q_elem_feature = NULL;
- axis2_qname_t *q_elem_property = NULL;
-
- q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- q_elem_endpoint = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_ENDPOINT);
- q_elem_feature = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_endpoint = NULL;
+ axutil_qname_t *q_elem_feature = NULL;
+ axutil_qname_t *q_elem_property = NULL;
+
+ q_elem_documentation = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+ q_elem_endpoint = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_ENDPOINT);
+ q_elem_feature = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
+ q_elem_property = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -3129,7 +3129,7 @@
svc = woden_wsdl10_svc_to_documentable(svc, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(svc, env, documentation);
}
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_endpoint, temp_el_node))
{
void *endpoint = NULL;
@@ -3138,7 +3138,7 @@
svc = woden_wsdl10_svc_to_svc_element(svc, env);
WODEN_WSDL10_SVC_ELEMENT_ADD_ENDPOINT_ELEMENT(svc, env, endpoint);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -3147,7 +3147,7 @@
svc = woden_wsdl10_svc_to_configurable_element(svc, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(svc, env, feature);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -3195,9 +3195,9 @@
axis2_char_t *name = NULL;
axis2_char_t *address = NULL;
axis2_char_t *binding = NULL;
- axis2_qname_t *binding_qn = NULL;
- axis2_qname_t *attr_binding = NULL;
- axis2_qname_t *attr_address = NULL;
+ axutil_qname_t *binding_qn = NULL;
+ axutil_qname_t *attr_binding = NULL;
+ axutil_qname_t *attr_address = NULL;
axiom_element_t *endpoint_el = NULL;
axiom_element_t *temp_el = NULL;
axiom_node_t *temp_el_node = NULL;
@@ -3222,7 +3222,7 @@
WODEN_WSDL10_ENDPOINT_ELEMENT_SET_NAME(endpoint, env, nc_name);
}
- attr_binding = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_BINDING);
+ attr_binding = axutil_qname_create_from_string(env, WODEN_WSDL10_ATTR_BINDING);
binding = axiom_element_get_attribute_value_by_name(endpoint_el, env, WODEN_WSDL10_ATTR_BINDING);
if (binding)
{
@@ -3247,19 +3247,19 @@
for (i = 0; i < size; i++)
{
void *binding = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
binding = axutil_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 (axutil_qname_equals(binding_qn, env, qname))
{
WODEN_WSDL10_ENDPOINT_SET_BINDING_ELEMENT(endpoint, env, binding);
}
}
}
- attr_address = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_ADDRESS);
+ attr_address = axutil_qname_create_from_string(env, WODEN_WSDL10_ATTR_ADDRESS);
endpoint_el = AXIOM_NODE_GET_DATA_ELEMENT(endpoint_el_node, env);
address = axiom_element_get_attribute_value_by_name(endpoint_el, env, WODEN_WSDL10_ATTR_ADDRESS);
@@ -3290,15 +3290,15 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_feature = NULL;
- axis2_qname_t *q_elem_property = NULL;
-
- q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_feature = NULL;
+ axutil_qname_t *q_elem_property = NULL;
+
+ q_elem_documentation = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+ q_elem_feature = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
+ q_elem_property = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -3307,7 +3307,7 @@
endpoint = woden_wsdl10_endpoint_to_documentable(endpoint, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(endpoint, env, documentation);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -3316,7 +3316,7 @@
endpoint = woden_wsdl10_endpoint_to_configurable_element(endpoint, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(endpoint, env, feature);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -3355,8 +3355,8 @@
void *feature = NULL;
axis2_char_t *ref = NULL;
axis2_char_t *req = NULL;
- axis2_qname_t *attr_ref = NULL;
- axis2_qname_t *attr_req = NULL;
+ axutil_qname_t *attr_ref = NULL;
+ axutil_qname_t *attr_req = NULL;
axiom_element_t *feature_el = NULL;
axiom_element_t *temp_el = NULL;
axiom_node_t *temp_el_node = NULL;
@@ -3369,7 +3369,7 @@
WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(feature, env, parent);
- attr_ref = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_REF);
+ attr_ref = axutil_qname_create_from_string(env, WODEN_WSDL10_ATTR_REF);
feature_el = AXIOM_NODE_GET_DATA_ELEMENT(feature_el_node, env);
ref = axiom_element_get_attribute_value_by_name(feature_el, env, WODEN_WSDL10_ATTR_REF);
@@ -3381,7 +3381,7 @@
axis2_uri_free(ref_uri, env);
}
- attr_req = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_REQUIRED);
+ attr_req = axutil_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))
@@ -3411,11 +3411,11 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_documentation = NULL;
- q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+ q_elem_documentation = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -3483,7 +3483,7 @@
{
void *property = NULL;
axis2_char_t *ref = NULL;
- axis2_qname_t *attr_ref = NULL;
+ axutil_qname_t *attr_ref = NULL;
void *types = NULL;
axiom_element_t *property_el = NULL;
axiom_element_t *temp_el = NULL;
@@ -3497,7 +3497,7 @@
types = WODEN_WSDL10_DESC_ELEMENT_GET_TYPES_ELEMENT(desc, env);
WODEN_PROPERTY_SET_TYPES(property, env, types);
- attr_ref = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_REF);
+ attr_ref = axutil_qname_create_from_string(env, WODEN_WSDL10_ATTR_REF);
property_el = AXIOM_NODE_GET_DATA_ELEMENT(property_el_node, env);
ref = axiom_element_get_attribute_value_by_name(property_el, env, WODEN_WSDL10_ATTR_REF);
@@ -3520,18 +3520,18 @@
while (temp_el && temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_value = NULL;
- axis2_qname_t *q_elem_constraint = NULL;
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_value = NULL;
+ axutil_qname_t *q_elem_constraint = NULL;
- q_elem_documentation = axis2_qname_create_from_string(env,
+ q_elem_documentation = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
- q_elem_value = axis2_qname_create_from_string(env,
+ q_elem_value = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_VALUE);
- q_elem_constraint = axis2_qname_create_from_string(env,
+ q_elem_constraint = axutil_qname_create_from_string(env,
WODEN_WSDL10_Q_ELEM_CONSTRAINT);
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -3540,7 +3540,7 @@
property = woden_property_to_documentable(property, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(property, env, documentation);
}
- if (axis2_qname_util_matches(env,
+ if (axutil_qname_util_matches(env,
q_elem_value, temp_el_node))
{
axiom_child_element_iterator_t *node_list = NULL;
@@ -3554,7 +3554,7 @@
property = woden_property_to_property_element(property, env);
WODEN_PROPERTY_ELEMENT_SET_VALUE(property, env, node_list_obj);
}
- else if (axis2_qname_util_matches(env,
+ else if (axutil_qname_util_matches(env,
q_elem_constraint, temp_el_node))
{
axiom_node_t *node = NULL;
@@ -3583,7 +3583,7 @@
}
else
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axutil_hash_t *namespcs = NULL;
desc = woden_wsdl10_desc_to_desc_element(desc, env);
@@ -3653,7 +3653,7 @@
axiom_namespace_t *namespc = NULL;
axis2_char_t *namespc_uri_str = NULL;
axis2_char_t *prefix = NULL;
- axis2_qname_t *attr_type = NULL;
+ axutil_qname_t *attr_type = NULL;
axutil_hash_this(index, NULL, NULL, &om_attr);
localname = axiom_attribute_get_localname((axiom_attribute_t *) om_attr, env);
@@ -3664,7 +3664,7 @@
prefix = axiom_namespace_get_prefix(namespc, env);
}
if (!prefix) prefix = "";
- attr_type = axis2_qname_create(env, localname, namespc_uri_str, prefix);
+ attr_type = axutil_qname_create(env, localname, namespc_uri_str, prefix);
if (namespc_uri_str && 0 != axis2_strcmp(namespc_uri_str,
WODEN_WSDL10_NS_URI_WSDL20))
{
@@ -3723,7 +3723,7 @@
axiom_node_t *el_node,
void *desc)
{
- axis2_qname_t *element_type = NULL;
+ axutil_qname_t *element_type = NULL;
axis2_char_t *namespc_uri_str = NULL;
axiom_namespace_t *namespc = NULL;
axiom_element_t *el = NULL;
@@ -3731,7 +3731,7 @@
void *ext_ds = NULL;
void *ext_el = NULL;
- element_type = axis2_qname_util_new_qname(env, el_node);
+ element_type = axutil_qname_util_new_qname(env, el_node);
el = AXIOM_NODE_GET_DATA_ELEMENT(el_node, env);
namespc = axiom_element_get_namespace(el, env, el_node);
@@ -3779,9 +3779,9 @@
void *reader,
const axutil_env_t *env,
axiom_node_t *el_node,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
- if (AXIS2_TRUE != axis2_qname_util_matches(env, qname, el_node))
+ if (AXIS2_TRUE != axutil_qname_util_matches(env, qname, el_node))
{
/* TODO woden_wsdl_exc_set_location(wsdl_exc, env, xpath);*/
return AXIS2_FAILURE;
@@ -3829,7 +3829,7 @@
void *xml_reader = NULL;
axiom_stax_builder_t *builder = NULL;
axiom_document_t *doc = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
schema_col = xml_schema_collection_create(env);
xml_reader = axiom_xml_reader_create_for_file(env, location_str, NULL);
@@ -3842,14 +3842,14 @@
return NULL;
}
/* The referenced document should contain a WSDL <description> */
- qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DEFINITIONS);
- if (AXIS2_TRUE != axis2_qname_util_matches(env, qname, doc_el_node))
+ qname = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DEFINITIONS);
+ if (AXIS2_TRUE != axutil_qname_util_matches(env, qname, doc_el_node))
{
/* Cannot continue without a <description> element */
- axis2_qname_free(qname, env);
+ axutil_qname_free(qname, env);
return NULL;
}
- axis2_qname_free(qname, env);
+ axutil_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_schema_constants.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/woden_schema_constants.c Fri Mar 30 12:24:00 2007
@@ -18,130 +18,130 @@
#include <axutil_allocator.h>
#include <axutil_env.h>
#include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_utils.h>
#include <axutil_hash.h>
#include <axis2_uri.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <woden.h>
#include <woden_schema_constants.h>
axis2_bool_t AXIS2_CALL
woden_schema_constants_compare_schema(
- axis2_qname_t *schema,
+ axutil_qname_t *schema,
const axutil_env_t *env)
{
- axis2_qname_t *q1999 = NULL;
- axis2_qname_t *q2000 = NULL;
- axis2_qname_t *q2001 = NULL;
+ axutil_qname_t *q1999 = NULL;
+ axutil_qname_t *q2000 = NULL;
+ axutil_qname_t *q2001 = NULL;
axis2_bool_t ret = AXIS2_FALSE;
- q1999 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_XSD_1999);
- 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))
+ q1999 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_XSD_1999);
+ q2000 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_XSD_2000);
+ q2001 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_XSD_2001);
+
+ if (AXIS2_TRUE == axutil_qname_equals(schema, env, q1999) ||
+ AXIS2_TRUE == axutil_qname_equals(schema, env, q2000) ||
+ AXIS2_TRUE == axutil_qname_equals(schema, env, q2001))
{
ret = AXIS2_TRUE;
}
if (q1999)
- axis2_qname_free(q1999, env);
+ axutil_qname_free(q1999, env);
if (q2000)
- axis2_qname_free(q2000, env);
+ axutil_qname_free(q2000, env);
if (q2001)
- axis2_qname_free(q2001, env);
+ axutil_qname_free(q2001, env);
return ret;
}
axis2_bool_t AXIS2_CALL
woden_schema_constants_compare_include(
- axis2_qname_t *include,
+ axutil_qname_t *include,
const axutil_env_t *env)
{
- axis2_qname_t *q1999 = NULL;
- axis2_qname_t *q2000 = NULL;
- axis2_qname_t *q2001 = NULL;
+ axutil_qname_t *q1999 = NULL;
+ axutil_qname_t *q2000 = NULL;
+ axutil_qname_t *q2001 = NULL;
axis2_bool_t ret = AXIS2_FALSE;
- q1999 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_INCLUDE_XSD_1999);
- 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))
+ q1999 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_INCLUDE_XSD_1999);
+ q2000 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_INCLUDE_XSD_2000);
+ q2001 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_INCLUDE_XSD_2001);
+
+ if (AXIS2_TRUE == axutil_qname_equals(include, env, q1999) ||
+ AXIS2_TRUE == axutil_qname_equals(include, env, q2000) ||
+ AXIS2_TRUE == axutil_qname_equals(include, env, q2001))
{
ret = AXIS2_TRUE;
}
if (q1999)
- axis2_qname_free(q1999, env);
+ axutil_qname_free(q1999, env);
if (q2000)
- axis2_qname_free(q2000, env);
+ axutil_qname_free(q2000, env);
if (q2001)
- axis2_qname_free(q2001, env);
+ axutil_qname_free(q2001, env);
return ret;
}
axis2_bool_t AXIS2_CALL
woden_schema_constants_compare_import(
- axis2_qname_t *import,
+ axutil_qname_t *import,
const axutil_env_t *env)
{
- axis2_qname_t *q1999 = NULL;
- axis2_qname_t *q2000 = NULL;
- axis2_qname_t *q2001 = NULL;
+ axutil_qname_t *q1999 = NULL;
+ axutil_qname_t *q2000 = NULL;
+ axutil_qname_t *q2001 = NULL;
axis2_bool_t ret = AXIS2_FALSE;
- q1999 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_IMPORT_XSD_1999);
- 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))
+ q1999 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_IMPORT_XSD_1999);
+ q2000 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_IMPORT_XSD_2000);
+ q2001 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_IMPORT_XSD_2001);
+
+ if (AXIS2_TRUE == axutil_qname_equals(import, env, q1999) ||
+ AXIS2_TRUE == axutil_qname_equals(import, env, q2000) ||
+ AXIS2_TRUE == axutil_qname_equals(import, env, q2001))
{
ret = AXIS2_TRUE;
}
if (q1999)
- axis2_qname_free(q1999, env);
+ axutil_qname_free(q1999, env);
if (q2000)
- axis2_qname_free(q2000, env);
+ axutil_qname_free(q2000, env);
if (q2001)
- axis2_qname_free(q2001, env);
+ axutil_qname_free(q2001, env);
return ret;
}
axis2_bool_t AXIS2_CALL
woden_schema_constants_compare_redefine(
- axis2_qname_t *redefine,
+ axutil_qname_t *redefine,
const axutil_env_t *env)
{
- axis2_qname_t *q1999 = NULL;
- axis2_qname_t *q2000 = NULL;
- axis2_qname_t *q2001 = NULL;
+ axutil_qname_t *q1999 = NULL;
+ axutil_qname_t *q2000 = NULL;
+ axutil_qname_t *q2001 = NULL;
axis2_bool_t ret = AXIS2_FALSE;
- q1999 = axis2_qname_create_from_string(env, WODEN_Q_ELEM_REDEFINE_XSD_1999);
- 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))
+ q1999 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_REDEFINE_XSD_1999);
+ q2000 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_REDEFINE_XSD_2000);
+ q2001 = axutil_qname_create_from_string(env, WODEN_Q_ELEM_REDEFINE_XSD_2001);
+
+ if (AXIS2_TRUE == axutil_qname_equals(redefine, env, q1999) ||
+ AXIS2_TRUE == axutil_qname_equals(redefine, env, q2000) ||
+ AXIS2_TRUE == axutil_qname_equals(redefine, env, q2001))
{
ret = AXIS2_TRUE;
}
if (q1999)
- axis2_qname_free(q1999, env);
+ axutil_qname_free(q1999, env);
if (q2000)
- axis2_qname_free(q2000, env);
+ axutil_qname_free(q2000, env);
if (q2001)
- axis2_qname_free(q2001, env);
+ axutil_qname_free(q2001, env);
return ret;
}
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_om_util.c Fri Mar 30 12:24:00 2007
@@ -16,12 +16,12 @@
*/
#include "woden_om_util.h"
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <axiom_element.h>
#include <axis2_uri.h>
-AXIS2_EXTERN axis2_qname_t * AXIS2_CALL
+AXIS2_EXTERN axutil_qname_t * AXIS2_CALL
woden_om_util_get_qname(
const axutil_env_t *env,
axiom_node_t *context_el_node,
@@ -53,7 +53,7 @@
if (namespc_uri_str)
{
woden_om_util_register_unique_prefix(env, prefix, namespc_uri_str, namespcs);
- return axis2_qname_create(env, localpart, namespc_uri_str, prefix);
+ return axutil_qname_create(env, localpart, namespc_uri_str, prefix);
}
return NULL;
}
Modified: webservices/axis2/trunk/c/woden/src/util/woden_om_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_om_util.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.h (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_om_util.h Fri Mar 30 12:24:00 2007
@@ -28,10 +28,10 @@
#include <axutil_allocator.h>
#include <axutil_env.h>
#include <axutil_error.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_utils.h>
#include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <woden.h>
#include <axiom_node.h>
@@ -45,7 +45,7 @@
* @{
*/
-AXIS2_EXTERN axis2_qname_t * AXIS2_CALL
+AXIS2_EXTERN axutil_qname_t * AXIS2_CALL
woden_om_util_get_qname(
const axutil_env_t *env,
axiom_node_t *context_el_node,
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c Fri Mar 30 12:24:00 2007
@@ -21,24 +21,24 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_qname_util_matches(
+axutil_qname_util_matches(
const axutil_env_t *env,
- axis2_qname_t *qname,
+ axutil_qname_t *qname,
axiom_node_t *node)
{
- axis2_qname_t *qname_l = NULL;
+ axutil_qname_t *qname_l = NULL;
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))
+ qname_l = axutil_qname_util_new_qname(env, node);
+ if (node && AXIS2_TRUE == axutil_qname_equals(qname, env, qname_l))
ret = AXIS2_TRUE;
- axis2_qname_free(qname_l, env);
+ axutil_qname_free(qname_l, env);
return ret;
}
-AXIS2_EXTERN axis2_qname_t * AXIS2_CALL
-axis2_qname_util_new_qname(
+AXIS2_EXTERN axutil_qname_t * AXIS2_CALL
+axutil_qname_util_new_qname(
const axutil_env_t *env,
axiom_node_t *node)
{
@@ -56,7 +56,7 @@
namespc = axiom_element_get_namespace(element, env, node);
uri_str = axiom_namespace_get_uri(namespc, env);
localname = axiom_element_get_localname(element, env);
- return axis2_qname_create(env, localname, uri_str, NULL);
+ return axutil_qname_create(env, localname, uri_str, NULL);
}
return NULL;
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c Fri Mar 30 12:24:00 2007
@@ -57,14 +57,14 @@
woden_attr_extensible_set_ext_attr(
void *extensible,
const axutil_env_t *env,
- axis2_qname_t *attr_type,
+ axutil_qname_t *attr_type,
woden_xml_attr_t *attr);
void *AXIS2_CALL
woden_attr_extensible_get_ext_attr(
void *extensible,
const axutil_env_t *env,
- axis2_qname_t *attr_type);
+ axutil_qname_t *attr_type);
axutil_array_list_t *AXIS2_CALL
woden_attr_extensible_get_ext_attrs(
@@ -271,7 +271,7 @@
woden_attr_extensible_set_ext_attr(
void *extensible,
const axutil_env_t *env,
- axis2_qname_t *attr_type,
+ axutil_qname_t *attr_type,
woden_xml_attr_t *attr)
{
woden_attr_extensible_impl_t *extensible_impl = NULL;
@@ -284,7 +284,7 @@
extensible_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_ATTR_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
- str_attr_type = axis2_qname_to_string(attr_type, env);
+ str_attr_type = axutil_qname_to_string(attr_type, env);
if (attr)
axutil_hash_set(extensible_impl->f_ext_attrs, str_attr_type,
AXIS2_HASH_KEY_STRING, attr);
@@ -298,7 +298,7 @@
woden_attr_extensible_get_ext_attr(
void *extensible,
const axutil_env_t *env,
- axis2_qname_t *attr_type)
+ axutil_qname_t *attr_type)
{
woden_attr_extensible_impl_t *extensible_impl = NULL;
axis2_char_t *str_attr_type = NULL;
@@ -310,7 +310,7 @@
extensible_impl = INTF_TO_IMPL(axutil_hash_get(super,
"WODEN_ATTR_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
- str_attr_type = axis2_qname_to_string(attr_type, env);
+ str_attr_type = axutil_qname_to_string(attr_type, env);
return (woden_xml_attr_t *)axutil_hash_get(extensible_impl->f_ext_attrs,
str_attr_type, AXIS2_HASH_KEY_STRING);
}
@@ -422,12 +422,12 @@
index = axutil_hash_next(env, index))
{
const void *v = NULL;
- axis2_qname_t *key = NULL;
+ axutil_qname_t *key = NULL;
axis2_char_t *str_ns = NULL;
axutil_hash_this(index, &v, NULL, NULL);
- key = (axis2_qname_t *) v;
- str_ns = axis2_qname_get_uri(key, env);
+ key = (axutil_qname_t *) v;
+ str_ns = axutil_qname_get_uri(key, env);
if (0 == axis2_strcmp(str_ns, str_namespc))
{
result = AXIS2_TRUE;
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c Fri Mar 30 12:24:00 2007
@@ -39,8 +39,8 @@
axutil_hash_t *super;
axutil_hash_t *methods;
axutil_array_list_t *f_extended_bindings;
- axis2_qname_t *f_qname;
- axis2_qname_t *f_interface_qname;
+ axutil_qname_t *f_qname;
+ axutil_qname_t *f_interface_qname;
void *f_interface;
axis2_uri_t *f_type;
/*
@@ -81,7 +81,7 @@
/* ************************************************************
* Binding interface methods (the WSDL Component model)
* ************************************************************/
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_binding_get_qname(
void *binding,
const axutil_env_t *env);
@@ -118,15 +118,15 @@
woden_binding_set_qname(
void *binding,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_status_t AXIS2_CALL
woden_binding_set_interface_qname(
void *binding,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_binding_get_interface_qname(
void *binding,
const axutil_env_t *env);
@@ -171,13 +171,13 @@
woden_binding_get_binding_fault_element(
void *binding,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
void *AXIS2_CALL
woden_binding_get_binding_op_element(
void *binding,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_status_t AXIS2_CALL
woden_binding_set_interface_element(
@@ -600,13 +600,13 @@
if (binding_impl->f_qname)
{
- axis2_qname_free(binding_impl->f_qname, env);
+ axutil_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);
+ axutil_qname_free(binding_impl->f_interface_qname, env);
binding_impl->f_interface_qname = NULL;
}
@@ -787,7 +787,7 @@
/* ************************************************************
* Binding interface methods (the WSDL Component model)
* ************************************************************/
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_binding_get_qname(
void *binding,
const axutil_env_t *env)
@@ -891,7 +891,7 @@
woden_binding_set_qname(
void *binding,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
woden_binding_impl_t *binding_impl = NULL;
axutil_hash_t *super = NULL;
@@ -904,9 +904,9 @@
if (binding_impl->f_qname)
{
- axis2_qname_free(binding_impl->f_qname, env);
+ axutil_qname_free(binding_impl->f_qname, env);
}
- binding_impl->f_qname = axis2_qname_clone(qname, env);
+ binding_impl->f_qname = axutil_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
@@ -914,7 +914,7 @@
woden_binding_set_interface_qname(
void *binding,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
woden_binding_impl_t *binding_impl = NULL;
axutil_hash_t *super = NULL;
@@ -927,14 +927,14 @@
if (binding_impl->f_interface_qname)
{
- axis2_qname_free(binding_impl->f_interface_qname, env);
+ axutil_qname_free(binding_impl->f_interface_qname, env);
}
- binding_impl->f_interface_qname = axis2_qname_clone(qname, env);
+ binding_impl->f_interface_qname = axutil_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_binding_get_interface_qname(
void *binding,
const axutil_env_t *env)
@@ -1089,7 +1089,7 @@
woden_binding_get_binding_fault_element(
void *binding,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
woden_binding_impl_t *binding_impl = NULL;
axutil_hash_t *super = NULL;
@@ -1106,13 +1106,13 @@
for (i = 0; i < size; i++)
{
void *bind_fault = NULL;
- axis2_qname_t *qname_l = NULL;
+ axutil_qname_t *qname_l = NULL;
bind_fault = axutil_array_list_get(binding_impl->f_faults,
env, i);
- qname_l = (axis2_qname_t *) WODEN_BINDING_FAULT_ELEMENT_GET_REF(
+ qname_l = (axutil_qname_t *) WODEN_BINDING_FAULT_ELEMENT_GET_REF(
bind_fault, env);
- if (AXIS2_TRUE == axis2_qname_equals(qname, env, qname_l))
+ if (AXIS2_TRUE == axutil_qname_equals(qname, env, qname_l))
{
fault = bind_fault;
break;
@@ -1126,7 +1126,7 @@
woden_binding_get_binding_op_element(
void *binding,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
woden_binding_impl_t *binding_impl = NULL;
axutil_hash_t *super = NULL;
@@ -1143,13 +1143,13 @@
for (i = 0; i < size; i++)
{
void *bind_op = NULL;
- axis2_qname_t *qname_l = NULL;
+ axutil_qname_t *qname_l = NULL;
bind_op = axutil_array_list_get(binding_impl->f_ops,
env, i);
- qname_l = (axis2_qname_t *) WODEN_BINDING_OP_ELEMENT_GET_REF(
+ qname_l = (axutil_qname_t *) WODEN_BINDING_OP_ELEMENT_GET_REF(
bind_op, env);
- if (AXIS2_TRUE == axis2_qname_equals(qname, env, qname_l))
+ if (AXIS2_TRUE == axutil_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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_fault_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_binding_fault_ref.c Fri Mar 30 12:24:00 2007
@@ -40,7 +40,7 @@
woden_obj_types_t obj_type;
axutil_hash_t *super;
axutil_hash_t *methods;
- axis2_qname_t *f_ref;
+ axutil_qname_t *f_ref;
void *f_direction;
void *f_msg_label;
void *f_interface_fault_ref;
@@ -93,9 +93,9 @@
woden_binding_fault_ref_set_ref(
void *binding_fault_ref,
const axutil_env_t *env,
- axis2_qname_t *fault_qname);
+ axutil_qname_t *fault_qname);
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_binding_fault_ref_get_ref(
void *binding_fault_ref,
const axutil_env_t *env);
@@ -676,7 +676,7 @@
if (binding_fault_ref_impl->f_ref)
{
- axis2_qname_free(binding_fault_ref_impl->f_ref, env);
+ axutil_qname_free(binding_fault_ref_impl->f_ref, env);
binding_fault_ref_impl->f_ref = NULL;
}
@@ -877,7 +877,7 @@
woden_binding_fault_ref_set_ref(
void *binding_fault_ref,
const axutil_env_t *env,
- axis2_qname_t *fault_qname)
+ axutil_qname_t *fault_qname)
{
woden_binding_fault_ref_impl_t *binding_fault_ref_impl = NULL;
axutil_hash_t *super = NULL;
@@ -890,13 +890,13 @@
if (binding_fault_ref_impl->f_ref)
{
- axis2_qname_free(binding_fault_ref_impl->f_ref, env);
+ axutil_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 = axutil_qname_clone(fault_qname, env);
return AXIS2_SUCCESS;
}
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_binding_fault_ref_get_ref(
void *binding_fault_ref,
const axutil_env_t *env)
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_element_decl.c Fri Mar 30 12:24:00 2007
@@ -31,7 +31,7 @@
woden_obj_types_t obj_type;
axutil_hash_t *super;
- axis2_qname_t *f_qname;
+ axutil_qname_t *f_qname;
axis2_uri_t *f_system;
axis2_char_t *f_content_model;
axutil_generic_obj_t *f_content;
@@ -58,7 +58,7 @@
/* ************************************************************
* Element Declaration interface methods (the WSDL Component model)
* ************************************************************/
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_element_decl_get_qname(
void *decl,
const axutil_env_t *env);
@@ -86,7 +86,7 @@
woden_element_decl_set_qname(
void *decl,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_status_t AXIS2_CALL
woden_element_decl_set_system(
@@ -294,7 +294,7 @@
/* ************************************************************
* Element Declaration interface methods (the WSDL Component model)
* ************************************************************/
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_element_decl_get_qname(
void *decl,
const axutil_env_t *env)
@@ -369,7 +369,7 @@
woden_element_decl_set_qname(
void *decl,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
woden_element_decl_impl_t *decl_impl = NULL;
axutil_hash_t *super = NULL;
@@ -382,10 +382,10 @@
if (decl_impl->f_qname)
{
- axis2_qname_free(decl_impl->f_qname, env);
+ axutil_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 = axutil_qname_clone(qname, 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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c Fri Mar 30 12:24:00 2007
@@ -75,7 +75,7 @@
woden_element_extensible_get_ext_elements_of_type(
void *extensible,
const axutil_env_t *env,
- axis2_qname_t *ext_type);
+ axutil_qname_t *ext_type);
axis2_bool_t AXIS2_CALL
woden_element_extensible_has_ext_elements_for_namespace(
@@ -322,7 +322,7 @@
axutil_array_list_t *AXIS2_CALL
woden_element_extensible_get_ext_elements_of_type(void *extensible,
const axutil_env_t *env,
- axis2_qname_t *ext_type)
+ axutil_qname_t *ext_type)
{
woden_element_extensible_impl_t *extensible_impl = NULL;
int i = 0;
@@ -355,12 +355,12 @@
for (i = 0; i < size; i++)
{
woden_ext_element_t *ext_elem = NULL;
- axis2_qname_t *ext_type_l = NULL;
+ axutil_qname_t *ext_type_l = NULL;
ext_elem = (woden_ext_element_t *)axutil_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 == axutil_qname_equals(ext_type, env, ext_type_l))
{
axutil_array_list_add(extensible_impl->temp_elems, env, ext_elem);
}
@@ -392,13 +392,13 @@
for (i = 0; i < size; i++)
{
woden_ext_element_t *ext_elem = NULL;
- axis2_qname_t *ext_type = NULL;
+ axutil_qname_t *ext_type = NULL;
axis2_char_t *uri = NULL;
ext_elem = (woden_ext_element_t *) axutil_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);
+ uri = axutil_qname_get_uri(ext_type, env);
if (0 == axis2_strcmp(uri, ext_ns))
{
result = AXIS2_TRUE;
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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c Fri Mar 30 12:24:00 2007
@@ -37,7 +37,7 @@
axutil_hash_t *super;
axutil_hash_t *methods;
axutil_array_list_t *f_extended_interfaces;
- axis2_qname_t *f_qname;
+ axutil_qname_t *f_qname;
axutil_array_list_t *f_extends_qnames;
axutil_array_list_t *f_style_default;
axutil_array_list_t *f_interface_fault_elements;
@@ -69,7 +69,7 @@
/* ************************************************************
* Interface interface methods (the WSDL Component model)
* ************************************************************/
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_interface_get_qname(
void *interface,
const axutil_env_t *env);
@@ -88,7 +88,7 @@
woden_interface_get_interface_fault(
void *interface,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axutil_array_list_t *AXIS2_CALL
woden_interface_get_interface_ops(
@@ -107,7 +107,7 @@
woden_interface_set_qname(
void *interface,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_status_t AXIS2_CALL
woden_interface_add_style_default_uri(
@@ -522,7 +522,7 @@
if (interface_impl->f_qname)
{
- axis2_qname_free(interface_impl->f_qname, env);
+ axutil_qname_free(interface_impl->f_qname, env);
interface_impl->f_qname = NULL;
}
@@ -685,7 +685,7 @@
/* ************************************************************
* Interface interface methods (the WSDL Component model)
* ************************************************************/
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_interface_get_qname(
void *interface,
const axutil_env_t *env)
@@ -737,7 +737,7 @@
woden_interface_get_interface_fault(
void *interface,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
woden_interface_impl_t *interface_impl = NULL;
axutil_hash_t *super = NULL;
@@ -754,12 +754,12 @@
for (i = 0; i < size; i++)
{
void *flt = NULL;
- axis2_qname_t *qname_l = NULL;
+ axutil_qname_t *qname_l = NULL;
flt = axutil_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))
+ qname_l = (axutil_qname_t *) WODEN_INTERFACE_FAULT_GET_QNAME(flt, env);
+ if (AXIS2_TRUE == axutil_qname_equals(qname, env, qname_l))
{
fault = flt;
break;
@@ -808,7 +808,7 @@
woden_interface_set_qname(
void *interface,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
woden_interface_impl_t *interface_impl = NULL;
axutil_hash_t *super = NULL;
@@ -821,9 +821,9 @@
if (interface_impl->f_qname)
{
- axis2_qname_free(interface_impl->f_qname, env);
+ axutil_qname_free(interface_impl->f_qname, env);
}
- interface_impl->f_qname = axis2_qname_clone(qname, env);
+ interface_impl->f_qname = axutil_qname_clone(qname, 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=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c Fri Mar 30 12:24:00 2007
@@ -37,7 +37,7 @@
woden_obj_types_t obj_type;
axutil_hash_t *super;
axutil_hash_t *methods;
- axis2_qname_t *f_qname;
+ axutil_qname_t *f_qname;
axis2_uri_t *f_msg_exchange_pattern;
axutil_array_list_t *f_style;
axutil_array_list_t *f_msg_refs;
@@ -70,7 +70,7 @@
* Interface Operation methods (the WSDL Component model)
* ************************************************************/
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_interface_op_get_qname(
void *interface_op,
const axutil_env_t *env);
@@ -108,7 +108,7 @@
woden_interface_op_set_qname(
void *interface_op,
const axutil_env_t *env,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
axis2_status_t AXIS2_CALL
woden_interface_op_set_pattern(
@@ -724,7 +724,7 @@
if (interface_op_impl->f_qname)
{
- axis2_qname_free(interface_op_impl->f_qname, env);
+ axutil_qname_free(interface_op_impl->f_qname, env);
interface_op_impl->f_qname = NULL;
}
@@ -889,7 +889,7 @@
* Interface Operation methods (the WSDL Component model)
* ************************************************************/
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
woden_interface_op_get_qname(
void *interface_op,
const axutil_env_t *env)
@@ -993,7 +993,7 @@
woden_interface_op_set_qname(
void *interface_op,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
woden_interface_op_impl_t *interface_op_impl = NULL;
axutil_hash_t *super = NULL;
@@ -1006,10 +1006,10 @@
if (interface_op_impl->f_qname)
{
- axis2_qname_free(interface_op_impl->f_qname, env);
+ axutil_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 = axutil_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