You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2007/03/30 21:24:23 UTC
svn commit: r524243 [13/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/woden_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_reader.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Fri Mar 30 12:24:00 2007
@@ -118,7 +118,7 @@
#include <axis2_utils.h>
#include <axutil_generic_obj.h>
-#include <axis2_string_util.h>
+#include <axutil_string_util.h>
typedef struct woden_reader_impl woden_reader_impl_t;
@@ -417,7 +417,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
@@ -624,7 +624,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;
@@ -638,7 +638,7 @@
AXIS2_PARAM_CHECK(env->error, desc_el_node, NULL);
reader_impl = INTF_TO_IMPL(reader);
- qname = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DESCRIPTION);
+ qname = axutil_qname_create_from_string(env, WODEN_Q_ELEM_DESCRIPTION);
check_element_qname(reader, env, desc_el_node, qname);
desc = woden_desc_create(env);
@@ -725,23 +725,23 @@
while (temp_el && NULL != 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_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_Q_ELEM_DOCUMENTATION);
- q_elem_import = axis2_qname_create_from_string(env, WODEN_Q_ELEM_IMPORT);
- q_elem_include = axis2_qname_create_from_string(env, WODEN_Q_ELEM_INCLUDE);
- q_elem_types = axis2_qname_create_from_string(env, WODEN_Q_ELEM_TYPES);
- q_elem_interface = axis2_qname_create_from_string(env, WODEN_Q_ELEM_INTERFACE);
- q_elem_binding = axis2_qname_create_from_string(env, WODEN_Q_ELEM_BINDING);
- q_elem_svc = axis2_qname_create_from_string(env, WODEN_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_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_Q_ELEM_DOCUMENTATION);
+ q_elem_import = axutil_qname_create_from_string(env, WODEN_Q_ELEM_IMPORT);
+ q_elem_include = axutil_qname_create_from_string(env, WODEN_Q_ELEM_INCLUDE);
+ q_elem_types = axutil_qname_create_from_string(env, WODEN_Q_ELEM_TYPES);
+ q_elem_interface = axutil_qname_create_from_string(env, WODEN_Q_ELEM_INTERFACE);
+ q_elem_binding = axutil_qname_create_from_string(env, WODEN_Q_ELEM_BINDING);
+ q_elem_svc = axutil_qname_create_from_string(env, WODEN_Q_ELEM_SERVICE);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -751,7 +751,7 @@
desc = woden_desc_to_documentable(desc, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(desc, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_import, temp_el_node))
{
void *import_element = NULL;
@@ -768,7 +768,7 @@
desc = woden_desc_to_desc_element(desc, env);
WODEN_DESC_ELEMENT_ADD_IMPORT_ELEMENT(desc, env, import_element);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_include, temp_el_node))
{
void *include_element = NULL;
@@ -784,7 +784,7 @@
wsdl_modules);
WODEN_DESC_ELEMENT_ADD_INCLUDE_ELEMENT(desc, env, include_element);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_types, temp_el_node))
{
void *types = NULL;
@@ -792,7 +792,7 @@
types = parse_types(reader, env, temp_el_node, desc);
WODEN_DESC_ELEMENT_SET_TYPES_ELEMENT(desc, env, types);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_interface, temp_el_node))
{
void *interface = NULL;
@@ -800,7 +800,7 @@
interface = parse_interface(reader, env, temp_el_node, desc);
WODEN_DESC_ELEMENT_ADD_INTERFACE_ELEMENT(desc, env, interface);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_binding, temp_el_node))
{
void *binding = NULL;
@@ -808,7 +808,7 @@
binding = parse_binding(reader, env, temp_el_node, desc);
WODEN_DESC_ELEMENT_ADD_BINDING_ELEMENT(desc, env, binding);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_svc, temp_el_node))
{
void *svc = NULL;
@@ -1056,14 +1056,14 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -1353,13 +1353,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_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);
}
@@ -1406,19 +1406,19 @@
while (temp_el && NULL != temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_fault = 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_Q_ELEM_DOCUMENTATION);
- q_elem_fault = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FAULT);
- q_elem_op = axis2_qname_create_from_string(env, WODEN_Q_ELEM_OPERATION);
- q_elem_feature = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_fault = 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_Q_ELEM_DOCUMENTATION);
+ q_elem_fault = axutil_qname_create_from_string(env, WODEN_Q_ELEM_FAULT);
+ q_elem_op = axutil_qname_create_from_string(env, WODEN_Q_ELEM_OPERATION);
+ q_elem_feature = axutil_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
+ q_elem_property = axutil_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -1427,7 +1427,7 @@
intface = woden_interface_to_documentable(intface, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(intface, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_fault, temp_el_node))
{
void *intface_fault = NULL;
@@ -1437,7 +1437,7 @@
intface = woden_interface_to_interface_element(intface, env);
WODEN_INTERFACE_ELEMENT_ADD_INTERFACE_FAULT_ELEMENT(intface, env, intface_fault);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_op, temp_el_node))
{
void *intface_op = NULL;
@@ -1447,7 +1447,7 @@
intface = woden_interface_to_interface_element(intface, env);
WODEN_INTERFACE_ELEMENT_ADD_INTERFACE_OP_ELEMENT(intface, env, intface_op);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -1458,7 +1458,7 @@
configurable = woden_configurable_to_configurable_element(configurable, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(configurable, env, feature);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -1524,7 +1524,7 @@
if (name)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_uri_t *ns = NULL;
axis2_char_t *ns_str = NULL;
@@ -1532,7 +1532,7 @@
if (!ns)
ns_str = WODEN_VALUE_EMPTY_STRING;
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);
fault = woden_interface_fault_to_interface_fault_element(fault, env);
WODEN_INTERFACE_FAULT_ELEMENT_SET_QNAME(fault, env, qname);
}
@@ -1541,7 +1541,7 @@
if (element)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axutil_hash_t *namespcs = NULL;
desc = woden_desc_to_desc_element(desc, env);
@@ -1565,18 +1565,18 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_PROPERTY);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -1585,7 +1585,7 @@
fault = woden_interface_fault_to_documentable(fault, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(fault, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -1594,7 +1594,7 @@
fault = woden_interface_fault_to_configurable_element(fault, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(fault, env, feature);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -1650,13 +1650,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_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);
}
@@ -1710,30 +1710,30 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_PROPERTY);
- q_elem_input = axis2_qname_create_from_string(env,
+ q_elem_input = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_INPUT);
- q_elem_output = axis2_qname_create_from_string(env,
+ q_elem_output = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_OUTPUT);
- q_elem_infault = axis2_qname_create_from_string(env,
+ q_elem_infault = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_INFAULT);
- q_elem_outfault = axis2_qname_create_from_string(env,
+ q_elem_outfault = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_OUTFAULT);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -1742,7 +1742,7 @@
op = woden_interface_op_to_documentable(op, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(op, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -1751,7 +1751,7 @@
op = woden_interface_op_to_configurable_element(op, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(op, env, feature);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -1760,7 +1760,7 @@
op = woden_interface_op_to_configurable_element(op, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_PROPERTY_ELEMENT(op, env, property);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_input, temp_el_node))
{
void *input = NULL;
@@ -1769,7 +1769,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_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_output, temp_el_node))
{
void *output = NULL;
@@ -1778,7 +1778,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_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_infault, temp_el_node))
{
void *infault = NULL;
@@ -1787,7 +1787,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_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_outfault, temp_el_node))
{
void *outfault = NULL;
@@ -1828,7 +1828,7 @@
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;
+ axutil_qname_t *attr_ref = NULL;
void *nested_configurable = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -1859,12 +1859,12 @@
WODEN_INTERFACE_FAULT_REF_ELEMENT_SET_DIRECTION(fault_ref, env, direction_out);
}
- attr_ref = axis2_qname_create_from_string(env, WODEN_ATTR_REF);
+ attr_ref = axutil_qname_create_from_string(env, WODEN_ATTR_REF);
ref = axiom_element_get_attribute_value_by_name(fault_ref_el, env, WODEN_ATTR_REF);
if (ref)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axutil_hash_t *namespcs = NULL;
desc = woden_desc_to_desc_element(desc, env);
@@ -1932,18 +1932,18 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_PROPERTY);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -1952,7 +1952,7 @@
fault_ref = woden_interface_fault_ref_to_documentable(fault_ref, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(fault_ref, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -1961,7 +1961,7 @@
fault_ref = woden_interface_fault_ref_to_configurable_element(fault_ref, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(fault_ref, env, feature);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -2130,7 +2130,7 @@
}
else
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axutil_hash_t *namespcs = NULL;
/* element is not #any, #none or #other, so it must be an element
@@ -2173,18 +2173,18 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_PROPERTY);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -2193,7 +2193,7 @@
msg_ref = woden_interface_msg_ref_to_documentable(msg_ref, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(msg_ref, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -2202,7 +2202,7 @@
msg_ref = woden_interface_msg_ref_to_configurable_element(msg_ref, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(msg_ref, env, feature);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -2242,7 +2242,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;
@@ -2256,13 +2256,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_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);
}
@@ -2290,12 +2290,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_TRUE == axis2_qname_equals(intface_qn, env, qname))
+ if (AXIS2_TRUE == axutil_qname_equals(intface_qn, env, qname))
{
WODEN_BINDING_SET_INTERFACE_ELEMENT(binding, env, intface);
}
@@ -2336,19 +2336,19 @@
while (temp_el && NULL != temp_el_node)
{
- axis2_qname_t *q_elem_documentation = NULL;
- axis2_qname_t *q_elem_fault = 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_Q_ELEM_DOCUMENTATION);
- q_elem_fault = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FAULT);
- q_elem_op = axis2_qname_create_from_string(env, WODEN_Q_ELEM_OPERATION);
- q_elem_feature = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
+ axutil_qname_t *q_elem_documentation = NULL;
+ axutil_qname_t *q_elem_fault = 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_Q_ELEM_DOCUMENTATION);
+ q_elem_fault = axutil_qname_create_from_string(env, WODEN_Q_ELEM_FAULT);
+ q_elem_op = axutil_qname_create_from_string(env, WODEN_Q_ELEM_OPERATION);
+ q_elem_feature = axutil_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
+ q_elem_property = axutil_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -2357,7 +2357,7 @@
binding = woden_binding_to_documentable(binding, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(binding, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_fault, temp_el_node))
{
void *binding_fault = NULL;
@@ -2366,7 +2366,7 @@
binding = woden_binding_to_binding_element(binding, env);
WODEN_BINDING_ELEMENT_ADD_BINDING_FAULT_ELEMENT(binding, env, binding_fault);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_op, temp_el_node))
{
void *binding_op = NULL;
@@ -2376,7 +2376,7 @@
binding = woden_binding_to_binding_element(binding, env);
WODEN_BINDING_ELEMENT_ADD_BINDING_OP_ELEMENT(binding, env, binding_op);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -2385,7 +2385,7 @@
binding = woden_binding_to_configurable_element(binding, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(binding, env, feature);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -2433,8 +2433,8 @@
axiom_element_t *fault_el;
axiom_element_t *temp_el;
axiom_node_t *temp_el_node;
- axis2_qname_t *attr_ref = NULL;
- axis2_qname_t *int_flt_qn = NULL;
+ axutil_qname_t *attr_ref = NULL;
+ axutil_qname_t *int_flt_qn = NULL;
void *nested_configurable = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -2445,7 +2445,7 @@
nested_configurable, env);
WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(nested_configurable, env, parent);
- attr_ref = axis2_qname_create_from_string(env, WODEN_ATTR_NAME);
+ attr_ref = axutil_qname_create_from_string(env, WODEN_ATTR_NAME);
fault_el = AXIOM_NODE_GET_DATA_ELEMENT(fault_el_node, env);
ref = axiom_element_get_attribute_value_by_name(fault_el, env, WODEN_ATTR_REF);
@@ -2479,7 +2479,7 @@
for (i = 0; i < size; i++)
{
void *intface_flt = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
intface_flt = axutil_array_list_get(int_faults, env, i);
if (intface_flt)
@@ -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 == axutil_qname_equals(int_flt_qn, env, qname))
{
WODEN_BINDING_FAULT_SET_INTERFACE_FAULT_ELEMENT(fault,
env, intface_flt);
@@ -2510,18 +2510,18 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_PROPERTY);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -2530,7 +2530,7 @@
fault = woden_binding_fault_to_documentable(fault, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(fault, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -2539,7 +2539,7 @@
fault = woden_binding_fault_to_configurable_element(fault, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(fault, env, feature);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -2578,8 +2578,8 @@
axiom_element_t *op_el;
axiom_element_t *temp_el;
axiom_node_t *temp_el_node;
- axis2_qname_t *attr_ref = NULL;
- axis2_qname_t *ref_qn = NULL;
+ axutil_qname_t *attr_ref = NULL;
+ axutil_qname_t *ref_qn = NULL;
void *nested_configurable = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -2590,7 +2590,7 @@
nested_configurable, env);
WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(nested_configurable, env, parent);
- attr_ref = axis2_qname_create_from_string(env, WODEN_ATTR_REF);
+ attr_ref = axutil_qname_create_from_string(env, WODEN_ATTR_REF);
op_el = AXIOM_NODE_GET_DATA_ELEMENT(op_el_node, env);
ref = axiom_element_get_attribute_value_by_name(op_el, env, WODEN_ATTR_REF);
@@ -2620,13 +2620,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_TRUE == axis2_qname_equals(ref_qn, env, qname))
+ if (AXIS2_TRUE == axutil_qname_equals(ref_qn, env, qname))
{
WODEN_BINDING_OP_SET_INTERFACE_OP_ELEMENT(op,
env, intface_op);
@@ -2651,30 +2651,30 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_PROPERTY);
- q_elem_input = axis2_qname_create_from_string(env,
+ q_elem_input = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_INPUT);
- q_elem_output = axis2_qname_create_from_string(env,
+ q_elem_output = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_OUTPUT);
- q_elem_infault = axis2_qname_create_from_string(env,
+ q_elem_infault = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_INFAULT);
- q_elem_outfault = axis2_qname_create_from_string(env,
+ q_elem_outfault = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_OUTFAULT);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -2683,7 +2683,7 @@
op = woden_binding_op_to_documentable(op, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(op, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -2692,7 +2692,7 @@
op = woden_binding_op_to_configurable_element(op, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(op, env, feature);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -2701,7 +2701,7 @@
op = woden_binding_op_to_configurable_element(op, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_PROPERTY_ELEMENT(op, env, property);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_input, temp_el_node))
{
void *input = NULL;
@@ -2710,7 +2710,7 @@
op = woden_binding_op_to_binding_op_element(op, env);
WODEN_BINDING_OP_ELEMENT_ADD_BINDING_MSG_REF_ELEMENT(op, env, input);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_output, temp_el_node))
{
void *output = NULL;
@@ -2719,7 +2719,7 @@
op = woden_binding_op_to_binding_op_element(op, env);
WODEN_BINDING_OP_ELEMENT_ADD_BINDING_MSG_REF_ELEMENT(op, env, output);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_infault, temp_el_node))
{
void *infault = NULL;
@@ -2728,7 +2728,7 @@
op = woden_binding_op_to_binding_op_element(op, env);
WODEN_BINDING_OP_ELEMENT_ADD_BINDING_FAULT_REF_ELEMENT(op, env, infault);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_outfault, temp_el_node))
{
void *outfault = NULL;
@@ -2768,9 +2768,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;
@@ -2785,7 +2785,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_ATTR_REF);
+ attr_ref = axutil_qname_create_from_string(env, WODEN_ATTR_REF);
ref = axiom_element_get_attribute_value_by_name(fault_ref_el, env, WODEN_ATTR_REF);
if (ref)
@@ -2876,7 +2876,7 @@
for (i = 0; i < size; i++)
{
void *int_flt_ref = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
woden_msg_label_t *label = NULL;
int_flt_ref = axutil_array_list_get(int_flt_refs, env, i);
@@ -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 == axutil_qname_equals(qref, env, qname) &&
AXIS2_TRUE == WODEN_MSG_LABEL_EQUALS(msg_label, env, label))
{
WODEN_BINDING_FAULT_REF_SET_INTERFACE_FAULT_REF_ELEMENT(
@@ -2915,18 +2915,18 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_PROPERTY);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -2935,7 +2935,7 @@
fault_ref = woden_binding_fault_ref_to_documentable(fault_ref, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(fault_ref, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -2944,7 +2944,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_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -3163,18 +3163,18 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env,
+ q_elem_feature = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env,
+ q_elem_property = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_PROPERTY);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -3183,7 +3183,7 @@
msg_ref = woden_binding_msg_ref_to_documentable(msg_ref, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(msg_ref, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -3192,7 +3192,7 @@
msg_ref = woden_binding_msg_ref_to_configurable_element(msg_ref, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(msg_ref, env, feature);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -3229,7 +3229,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;
@@ -3244,13 +3244,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_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_svc_to_svc_element(svc, env);
WODEN_SVC_ELEMENT_SET_QNAME(svc, env, qname);
}
@@ -3279,12 +3279,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_TRUE == axis2_qname_equals(intface_qn, env, qname))
+ if (AXIS2_TRUE == axutil_qname_equals(intface_qn, env, qname))
{
WODEN_SVC_SET_INTERFACE_ELEMENT(svc, env, intface);
}
@@ -3310,17 +3310,17 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- q_elem_endpoint = axis2_qname_create_from_string(env, WODEN_Q_ELEM_ENDPOINT);
- q_elem_feature = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env, WODEN_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_Q_ELEM_DOCUMENTATION);
+ q_elem_endpoint = axutil_qname_create_from_string(env, WODEN_Q_ELEM_ENDPOINT);
+ q_elem_feature = axutil_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
+ q_elem_property = axutil_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -3329,7 +3329,7 @@
svc = woden_svc_to_documentable(svc, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(svc, env, documentation);
}
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_endpoint, temp_el_node))
{
void *endpoint = NULL;
@@ -3338,7 +3338,7 @@
svc = woden_svc_to_svc_element(svc, env);
WODEN_SVC_ELEMENT_ADD_ENDPOINT_ELEMENT(svc, env, endpoint);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -3347,7 +3347,7 @@
svc = woden_svc_to_configurable_element(svc, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(svc, env, feature);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -3386,9 +3386,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;
@@ -3413,7 +3413,7 @@
WODEN_ENDPOINT_ELEMENT_SET_NAME(endpoint, env, nc_name);
}
- attr_binding = axis2_qname_create_from_string(env, WODEN_ATTR_BINDING);
+ attr_binding = axutil_qname_create_from_string(env, WODEN_ATTR_BINDING);
binding = axiom_element_get_attribute_value_by_name(endpoint_el, env, WODEN_ATTR_BINDING);
if (binding)
{
@@ -3438,19 +3438,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_TRUE == axis2_qname_equals(binding_qn, env, qname))
+ if (AXIS2_TRUE == axutil_qname_equals(binding_qn, env, qname))
{
WODEN_ENDPOINT_SET_BINDING_ELEMENT(endpoint, env, binding);
}
}
}
- attr_address = axis2_qname_create_from_string(env, WODEN_ATTR_ADDRESS);
+ attr_address = axutil_qname_create_from_string(env, WODEN_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_ATTR_ADDRESS);
@@ -3481,15 +3481,15 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- q_elem_feature = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
- q_elem_property = axis2_qname_create_from_string(env, WODEN_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_Q_ELEM_DOCUMENTATION);
+ q_elem_feature = axutil_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
+ q_elem_property = axutil_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -3498,7 +3498,7 @@
endpoint = woden_endpoint_to_documentable(endpoint, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(endpoint, env, documentation);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_feature, temp_el_node))
{
void *feature = NULL;
@@ -3507,7 +3507,7 @@
endpoint = woden_endpoint_to_configurable_element(endpoint, env);
WODEN_CONFIGURABLE_ELEMENT_ADD_FEATURE_ELEMENT(endpoint, env, feature);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_property, temp_el_node))
{
void *property = NULL;
@@ -3545,8 +3545,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;
@@ -3559,7 +3559,7 @@
WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(feature, env, parent);
- attr_ref = axis2_qname_create_from_string(env, WODEN_ATTR_REF);
+ attr_ref = axutil_qname_create_from_string(env, WODEN_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_ATTR_REF);
@@ -3571,7 +3571,7 @@
axis2_uri_free(ref_uri, env);
}
- attr_req = axis2_qname_create_from_string(env, WODEN_ATTR_REQUIRED);
+ attr_req = axutil_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))
@@ -3601,11 +3601,11 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
+ q_elem_documentation = axutil_qname_create_from_string(env, WODEN_Q_ELEM_DOCUMENTATION);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -3666,7 +3666,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;
@@ -3680,7 +3680,7 @@
types = WODEN_DESC_ELEMENT_GET_TYPES_ELEMENT(desc, env);
WODEN_PROPERTY_SET_TYPES(property, env, types);
- attr_ref = axis2_qname_create_from_string(env, WODEN_ATTR_REF);
+ attr_ref = axutil_qname_create_from_string(env, WODEN_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_ATTR_REF);
@@ -3703,18 +3703,18 @@
while (temp_el && NULL != 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_Q_ELEM_DOCUMENTATION);
- q_elem_value = axis2_qname_create_from_string(env,
+ q_elem_value = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_VALUE);
- q_elem_constraint = axis2_qname_create_from_string(env,
+ q_elem_constraint = axutil_qname_create_from_string(env,
WODEN_Q_ELEM_CONSTRAINT);
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_documentation, temp_el_node))
{
void *documentation = NULL;
@@ -3723,7 +3723,7 @@
property = woden_property_to_documentable(property, env);
WODEN_DOCUMENTABLE_ADD_DOCUMENTATION_ELEMENT(property, env, documentation);
}
- if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_value, temp_el_node))
{
axiom_child_element_iterator_t *node_list = NULL;
@@ -3737,7 +3737,7 @@
property = woden_property_to_property_element(property, env);
WODEN_PROPERTY_ELEMENT_SET_VALUE(property, env, node_list_obj);
}
- else if (AXIS2_TRUE == axis2_qname_util_matches(env,
+ else if (AXIS2_TRUE == axutil_qname_util_matches(env,
q_elem_constraint, temp_el_node))
{
axiom_node_t *node = NULL;
@@ -3766,7 +3766,7 @@
}
else
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axutil_hash_t *namespcs = NULL;
desc = woden_desc_to_desc_element(desc, env);
@@ -3829,7 +3829,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);
@@ -3840,7 +3840,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_NS_URI_WSDL20))
{
@@ -3897,7 +3897,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;
@@ -3905,7 +3905,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);
@@ -3949,9 +3949,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;
@@ -3999,7 +3999,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);
@@ -4012,14 +4012,14 @@
return NULL;
}
/* The referenced document should contain a WSDL <description> */
- qname = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DESCRIPTION);
- if (AXIS2_TRUE != axis2_qname_util_matches(env, qname, doc_el_node))
+ qname = axutil_qname_create_from_string(env, WODEN_Q_ELEM_DESCRIPTION);
+ 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/builder/woden_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c Fri Mar 30 12:24:00 2007
@@ -21,7 +21,7 @@
#include <woden_schema_constants.h>
#include <woden_qname_util.h>
#include <axis2_uri.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include "../wsdl20/woden_constants.h"
#include "../wsdl10/woden_wsdl10_constants.h"
@@ -105,7 +105,7 @@
void *resolver,
const axutil_env_t *env,
axiom_node_t *el_node,
- axis2_qname_t *qname);
+ axutil_qname_t *qname);
static woden_resolver_t *
create(
@@ -212,7 +212,7 @@
const axis2_char_t *doc_base_uri)
{
woden_resolver_impl_t *resolver_impl = NULL;
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
axis2_bool_t check = AXIS2_FALSE;
void *desc = NULL;
@@ -220,7 +220,7 @@
AXIS2_PARAM_CHECK(env->error, desc_el_node, NULL);
resolver_impl = INTF_TO_IMPL(resolver);
- qname = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DESCRIPTION);
+ qname = axutil_qname_create_from_string(env, WODEN_Q_ELEM_DESCRIPTION);
check = check_element_qname(resolver, env, desc_el_node, qname);
if (AXIS2_TRUE == check)
{
@@ -233,8 +233,8 @@
WODEN_READER_FREE(reader, env);
}
- axis2_qname_free(qname, env);
- qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DEFINITIONS);
+ axutil_qname_free(qname, env);
+ qname = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DEFINITIONS);
check = check_element_qname(resolver, env, desc_el_node, qname);
if (AXIS2_TRUE == check)
{
@@ -264,9 +264,9 @@
void *resolver,
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org