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 [15/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/wsdl/woden_property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c Fri Mar 30 12:24:00 2007
@@ -46,7 +46,7 @@
     woden_type_def_t *f_value_constraint;
     void *f_parent;
     /* XML Element data */
-    axis2_qname_t *f_constraint_qname;
+    axutil_qname_t *f_constraint_qname;
     axis2_bool_t f_has_value_token;
     void *f_types;
 };
@@ -125,9 +125,9 @@
 woden_property_set_constraint_qname(
     void *property,
     const axutil_env_t *env,
-    axis2_qname_t *type_def);
+    axutil_qname_t *type_def);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_property_get_constraint_qname(
     void *property,
     const axutil_env_t *env);
@@ -956,7 +956,7 @@
 woden_property_set_constraint_qname(
     void *property,
     const axutil_env_t *env,
-    axis2_qname_t *constraint)
+    axutil_qname_t *constraint)
 {
     woden_property_impl_t *property_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -968,14 +968,14 @@
 
     if (property_impl->f_constraint_qname)
     {
-        axis2_qname_free(property_impl->f_constraint_qname, env);
+        axutil_qname_free(property_impl->f_constraint_qname, env);
         property_impl->f_constraint_qname = NULL;
     }
-    property_impl->f_constraint_qname = axis2_qname_clone(constraint, env);
+    property_impl->f_constraint_qname = axutil_qname_clone(constraint, env);
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_property_get_constraint_qname(
     void *property,
     const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_code.c Fri Mar 30 12:24:00 2007
@@ -27,7 +27,7 @@
 {
     woden_soap_fault_code_t soap_fault_code;
     axis2_char_t *f_token;
-    axis2_qname_t *f_code_qn;
+    axutil_qname_t *f_code_qn;
 };
 
 #define INTF_TO_IMPL(soap_fault_code) ((woden_soap_fault_code_impl_t *) soap_fault_code)
@@ -49,7 +49,7 @@
     void *soap_fault_code,
     const axutil_env_t *env);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_soap_fault_code_get_qname(
     void *soap_fault_code,
     const axutil_env_t *env);
@@ -95,7 +95,7 @@
 woden_soap_fault_code_create(
     const axutil_env_t *env,
     axis2_char_t *token,
-    axis2_qname_t *code_qn)
+    axutil_qname_t *code_qn)
 {
     woden_soap_fault_code_impl_t *soap_fault_code_impl = NULL;
 
@@ -103,7 +103,7 @@
     soap_fault_code_impl = (woden_soap_fault_code_impl_t *) create(env);
 
     soap_fault_code_impl->f_token = axis2_strdup(env, token);
-    soap_fault_code_impl->f_code_qn = axis2_qname_clone(code_qn, env);
+    soap_fault_code_impl->f_code_qn = axutil_qname_clone(code_qn, env);
 
     return &(soap_fault_code_impl->soap_fault_code);
 }
@@ -126,7 +126,7 @@
 
     if (soap_fault_code_impl->f_code_qn)
     {
-        axis2_qname_free(soap_fault_code_impl->f_code_qn, env);
+        axutil_qname_free(soap_fault_code_impl->f_code_qn, env);
         soap_fault_code_impl->f_code_qn = NULL;
     }
 
@@ -184,7 +184,7 @@
     return (NULL != soap_fault_code_impl->f_token);
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_soap_fault_code_get_qname(
     void *soap_fault_code,
     const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c Fri Mar 30 12:24:00 2007
@@ -132,9 +132,9 @@
                 env);
         for (i = 0; i < size; i++)
         {
-            axis2_qname_t *qname = axutil_array_list_get(soap_fault_subcodes_impl->
+            axutil_qname_t *qname = axutil_array_list_get(soap_fault_subcodes_impl->
                     f_subcode_qns, env, i);
-            axis2_qname_free(qname, env);
+            axutil_qname_free(qname, env);
         }
         axutil_array_list_free(soap_fault_subcodes_impl->f_subcode_qns, env);
         soap_fault_subcodes_impl->f_subcode_qns = NULL;

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_type_def.c Fri Mar 30 12:24:00 2007
@@ -32,7 +32,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_system;
     axis2_char_t *f_content_model;
     axutil_generic_obj_t *f_content;
@@ -59,9 +59,9 @@
 woden_type_def_set_qname(
     void *type_def,
     const axutil_env_t *env,
-    axis2_qname_t *qname);
+    axutil_qname_t *qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_type_def_get_qname(
     void *type_def,
     const axutil_env_t *env);
@@ -334,7 +334,7 @@
 woden_type_def_set_qname(
     void *type_def,
     const axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     woden_type_def_impl_t *type_def_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -347,14 +347,14 @@
 
     if (type_def_impl->f_qname)
     {
-        axis2_qname_free(type_def_impl->f_qname, env);
+        axutil_qname_free(type_def_impl->f_qname, env);
         type_def_impl->f_qname = NULL;
     }
-    type_def_impl->f_qname = axis2_qname_clone(qname, env);
+    type_def_impl->f_qname = axutil_qname_clone(qname, env);
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_type_def_get_qname(
     void *type_def,
     const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c Fri Mar 30 12:24:00 2007
@@ -110,13 +110,13 @@
 woden_types_get_element_declaration(
     void *types,
     const axutil_env_t *env,
-    axis2_qname_t *qname);
+    axutil_qname_t *qname);
 
 void *AXIS2_CALL
 woden_types_get_type_definition(
     void *types,
     const axutil_env_t *env,
-    axis2_qname_t *qname);
+    axutil_qname_t *qname);
 
 axutil_array_list_t *AXIS2_CALL
 woden_types_get_referenceable_schema_defs(
@@ -139,7 +139,7 @@
 woden_types_is_namespace_in_scope_with_qname(
     void *types,
     const axutil_env_t *env,
-    axis2_qname_t *qname);
+    axutil_qname_t *qname);
 
 axis2_bool_t AXIS2_CALL
 woden_types_is_namespace_in_scope_with_namespace(
@@ -908,7 +908,7 @@
 woden_types_get_element_declaration(
     void *types,
     const axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     woden_types_impl_t *types_impl = NULL;
     xml_schema_element_t *xml_schema_el = NULL;
@@ -923,7 +923,7 @@
     if (! qname)
         return NULL;
 
-    uri = axis2_qname_get_uri(qname, env);
+    uri = axutil_qname_get_uri(qname, env);
     schemas = woden_types_get_referenceable_schema_defs_with_namespace(
                 types, env, uri);
     if (schemas)
@@ -951,7 +951,7 @@
 woden_types_get_type_definition(
     void *types,
     const axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     woden_types_impl_t *types_impl = NULL;
     xml_schema_type_t *xml_schema_type = NULL;
@@ -965,7 +965,7 @@
 
     if (qname)
     {
-        axis2_char_t *uri = axis2_qname_get_uri(qname, env);
+        axis2_char_t *uri = axutil_qname_get_uri(qname, env);
         schema_refs =
             woden_types_get_referenceable_schema_defs_with_namespace(
                 types, env, uri);
@@ -1098,7 +1098,7 @@
 woden_types_is_namespace_in_scope_with_qname(
     void *types,
     const axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     woden_types_impl_t *types_impl = NULL;
     axis2_char_t *str_uri = NULL;
@@ -1111,7 +1111,7 @@
     types_impl = INTF_TO_IMPL(axutil_hash_get(super,
             "WODEN_TYPES", AXIS2_HASH_KEY_STRING));
 
-    str_uri = axis2_qname_get_uri(qname, env);
+    str_uri = axutil_qname_get_uri(qname, env);
     uri = axis2_uri_parse_string(env, str_uri);
     return woden_types_is_namespace_in_scope_with_namespace_uri(types, env, uri);
 }

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_element.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_element.c Fri Mar 30 12:24:00 2007
@@ -61,14 +61,14 @@
 woden_wsdl_element_set_ext_attr(
     void *wsdl_element,
     const axutil_env_t *env,
-    axis2_qname_t *attr_type,
+    axutil_qname_t *attr_type,
     woden_xml_attr_t *attr);
 
 void *AXIS2_CALL
 woden_wsdl_element_get_ext_attr(
     void *wsdl_element,
     const axutil_env_t *env,
-    axis2_qname_t *attr_type);
+    axutil_qname_t *attr_type);
 
 axutil_array_list_t *AXIS2_CALL
 woden_wsdl_element_get_ext_attrs(
@@ -108,7 +108,7 @@
 woden_wsdl_element_get_ext_elements_of_type(
     void *wsdl_element,
     const axutil_env_t *env,
-    axis2_qname_t *elem_type);
+    axutil_qname_t *elem_type);
 
 axis2_bool_t AXIS2_CALL
 woden_wsdl_element_has_ext_elements_for_namespace(
@@ -137,7 +137,7 @@
 woden_wsdl_element_get_ext_elements_of_type(
     void *wsdl_element,
     const axutil_env_t *env,
-    axis2_qname_t *ext_type);
+    axutil_qname_t *ext_type);
 
 axis2_bool_t AXIS2_CALL
 woden_wsdl_element_has_ext_elements_for_namespace(
@@ -477,7 +477,7 @@
 woden_wsdl_element_set_ext_attr(
     void *wsdl_element,
     const axutil_env_t *env,
-    axis2_qname_t *attr_type,
+    axutil_qname_t *attr_type,
     woden_xml_attr_t *attr)
 {
     woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
@@ -498,7 +498,7 @@
 woden_wsdl_element_get_ext_attr(
     void *wsdl_element,
     const axutil_env_t *env,
-    axis2_qname_t *attr_type)
+    axutil_qname_t *attr_type)
 {
     woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -627,7 +627,7 @@
 woden_wsdl_element_get_ext_elements_of_type(
     void *wsdl_element,
     const axutil_env_t *env,
-    axis2_qname_t *ext_type)
+    axutil_qname_t *ext_type)
 {
     woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
     axutil_hash_t *super = NULL;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_soap_address_exts.c Fri Mar 30 12:24:00 2007
@@ -38,7 +38,7 @@
     axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
     axis2_uri_t *address;
 };
 
@@ -260,7 +260,7 @@
 
     if (address_exts_impl->qname)
     {
-        axis2_qname_free(address_exts_impl->qname, env);
+        axutil_qname_free(address_exts_impl->qname, env);
         address_exts_impl->qname = NULL;
     }
     woden_wsdl10_soap_address_exts_free_ops(address_exts, env);
@@ -394,7 +394,7 @@
                 address_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_element_extensible(parent_element,
             env);
-    address_exts_impl->qname = axis2_qname_create_from_string(env,
+    address_exts_impl->qname = axutil_qname_create_from_string(env,
             WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     soap_mods = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, address_exts_impl->qname);

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_exts.c Fri Mar 30 12:24:00 2007
@@ -36,7 +36,7 @@
     axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
 };
 
 #define INTF_TO_IMPL(binding_exts) ((woden_wsdl10_soap_binding_exts_impl_t *) binding_exts)
@@ -257,7 +257,7 @@
 
     if (binding_exts_impl->qname)
     {
-        axis2_qname_free(binding_exts_impl->qname, env);
+        axutil_qname_free(binding_exts_impl->qname, env);
         binding_exts_impl->qname = NULL;
     }
     woden_wsdl10_soap_binding_exts_free_ops(binding_exts, env);
@@ -378,7 +378,7 @@
                 binding_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_VERSION);
+    binding_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_VERSION);
     version = (woden_string_attr_t *)
             WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_exts_impl->qname);
     return version  ? WODEN_STRING_ATTR_GET_STRING(version, env) :
@@ -402,7 +402,7 @@
 
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_PROTOCOL);
+    binding_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_PROTOCOL);
     protocol = (woden_uri_attr_t *) WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(
                 parent_element, env, binding_exts_impl->qname);
     return protocol  ? WODEN_URI_ATTR_GET_URI(protocol, env) : NULL;
@@ -425,7 +425,7 @@
 
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_MEPDEFAULT);
+    binding_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_MEPDEFAULT);
     mep_default = (woden_uri_attr_t *)
             WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_exts_impl->qname);
     return mep_default  ? WODEN_URI_ATTR_GET_URI(mep_default, env) :
@@ -448,7 +448,7 @@
                 binding_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
+    binding_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     ext_els = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, binding_exts_impl->qname);
     return ext_els;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c Fri Mar 30 12:24:00 2007
@@ -39,7 +39,7 @@
     axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
 };
 
 #define INTF_TO_IMPL(binding_fault_exts) ((woden_wsdl10_soap_binding_fault_exts_impl_t *) binding_fault_exts)
@@ -260,7 +260,7 @@
 
     if (binding_fault_exts_impl->qname)
     {
-        axis2_qname_free(binding_fault_exts_impl->qname, env);
+        axutil_qname_free(binding_fault_exts_impl->qname, env);
         binding_fault_exts_impl->qname = NULL;
     }
     woden_wsdl10_soap_binding_fault_exts_free_ops(binding_fault_exts, env);
@@ -385,7 +385,7 @@
                 binding_fault_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_CODE);
+    binding_fault_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_CODE);
     code = (woden_qname_or_token_any_attr_t *)
             WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_fault_exts_impl->qname);
     if (! code)
@@ -433,7 +433,7 @@
                 binding_fault_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_SUBCODES);
+    binding_fault_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_SUBCODES);
     subcodes = (woden_qname_list_or_token_any_attr_t *)
             WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_fault_exts_impl->qname);
     if (! subcodes)
@@ -478,7 +478,7 @@
                 binding_fault_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_element_extensible(parent_element,
             env);
-    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env,
+    binding_fault_exts_impl->qname = axutil_qname_create_from_string(env,
             WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     soap_mods = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, binding_fault_exts_impl->qname);
@@ -502,7 +502,7 @@
                 binding_fault_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_element_extensible(parent_element,
             env);
-    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env,
+    binding_fault_exts_impl->qname = axutil_qname_create_from_string(env,
             WODEN_WSDL10_Q_ELEM_SOAP_HEADER);
     soap_headers = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, binding_fault_exts_impl->qname);

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_ref_exts.c Fri Mar 30 12:24:00 2007
@@ -37,7 +37,7 @@
     axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
 };
 
 #define INTF_TO_IMPL(binding_fault_ref_exts) ((woden_wsdl10_soap_binding_fault_ref_exts_impl_t *) binding_fault_ref_exts)
@@ -228,7 +228,7 @@
 
     if (binding_fault_ref_exts_impl->qname)
     {
-        axis2_qname_free(binding_fault_ref_exts_impl->qname, env);
+        axutil_qname_free(binding_fault_ref_exts_impl->qname, env);
         binding_fault_ref_exts_impl->qname = NULL;
     }
     woden_wsdl10_soap_binding_fault_ref_exts_free_ops(binding_fault_ref_exts, env);
@@ -331,7 +331,7 @@
                 binding_fault_ref_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_element_extensible(parent_element,
             env);
-    binding_fault_ref_exts_impl->qname = axis2_qname_create_from_string(env,
+    binding_fault_ref_exts_impl->qname = axutil_qname_create_from_string(env,
             WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     soap_mods = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, binding_fault_ref_exts_impl->qname);

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_msg_ref_exts.c Fri Mar 30 12:24:00 2007
@@ -37,7 +37,7 @@
     axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
 };
 
 #define INTF_TO_IMPL(binding_msg_ref_exts) ((woden_wsdl10_soap_binding_msg_ref_exts_impl_t *) binding_msg_ref_exts)
@@ -238,7 +238,7 @@
 
     if (binding_msg_ref_exts_impl->qname)
     {
-        axis2_qname_free(binding_msg_ref_exts_impl->qname, env);
+        axutil_qname_free(binding_msg_ref_exts_impl->qname, env);
         binding_msg_ref_exts_impl->qname = NULL;
     }
     woden_wsdl10_soap_binding_msg_ref_exts_free_ops(binding_msg_ref_exts, env);
@@ -347,7 +347,7 @@
                 binding_msg_ref_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_element_extensible(parent_element,
             env);
-    binding_msg_ref_exts_impl->qname = axis2_qname_create_from_string(env,
+    binding_msg_ref_exts_impl->qname = axutil_qname_create_from_string(env,
             WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     soap_mods = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, binding_msg_ref_exts_impl->qname);
@@ -371,7 +371,7 @@
                 binding_msg_ref_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_element_extensible(parent_element,
             env);
-    binding_msg_ref_exts_impl->qname = axis2_qname_create_from_string(env,
+    binding_msg_ref_exts_impl->qname = axutil_qname_create_from_string(env,
             WODEN_WSDL10_Q_ELEM_SOAP_HEADER);
     soap_headers = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, binding_msg_ref_exts_impl->qname);

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_op_exts.c Fri Mar 30 12:24:00 2007
@@ -38,7 +38,7 @@
     axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
     axis2_uri_t *action;
 };
 
@@ -270,7 +270,7 @@
 
     if (binding_op_exts_impl->qname)
     {
-        axis2_qname_free(binding_op_exts_impl->qname, env);
+        axutil_qname_free(binding_op_exts_impl->qname, env);
         binding_op_exts_impl->qname = NULL;
     }
     woden_wsdl10_soap_binding_op_exts_free_ops(binding_op_exts, env);
@@ -373,7 +373,7 @@
                 binding_op_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_op_exts_impl->qname = axis2_qname_create_from_string(env,
+    binding_op_exts_impl->qname = axutil_qname_create_from_string(env,
             WODEN_WSDL10_Q_ATTR_SOAP_MEP);
     mep = WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(
                 parent_element, env, binding_op_exts_impl->qname);
@@ -428,7 +428,7 @@
                 binding_op_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_element_extensible(parent_element,
             env);
-    binding_op_exts_impl->qname = axis2_qname_create_from_string(env,
+    binding_op_exts_impl->qname = axutil_qname_create_from_string(env,
             WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     soap_mods = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, binding_op_exts_impl->qname);

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c Fri Mar 30 12:24:00 2007
@@ -38,11 +38,11 @@
 
     void *f_parent;
     axutil_array_list_t *f_documentation_elements;
-    axis2_qname_t *f_ext_element_type;
+    axutil_qname_t *f_ext_element_type;
     axis2_bool_t f_required;
     void *f_attr_ext;
     void *f_elem_ext;
-    axis2_qname_t *f_element_decl_qn;
+    axutil_qname_t *f_element_decl_qn;
     void *f_element_decl;
     axis2_bool_t f_must_understand;
     void *f_types;
@@ -102,9 +102,9 @@
 woden_wsdl10_soap_header_block_set_element_qname(
     void *header_block,
     const axutil_env_t *env,
-    axis2_qname_t *qname);
+    axutil_qname_t *qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_soap_header_block_get_element_qname(
     void *header_block,
     const axutil_env_t *env);
@@ -146,9 +146,9 @@
 woden_wsdl10_soap_header_block_set_extension_type(
     void *header_block,
     const axutil_env_t *env,
-    axis2_qname_t *qname);
+    axutil_qname_t *qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_soap_header_block_get_extension_type(
     void *header_block,
     const axutil_env_t *env);
@@ -167,14 +167,14 @@
 woden_wsdl10_soap_header_block_set_ext_attr(
     void *header_block,
     const axutil_env_t *env,
-    axis2_qname_t *attr_type,
+    axutil_qname_t *attr_type,
     void *attr);
 
 void *AXIS2_CALL
 woden_wsdl10_soap_header_block_get_ext_attr(
     void *header_block,
     const axutil_env_t *env,
-    axis2_qname_t *attr_type);
+    axutil_qname_t *attr_type);
 
 axutil_array_list_t *AXIS2_CALL
 woden_wsdl10_soap_header_block_get_ext_attrs_for_namespace(
@@ -214,7 +214,7 @@
 woden_wsdl10_soap_header_block_get_ext_elements_of_type(
     void *header_block,
     const axutil_env_t *env,
-    axis2_qname_t *ext_type);
+    axutil_qname_t *ext_type);
 
 axis2_bool_t AXIS2_CALL
 woden_wsdl10_soap_header_block_has_ext_elements_for_namespace(
@@ -628,7 +628,7 @@
 
     if (header_block_impl->f_ext_element_type)
     {
-        axis2_qname_free(header_block_impl->f_ext_element_type, env);
+        axutil_qname_free(header_block_impl->f_ext_element_type, env);
         header_block_impl->f_ext_element_type = NULL;
     }
 
@@ -646,7 +646,7 @@
 
     if (header_block_impl->f_element_decl_qn)
     {
-        axis2_qname_free(header_block_impl->f_element_decl_qn, env);
+        axutil_qname_free(header_block_impl->f_element_decl_qn, env);
         header_block_impl->f_element_decl_qn = NULL;
     }
 
@@ -864,7 +864,7 @@
 woden_wsdl10_soap_header_block_set_element_qname(
     void *header_block,
     const axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -876,17 +876,17 @@
 
     if (header_block_impl->f_element_decl_qn)
     {
-        axis2_qname_free(header_block_impl->f_element_decl_qn, env);
+        axutil_qname_free(header_block_impl->f_element_decl_qn, env);
         header_block_impl->f_element_decl_qn = NULL;
     }
 
-    header_block_impl->f_element_decl_qn = axis2_qname_clone(qname, env);
+    header_block_impl->f_element_decl_qn = axutil_qname_clone(qname, env);
 
     return AXIS2_SUCCESS;
 
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_soap_header_block_get_element_qname(
     void *header_block,
     const axutil_env_t *env)
@@ -1034,7 +1034,7 @@
 woden_wsdl10_soap_header_block_set_extension_type(
     void *header_block,
     const axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -1046,16 +1046,16 @@
 
     if (header_block_impl->f_ext_element_type)
     {
-        axis2_qname_free(header_block_impl->f_ext_element_type, env);
+        axutil_qname_free(header_block_impl->f_ext_element_type, env);
         header_block_impl->f_ext_element_type = NULL;
     }
 
-    header_block_impl->f_ext_element_type = axis2_qname_clone(qname, env);
+    header_block_impl->f_ext_element_type = axutil_qname_clone(qname, env);
 
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_soap_header_block_get_extension_type(
     void *header_block,
     const axutil_env_t *env)
@@ -1098,7 +1098,7 @@
 woden_wsdl10_soap_header_block_set_ext_attr(
     void *header_block,
     const axutil_env_t *env,
-    axis2_qname_t *attr_type,
+    axutil_qname_t *attr_type,
     void *attr)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
@@ -1119,7 +1119,7 @@
 woden_wsdl10_soap_header_block_get_ext_attr(
     void *header_block,
     const axutil_env_t *env,
-    axis2_qname_t *attr_type)
+    axutil_qname_t *attr_type)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -1250,7 +1250,7 @@
 woden_wsdl10_soap_header_block_get_ext_elements_of_type(
     void *header_block,
     const axutil_env_t *env,
-    axis2_qname_t *ext_type)
+    axutil_qname_t *ext_type)
 {
     woden_wsdl10_soap_header_block_impl_t *header_block_impl = NULL;
     axutil_hash_t *super = NULL;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block_deserializer.c Fri Mar 30 12:24:00 2007
@@ -70,7 +70,7 @@
     const axutil_env_t *env,
     axis2_char_t *parent_type,
     void *parent,
-    axis2_qname_t *ext_type,
+    axutil_qname_t *ext_type,
     axiom_node_t *ext_el_node,
     void *desc,
     woden_wsdl10_ext_registry_t *ext_reg);
@@ -309,7 +309,7 @@
     const axutil_env_t *env,
     axis2_char_t *parent_type,
     void *parent,
-    axis2_qname_t *ext_type,
+    axutil_qname_t *ext_type,
     axiom_node_t *ext_el_node,
     void *desc,
     woden_wsdl10_ext_registry_t *ext_reg)
@@ -344,7 +344,7 @@
             WODEN_WSDL10_ATTR_ELEMENT);
     if (element_decl_qn)
     {
-        axis2_qname_t *qname = NULL;
+        axutil_qname_t *qname = NULL;
         axutil_hash_t *namespcs = NULL;
 
         desc = woden_wsdl10_desc_to_desc_element(desc, env);
@@ -383,12 +383,12 @@
 
     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,
+        q_elem_documentation = axutil_qname_create_from_string(env,
                 WODEN_WSDL10_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;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c Fri Mar 30 12:24:00 2007
@@ -41,7 +41,7 @@
     axutil_array_list_t *f_documentation_elements;
     void *f_binding_op_exts;
     void *f_address_exts;
-    axis2_qname_t *f_ext_element_type;
+    axutil_qname_t *f_ext_element_type;
     axis2_bool_t f_required;
     void *f_attr_ext;
     void *f_elem_ext;
@@ -147,9 +147,9 @@
 woden_wsdl10_soap_module_set_ext_type(
     void *module,
     axutil_env_t *env,
-    axis2_qname_t *qname);
+    axutil_qname_t *qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_soap_module_get_ext_type(
     void *module,
     axutil_env_t *env);
@@ -168,14 +168,14 @@
 woden_wsdl10_soap_module_set_ext_attr(
     void *module,
     axutil_env_t *env,
-    axis2_qname_t *attr_type,
+    axutil_qname_t *attr_type,
     void *attr);
 
 void *AXIS2_CALL
 woden_wsdl10_soap_module_get_ext_attr(
     void *module,
     axutil_env_t *env,
-    axis2_qname_t *attr_type);
+    axutil_qname_t *attr_type);
 
 axutil_array_list_t *AXIS2_CALL
 woden_wsdl10_soap_module_get_ext_attrs_for_namespace(
@@ -215,7 +215,7 @@
 woden_wsdl10_soap_module_get_ext_elements_of_type(
     void *module,
     axutil_env_t *env,
-    axis2_qname_t *ext_type);
+    axutil_qname_t *ext_type);
 
 axis2_bool_t AXIS2_CALL
 woden_wsdl10_soap_module_has_ext_elements_for_namespace(
@@ -611,7 +611,7 @@
 
     if (module_impl->f_ext_element_type)
     {
-        axis2_qname_free(module_impl->f_ext_element_type, env);
+        axutil_qname_free(module_impl->f_ext_element_type, env);
         module_impl->f_ext_element_type = NULL;
     }
 
@@ -983,7 +983,7 @@
 woden_wsdl10_soap_module_set_ext_type(
     void *module,
     axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -995,16 +995,16 @@
 
     if (module_impl->f_ext_element_type)
     {
-        axis2_qname_free(module_impl->f_ext_element_type, env);
+        axutil_qname_free(module_impl->f_ext_element_type, env);
         module_impl->f_ext_element_type = NULL;
     }
 
-    module_impl->f_ext_element_type = axis2_qname_clone(qname, env);
+    module_impl->f_ext_element_type = axutil_qname_clone(qname, env);
 
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_soap_module_get_ext_type(
     void *module,
     axutil_env_t *env)
@@ -1047,7 +1047,7 @@
 woden_wsdl10_soap_module_set_ext_attr(
     void *module,
     axutil_env_t *env,
-    axis2_qname_t *attr_type,
+    axutil_qname_t *attr_type,
     void *attr)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
@@ -1068,7 +1068,7 @@
 woden_wsdl10_soap_module_get_ext_attr(
     void *module,
     axutil_env_t *env,
-    axis2_qname_t *attr_type)
+    axutil_qname_t *attr_type)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -1199,7 +1199,7 @@
 woden_wsdl10_soap_module_get_ext_elements_of_type(
     void *module,
     axutil_env_t *env,
-    axis2_qname_t *ext_type)
+    axutil_qname_t *ext_type)
 {
     woden_wsdl10_soap_module_impl_t *module_impl = NULL;
     axutil_hash_t *super = NULL;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module_deserializer.c Fri Mar 30 12:24:00 2007
@@ -71,7 +71,7 @@
     const axutil_env_t *env,
     axis2_char_t *parent_type,
     void *parent,
-    axis2_qname_t *element_type,
+    axutil_qname_t *element_type,
     axiom_node_t *el_node,
     void *desc,
     woden_wsdl10_ext_registry_t *ext_reg);
@@ -310,7 +310,7 @@
     const axutil_env_t *env,
     axis2_char_t *parent_type,
     void *parent,
-    axis2_qname_t *element_type,
+    axutil_qname_t *element_type,
     axiom_node_t *el_node,
     void *desc,
     woden_wsdl10_ext_registry_t *ext_reg)
@@ -324,7 +324,7 @@
     axiom_element_t *temp_el = NULL;
     axiom_node_t *temp_el_node = NULL;
     axis2_bool_t required = AXIS2_FALSE;
-    axis2_qname_t *element_type_l = NULL;
+    axutil_qname_t *element_type_l = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     super = WODEN_WSDL10_SOAP_MODULE_DESERIALIZER_SUPER_OBJS(mod_deser, env);
@@ -364,9 +364,9 @@
 
     soap_mod = woden_wsdl10_soap_module_to_ext_element(soap_mod, env);
     WODEN_EXT_ELEMENT_SET_REQUIRED(soap_mod, env, required);
-    element_type_l = axis2_qname_create(env, "operation",
+    element_type_l = axutil_qname_create(env, "operation",
             "http://schemas.xmlsoap.org/wsdl/soap/", NULL);
-    if (AXIS2_TRUE == axis2_qname_equals(element_type, env, element_type_l))
+    if (AXIS2_TRUE == axutil_qname_equals(element_type, env, element_type_l))
     {
         axis2_char_t *action_str = NULL;
         axis2_uri_t *soap_action = NULL;
@@ -390,9 +390,9 @@
             soap_mod, env, binding_op_exts);
 
     }
-    element_type_l = axis2_qname_create(env, "address",
+    element_type_l = axutil_qname_create(env, "address",
             "http://schemas.xmlsoap.org/wsdl/soap/", NULL);
-    if (AXIS2_TRUE == axis2_qname_equals(element_type, env, element_type_l))
+    if (AXIS2_TRUE == axutil_qname_equals(element_type, env, element_type_l))
     {
         axis2_char_t *address_str = NULL;
         axis2_uri_t *soap_address = NULL;
@@ -418,12 +418,12 @@
 
     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,
+        q_elem_documentation = axutil_qname_create_from_string(env,
                 WODEN_WSDL10_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;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c Fri Mar 30 12:24:00 2007
@@ -100,7 +100,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_type,
-    axis2_qname_t *element_qtype,
+    axutil_qname_t *element_qtype,
     void *ed);
 
 void *AXIS2_CALL
@@ -108,14 +108,14 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_type,
-    axis2_qname_t *element_type);
+    axutil_qname_t *element_type);
 
 void *AXIS2_CALL
 woden_wsdl10_ext_registry_query_ext_element_type(
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_qname_t *elem_qn);
+    axutil_qname_t *elem_qn);
 
 axutil_array_list_t *AXIS2_CALL
 woden_wsdl10_ext_registry_get_allowable_exts(
@@ -128,7 +128,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_type,
-    axis2_qname_t *element_qtype,
+    axutil_qname_t *element_qtype,
     void *element);
 
 axis2_status_t AXIS2_CALL
@@ -136,7 +136,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *owner_class,
-    axis2_qname_t *attr_qname,
+    axutil_qname_t *attr_qname,
     void *attr);
 
 void *AXIS2_CALL
@@ -144,7 +144,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_qname_t *attr_qn);
+    axutil_qname_t *attr_qn);
 
 axis2_status_t AXIS2_CALL
 woden_wsdl10_ext_registry_register_component_ext(
@@ -321,7 +321,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_type,
-    axis2_qname_t *element_qtype,
+    axutil_qname_t *element_qtype,
     void *ed)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
@@ -339,7 +339,7 @@
         axutil_hash_set(registry_impl->deserializer_reg, parent_type,
                 AXIS2_HASH_KEY_STRING, inner_deserializer_reg);
     }
-    element_type = axis2_qname_to_string(element_qtype, env);
+    element_type = axutil_qname_to_string(element_qtype, env);
     axutil_hash_set(inner_deserializer_reg, element_type, AXIS2_HASH_KEY_STRING,
             ed);
     return AXIS2_SUCCESS;
@@ -366,26 +366,26 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_type,
-    axis2_qname_t *element_type)
+    axutil_qname_t *element_type)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
     axutil_hash_t *inner_deserializer_reg = NULL;
     axis2_char_t *elem_name = NULL;
     void *ed = NULL;
-    axis2_qname_t *element_qtype = NULL;
+    axutil_qname_t *element_qtype = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     registry_impl = INTF_TO_IMPL(registry);
 
     inner_deserializer_reg = axutil_hash_get(registry_impl->deserializer_reg,
             parent_type, AXIS2_HASH_KEY_STRING);
-    /*elem_name = axis2_qname_to_string(element_type, env); */
+    /*elem_name = axutil_qname_to_string(element_type, env); */
     if (inner_deserializer_reg)
     {
 
-        element_qtype = axis2_qname_create_from_string(env,
+        element_qtype = axutil_qname_create_from_string(env,
                 WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
-        elem_name = axis2_qname_to_string(element_qtype, env);
+        elem_name = axutil_qname_to_string(element_qtype, env);
         ed = axutil_hash_get(inner_deserializer_reg, elem_name,
                 AXIS2_HASH_KEY_STRING);
     }
@@ -412,7 +412,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_qname_t *elem_qn)
+    axutil_qname_t *elem_qn)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
     axutil_hash_t *inner_ext_element_reg = NULL;
@@ -424,7 +424,7 @@
 
     inner_ext_element_reg = axutil_hash_get(registry_impl->ext_element_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
-    /*elem_name = axis2_qname_to_string(elem_qn, env);*/
+    /*elem_name = axutil_qname_to_string(elem_qn, env);*/
     if (inner_ext_element_reg)
     {
         element = axutil_hash_get(inner_ext_element_reg,
@@ -493,7 +493,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_type,
-    axis2_qname_t *element_qtype,
+    axutil_qname_t *element_qtype,
     void *element)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
@@ -511,7 +511,7 @@
         axutil_hash_set(registry_impl->ext_element_reg, parent_type,
                 AXIS2_HASH_KEY_STRING, inner_ext_type_reg);
     }
-    element_type = axis2_qname_to_string(element_qtype, env);
+    element_type = axutil_qname_to_string(element_qtype, env);
     axutil_hash_set(inner_ext_type_reg, element_type, AXIS2_HASH_KEY_STRING,
             element);
     return AXIS2_SUCCESS;
@@ -536,7 +536,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *owner_class,
-    axis2_qname_t *attr_qname,
+    axutil_qname_t *attr_qname,
     void *attr)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
@@ -554,7 +554,7 @@
         axutil_hash_set(registry_impl->ext_attr_reg, owner_class,
                 AXIS2_HASH_KEY_STRING, inner_ext_attr_reg);
     }
-    attr_name = axis2_qname_to_string(attr_qname, env);
+    attr_name = axutil_qname_to_string(attr_qname, env);
     axutil_hash_set(inner_ext_attr_reg, attr_name, AXIS2_HASH_KEY_STRING, attr);
     return AXIS2_SUCCESS;
 }
@@ -576,7 +576,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_qname_t *attr_qn)
+    axutil_qname_t *attr_qn)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
     axutil_hash_t *inner_ext_attr_reg = NULL;
@@ -588,7 +588,7 @@
 
     inner_ext_attr_reg = axutil_hash_get(registry_impl->ext_attr_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
-    attr_name = axis2_qname_to_string(attr_qn, env);
+    attr_name = axutil_qname_to_string(attr_qn, env);
     if (inner_ext_attr_reg)
     {
         attr = axutil_hash_get(inner_ext_attr_reg, attr_name,
@@ -710,15 +710,15 @@
     const axutil_env_t *env)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
-    axis2_qname_t *q_attr_soap_version = NULL;
-    axis2_qname_t *q_attr_soap_protocol = NULL;
-    axis2_qname_t *q_attr_soap_mepdefault = NULL;
-    axis2_qname_t *q_attr_soap_code = NULL;
-    axis2_qname_t *q_attr_soap_subcodes = NULL;
-    axis2_qname_t *q_attr_soap_mep = NULL;
-    axis2_qname_t *q_attr_soap_action = NULL;
-    axis2_qname_t *q_elem_soap_module = NULL;
-    axis2_qname_t *q_elem_soap_header = NULL;
+    axutil_qname_t *q_attr_soap_version = NULL;
+    axutil_qname_t *q_attr_soap_protocol = NULL;
+    axutil_qname_t *q_attr_soap_mepdefault = NULL;
+    axutil_qname_t *q_attr_soap_code = NULL;
+    axutil_qname_t *q_attr_soap_subcodes = NULL;
+    axutil_qname_t *q_attr_soap_mep = NULL;
+    axutil_qname_t *q_attr_soap_action = NULL;
+    axutil_qname_t *q_elem_soap_module = NULL;
+    axutil_qname_t *q_elem_soap_header = NULL;
     axis2_uri_t *uri_ns_soap = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -736,37 +736,37 @@
         woden_qname_list_or_token_any_attr_create(env, NULL, NULL, NULL,
                 NULL);
 
-    q_attr_soap_version = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_VERSION);
+    q_attr_soap_version = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_VERSION);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env,
             "binding_element", q_attr_soap_version,
             registry_impl->string_attr);
 
-    q_attr_soap_protocol = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_PROTOCOL);
+    q_attr_soap_protocol = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_PROTOCOL);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env,
             "binding_element", q_attr_soap_protocol,
             registry_impl->uri_attr);
 
-    q_attr_soap_mepdefault = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_MEPDEFAULT);
+    q_attr_soap_mepdefault = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_MEPDEFAULT);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env,
             "binding_element", q_attr_soap_mepdefault,
             registry_impl->uri_attr);
 
-    q_attr_soap_code = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_CODE);
+    q_attr_soap_code = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_CODE);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env,
             "binding_fault_element", q_attr_soap_code,
             registry_impl->qname_or_token_any_attr);
 
-    q_attr_soap_subcodes = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_SUBCODES);
+    q_attr_soap_subcodes = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_SUBCODES);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env,
             "binding_fault_element", q_attr_soap_subcodes,
             registry_impl->qname_list_or_token_any_attr);
 
-    q_attr_soap_mep = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_MEP);
+    q_attr_soap_mep = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_MEP);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env,
             "binding_op_element", q_attr_soap_mep,
             registry_impl->uri_attr);
 
-    q_attr_soap_action = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_ACTION);
+    q_attr_soap_action = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_ACTION);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env,
             "binding_op_element", q_attr_soap_action,
             registry_impl->uri_attr);
@@ -780,7 +780,7 @@
 
     registry_impl->soap_module = woden_wsdl10_soap_module_create(env);
 
-    q_elem_soap_module = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
+    q_elem_soap_module = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
 
     woden_wsdl10_ext_registry_register_deserializer(registry, env, "binding_element",
             q_elem_soap_module,
@@ -836,7 +836,7 @@
         woden_wsdl10_soap_header_block_deserializer_create(env);
     registry_impl->soap_header_block = woden_wsdl10_soap_header_block_create(env);
 
-    q_elem_soap_header = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SOAP_HEADER);
+    q_elem_soap_header = axutil_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SOAP_HEADER);
 
     woden_wsdl10_ext_registry_register_deserializer(registry, env, "binding_fault_element",
             q_elem_soap_header,

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_msg_ref.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_msg_ref.c Fri Mar 30 12:24:00 2007
@@ -40,7 +40,7 @@
       axutil_hash_t *super;
       axutil_hash_t *methods;
 
-      axis2_qname_t *f_qname;
+      axutil_qname_t *f_qname;
       void *f_part;
 };
 
@@ -70,7 +70,7 @@
  *  Interface Operation  methods (the WSDL Component model)
  *************************************************************/
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_msg_ref_get_qname(
       void *msg_ref,
       const axutil_env_t *env);
@@ -88,7 +88,7 @@
 woden_wsdl10_msg_ref_set_qname(
       void *msg_ref,
       const axutil_env_t *env,
-      axis2_qname_t *qname);
+      axutil_qname_t *qname);
 
 axis2_status_t AXIS2_CALL
 woden_wsdl10_msg_ref_set_part(
@@ -637,7 +637,7 @@
 
       if (msg_ref_impl->f_qname)
       {
-	    axis2_qname_free(msg_ref_impl->f_qname, env);
+	    axutil_qname_free(msg_ref_impl->f_qname, env);
 	    msg_ref_impl->f_qname = NULL;
       }
 
@@ -761,7 +761,7 @@
  *  Interface Operation  methods (the WSDL Component model)
  * ************************************************************/
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_msg_ref_get_qname(
       void *msg_ref,
       const axutil_env_t *env)
@@ -803,7 +803,7 @@
 woden_wsdl10_msg_ref_set_qname(
       void *msg_ref,
       const axutil_env_t *env,
-      axis2_qname_t *qname)
+      axutil_qname_t *qname)
 {
       woden_wsdl10_msg_ref_impl_t *msg_ref_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -817,10 +817,10 @@
 
       if (msg_ref_impl->f_qname)
       {
-	    axis2_qname_free(msg_ref_impl->f_qname, env);
+	    axutil_qname_free(msg_ref_impl->f_qname, env);
 	    msg_ref_impl->f_qname = NULL;
       }
-      msg_ref_impl->f_qname = axis2_qname_clone(qname, env);
+      msg_ref_impl->f_qname = axutil_qname_clone(qname, env);
 
       return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_part.c Fri Mar 30 12:24:00 2007
@@ -41,9 +41,9 @@
       axutil_hash_t *super;
       axutil_hash_t *methods;
 
-      axis2_qname_t *f_qname;
+      axutil_qname_t *f_qname;
       void *f_element_decl;
-      axis2_qname_t *f_element_qname;
+      axutil_qname_t *f_element_qname;
       void *f_types;
 };
 
@@ -73,7 +73,7 @@
  *  Interface Message Reference  methods (the WSDL Component model)
  * ************************************************************/
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_part_get_qname(
       void *part,
       const axutil_env_t *env);
@@ -96,15 +96,15 @@
 woden_wsdl10_part_set_qname(
       void *part,
       const axutil_env_t *env,
-      axis2_qname_t *qname);
+      axutil_qname_t *qname);
 
 axis2_status_t AXIS2_CALL
 woden_wsdl10_part_set_element_qname(
       void *part,
       const axutil_env_t *env,
-      axis2_qname_t *element);
+      axutil_qname_t *element);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_part_get_element_qname(
       void *part,
       const axutil_env_t *env);
@@ -629,7 +629,7 @@
 
       if (part_impl->f_qname)
       {
-	    axis2_qname_free(part_impl->f_qname, env);
+	    axutil_qname_free(part_impl->f_qname, env);
 	    part_impl->f_qname = NULL;
       }
 
@@ -641,7 +641,7 @@
 
       if (part_impl->f_element_qname)
       {
-	    axis2_qname_free(part_impl->f_element_qname, env);
+	    axutil_qname_free(part_impl->f_element_qname, env);
 	    part_impl->f_element_qname = NULL;
       }
 
@@ -782,7 +782,7 @@
  *  Interface Message Reference  methods (the WSDL Component model)
  * ************************************************************/
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_part_get_qname(
       void *part,
       const axutil_env_t *env)
@@ -838,7 +838,7 @@
 woden_wsdl10_part_set_qname(
       void *part,
       const axutil_env_t *env,
-      axis2_qname_t *qname)
+      axutil_qname_t *qname)
 {
       woden_wsdl10_part_impl_t *part_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -851,10 +851,10 @@
 
       if (part_impl->f_qname)
       {
-	    axis2_qname_free(part_impl->f_qname, env);
+	    axutil_qname_free(part_impl->f_qname, env);
 	    part_impl->f_qname = NULL;
       }
-      part_impl->f_qname = axis2_qname_clone(qname, env);
+      part_impl->f_qname = axutil_qname_clone(qname, env);
 
 
       return AXIS2_SUCCESS;
@@ -864,7 +864,7 @@
 woden_wsdl10_part_set_element_qname(
       void *part,
       const axutil_env_t *env,
-      axis2_qname_t *element)
+      axutil_qname_t *element)
 {
       woden_wsdl10_part_impl_t *part_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -877,13 +877,13 @@
 
       if (part_impl->f_element_qname)
       {
-	    axis2_qname_free(part_impl->f_element_qname, env);
+	    axutil_qname_free(part_impl->f_element_qname, env);
       }
-      part_impl->f_element_qname = axis2_qname_clone(element, env);
+      part_impl->f_element_qname = axutil_qname_clone(element, env);
       return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_part_get_element_qname(
       void *part,
       const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_msg_ref.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_msg_ref.c Fri Mar 30 12:24:00 2007
@@ -41,7 +41,7 @@
       axutil_hash_t *super;
       axutil_hash_t *methods;
       void *f_direction;
-      axis2_qname_t *f_qname;
+      axutil_qname_t *f_qname;
       void *f_interface_msg_ref;
 };
 
@@ -100,9 +100,9 @@
 woden_wsdl10_binding_msg_ref_set_qname(
       void *binding_msg_ref,
       const axutil_env_t *env,
-      axis2_qname_t *qname);
+      axutil_qname_t *qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_binding_msg_ref_get_qname(
       void *binding_msg_ref,
       const axutil_env_t *env);
@@ -698,7 +698,7 @@
 
       if (binding_msg_ref_impl->f_qname)
       {
-	    axis2_qname_free(binding_msg_ref_impl->
+	    axutil_qname_free(binding_msg_ref_impl->
 			     f_qname, env);
 	    binding_msg_ref_impl->f_qname = NULL;
       }
@@ -909,7 +909,7 @@
 woden_wsdl10_binding_msg_ref_set_qname(
       void *binding_msg_ref,
       const axutil_env_t *env,
-      axis2_qname_t *qname)
+      axutil_qname_t *qname)
 {
       woden_wsdl10_binding_msg_ref_impl_t *binding_msg_ref_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -922,16 +922,16 @@
 
       if (binding_msg_ref_impl->f_qname)
       {
-	    axis2_qname_free(binding_msg_ref_impl->f_qname, env);
+	    axutil_qname_free(binding_msg_ref_impl->f_qname, env);
 	    binding_msg_ref_impl->f_qname = NULL;
       }
-      binding_msg_ref_impl->f_qname = axis2_qname_clone(qname, env);
+      binding_msg_ref_impl->f_qname = axutil_qname_clone(qname, env);
 
 
       return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_binding_msg_ref_get_qname(
       void *binding_msg_ref,
       const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c Fri Mar 30 12:24:00 2007
@@ -38,7 +38,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;
       axutil_array_list_t *f_msg_refs;
       axutil_array_list_t *f_fault_refs;
       void *f_interface_op;
@@ -96,9 +96,9 @@
 woden_wsdl10_binding_op_set_qname(
       void *binding_op,
       const axutil_env_t *env,
-      axis2_qname_t *qname);
+      axutil_qname_t *qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_binding_op_get_qname(
       void *binding_op,
       const axutil_env_t *env);
@@ -800,7 +800,7 @@
 
       if (binding_op_impl->f_qname)
       {
-	    axis2_qname_free(binding_op_impl->f_qname, env);
+	    axutil_qname_free(binding_op_impl->f_qname, env);
 	    binding_op_impl->f_qname = NULL;
       }
 
@@ -1028,7 +1028,7 @@
 woden_wsdl10_binding_op_set_qname(
       void *binding_op,
       const axutil_env_t *env,
-      axis2_qname_t *qname)
+      axutil_qname_t *qname)
 {
       woden_wsdl10_binding_op_impl_t *binding_op_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -1041,15 +1041,15 @@
 
       if (binding_op_impl->f_qname)
       {
-	    axis2_qname_free(binding_op_impl->f_qname, env);
+	    axutil_qname_free(binding_op_impl->f_qname, env);
 	    binding_op_impl->f_qname = NULL;
       }
-      binding_op_impl->f_qname = axis2_qname_clone(qname, env);
+      binding_op_impl->f_qname = axutil_qname_clone(qname, env);
 
       return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_binding_op_get_qname(
       void *binding_op,
       const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c Fri Mar 30 12:24:00 2007
@@ -489,12 +489,12 @@
 		  size = axutil_array_list_size(qnames, env);
 	    for (i = 0; i < size; i++)
 	    {
-		  axis2_qname_t *qname = NULL;
+		  axutil_qname_t *qname = NULL;
 		  axis2_char_t *namespc = NULL;
 
-		  qname = (axis2_qname_t *) axutil_array_list_get(qnames, env, i);
+		  qname = (axutil_qname_t *) axutil_array_list_get(qnames, env, i);
 		  if (qname)
-			namespc = axis2_qname_get_uri(qname, env);
+			namespc = axutil_qname_get_uri(qname, env);
 		  if (namespc && 0 == axis2_strcmp(namespc, schema_tns))
 		  {
 			void *ed = NULL;
@@ -546,12 +546,12 @@
 		  size = axutil_array_list_size(qnames, env);
 	    for (i = 0; i < size; i++)
 	    {
-		  axis2_qname_t *qname = NULL;
+		  axutil_qname_t *qname = NULL;
 		  axis2_char_t *namespc = NULL;
 
-		  qname = (axis2_qname_t *) axutil_array_list_get(qnames, env, i);
+		  qname = (axutil_qname_t *) axutil_array_list_get(qnames, env, i);
 		  if (qname)
-			namespc = axis2_qname_get_uri(qname, env);
+			namespc = axutil_qname_get_uri(qname, env);
 		  if (0 == axis2_strcmp(namespc, schema_tns))
 		  {
 			void *td = NULL;
@@ -627,7 +627,7 @@
 {
       woden_wsdl10_component_model_builder_impl_t *builder_impl = NULL;
       void *part = NULL;
-      axis2_qname_t *qname = NULL;
+      axutil_qname_t *qname = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, msg, AXIS2_FAILURE);
@@ -773,7 +773,7 @@
       {
 	    void *fault_ref = NULL;
 	    axutil_array_list_t *property_elements = NULL;
-	    axis2_qname_t *qname = NULL;
+	    axutil_qname_t *qname = NULL;
 
 	    fault_ref = axutil_array_list_get(fault_refs, env, i);
 	    fault_ref = woden_wsdl10_interface_fault_ref_to_configurable_element(fault_ref, env);
@@ -816,7 +816,7 @@
       for (i = 0; i < size; i++)
       {
 	    void *int_msg_ref = NULL;
-	    axis2_qname_t *qname = NULL;
+	    axutil_qname_t *qname = NULL;
 	    int_msg_ref = axutil_array_list_get(int_msg_refs, env, i);
 	    int_msg_ref = woden_wsdl10_interface_msg_ref_to_configurable_element(int_msg_ref, env);
 
@@ -1382,7 +1382,7 @@
       for (i = 0; i < size; i++)
       {
 	    void *prop = NULL;
-	    axis2_qname_t *qname = NULL;
+	    axutil_qname_t *qname = NULL;
 
 	    prop = axutil_array_list_get(prop_els, env, i);
 	    prop = woden_property_to_property_element(prop, env);

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c Fri Mar 30 12:24:00 2007
@@ -143,7 +143,7 @@
 woden_wsdl10_desc_get_element_decl(
       void *desc,
       const axutil_env_t *env,
-      axis2_qname_t *qname);
+      axutil_qname_t *qname);
 
 axutil_array_list_t *AXIS2_CALL
 woden_wsdl10_desc_get_type_defs(
@@ -154,7 +154,7 @@
 woden_wsdl10_desc_get_type_def(
       void *desc,
       const axutil_env_t *env,
-      axis2_qname_t *qname);
+      axutil_qname_t *qname);
 
 void *AXIS2_CALL
 woden_wsdl10_desc_to_element(
@@ -1382,7 +1382,7 @@
 woden_wsdl10_desc_get_element_decl(
       void *desc,
       const axutil_env_t *env,
-      axis2_qname_t *qname)
+      axutil_qname_t *qname)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -1401,10 +1401,10 @@
 	    size = axutil_array_list_size(desc_impl->f_all_element_decls, env);
       for (i = 0; i < size; i++)
       {
-	    axis2_qname_t *qname_l = NULL;
+	    axutil_qname_t *qname_l = NULL;
 	    void *ed = axutil_array_list_get(desc_impl->f_all_element_decls, env, i);
 	    qname_l = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
-	    if (0 == axis2_qname_equals(qname, env, qname_l))
+	    if (0 == axutil_qname_equals(qname, env, qname_l))
 	    {
 		  el_decl = ed;
 		  break;
@@ -1435,7 +1435,7 @@
 woden_wsdl10_desc_get_type_def(
       void *desc,
       const axutil_env_t *env,
-      axis2_qname_t *qname)
+      axutil_qname_t *qname)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -1453,10 +1453,10 @@
       size = axutil_array_list_size(desc_impl->f_all_element_decls, env);
       for (i = 0; i < size; i++)
       {
-	    axis2_qname_t *qname_l = NULL;
+	    axutil_qname_t *qname_l = NULL;
 	    void *ed = axutil_array_list_get(desc_impl->f_all_element_decls, env, i);
 	    qname_l = WODEN_TYPE_DEF_GET_QNAME(ed, env);
-	    if (0 == axis2_qname_equals(qname, env, qname_l))
+	    if (0 == axutil_qname_equals(qname, env, qname_l))
 	    {
 		  type_def = ed;
 		  break;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c Fri Mar 30 12:24:00 2007
@@ -38,7 +38,7 @@
       axutil_hash_t *super;
       axutil_hash_t *methods;
       woden_nc_name_t *f_name;
-      axis2_qname_t *f_binding_qname;
+      axutil_qname_t *f_binding_qname;
       void *f_binding;
       axis2_uri_t *f_address;
 };
@@ -97,9 +97,9 @@
 woden_wsdl10_endpoint_set_binding_qname(
       void *endpoint,
       const axutil_env_t *env,
-      axis2_qname_t *binding_qname);
+      axutil_qname_t *binding_qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_endpoint_get_binding_qname(
       void *endpoint,
       const axutil_env_t *env);
@@ -771,7 +771,7 @@
 
       if (endpoint_impl->f_binding_qname)
       {
-	    axis2_qname_free(endpoint_impl->f_binding_qname, env);
+	    axutil_qname_free(endpoint_impl->f_binding_qname, env);
 	    endpoint_impl->f_binding_qname = NULL;
       }
 
@@ -989,7 +989,7 @@
 woden_wsdl10_endpoint_set_binding_qname(
       void *endpoint,
       const axutil_env_t *env,
-      axis2_qname_t *binding_qname)
+      axutil_qname_t *binding_qname)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -1001,14 +1001,14 @@
 
       if (endpoint_impl->f_binding_qname)
       {
-	    axis2_qname_free(endpoint_impl->f_binding_qname, env);
+	    axutil_qname_free(endpoint_impl->f_binding_qname, env);
       }
 
-      endpoint_impl->f_binding_qname = axis2_qname_clone(binding_qname, env);
+      endpoint_impl->f_binding_qname = axutil_qname_clone(binding_qname, env);
       return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_endpoint_get_binding_qname(
       void *endpoint,
       const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c Fri Mar 30 12:24:00 2007
@@ -42,8 +42,8 @@
     axutil_hash_t *methods;
 
     void *f_direction;
-    axis2_qname_t *f_msg_qname;
-    axis2_qname_t *f_qname;
+    axutil_qname_t *f_msg_qname;
+    axutil_qname_t *f_qname;
 };
 
 #define INTF_TO_IMPL(interface_fault_ref) ((woden_wsdl10_interface_fault_ref_impl_t *) interface_fault_ref)
@@ -96,9 +96,9 @@
 woden_wsdl10_interface_fault_ref_set_qname(
     void *interface_fault_ref,
     const axutil_env_t *env,
-    axis2_qname_t *qname);
+    axutil_qname_t *qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_interface_fault_ref_get_qname(
     void *interface_fault_ref,
     const axutil_env_t *env);
@@ -108,9 +108,9 @@
 woden_wsdl10_interface_fault_ref_set_msg_qname(
     void *interface_fault_ref,
     const axutil_env_t *env,
-    axis2_qname_t *element);
+    axutil_qname_t *element);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_interface_fault_ref_get_msg_qname(
     void *interface_fault_ref,
     const axutil_env_t *env);
@@ -605,13 +605,13 @@
 
     if (interface_fault_ref_impl->f_qname)
     {
-        axis2_qname_free(interface_fault_ref_impl->f_qname, env);
+        axutil_qname_free(interface_fault_ref_impl->f_qname, env);
         interface_fault_ref_impl->f_qname = NULL;
     }
 
     if (interface_fault_ref_impl->f_msg_qname)
     {
-        axis2_qname_free(interface_fault_ref_impl->f_msg_qname, env);
+        axutil_qname_free(interface_fault_ref_impl->f_msg_qname, env);
         interface_fault_ref_impl->f_msg_qname = NULL;
     }
 
@@ -793,7 +793,7 @@
 woden_wsdl10_interface_fault_ref_set_qname(
     void *interface_fault_ref,
     const axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     woden_wsdl10_interface_fault_ref_impl_t *interface_fault_ref_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -806,13 +806,13 @@
 
     if (interface_fault_ref_impl->f_qname)
     {
-        axis2_qname_free(interface_fault_ref_impl->f_qname, env);
+        axutil_qname_free(interface_fault_ref_impl->f_qname, env);
     }
-    interface_fault_ref_impl->f_qname = axis2_qname_clone(qname, env);
+    interface_fault_ref_impl->f_qname = axutil_qname_clone(qname, env);
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_interface_fault_ref_get_qname(
     void *interface_fault_ref,
     const axutil_env_t *env)
@@ -833,7 +833,7 @@
 woden_wsdl10_interface_fault_ref_set_msg_qname(
     void *interface_fault_ref,
     const axutil_env_t *env,
-    axis2_qname_t *element)
+    axutil_qname_t *element)
 {
     woden_wsdl10_interface_fault_ref_impl_t *interface_fault_ref_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -846,13 +846,13 @@
 
     if (interface_fault_ref_impl->f_msg_qname)
     {
-        axis2_qname_free(interface_fault_ref_impl->f_msg_qname, env);
+        axutil_qname_free(interface_fault_ref_impl->f_msg_qname, env);
     }
-    interface_fault_ref_impl->f_msg_qname = axis2_qname_clone(element, env);
+    interface_fault_ref_impl->f_msg_qname = axutil_qname_clone(element, env);
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_interface_fault_ref_get_msg_qname(
     void *interface_fault_ref,
     const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_msg_ref.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_msg_ref.c Fri Mar 30 12:24:00 2007
@@ -47,9 +47,9 @@
 
       void *f_direction;
       void *f_msg_label;
-      axis2_qname_t *f_msg_qname;
+      axutil_qname_t *f_msg_qname;
       void *f_msg;
-      axis2_qname_t *f_qname;
+      axutil_qname_t *f_qname;
 };
 
 #define INTF_TO_IMPL(interface_msg_ref) ((woden_wsdl10_interface_msg_ref_impl_t *) interface_msg_ref)
@@ -117,9 +117,9 @@
 woden_wsdl10_interface_msg_ref_set_qname(
       void *interface_msg_ref,
       const axutil_env_t *env,
-      axis2_qname_t *qname);
+      axutil_qname_t *qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_interface_msg_ref_get_qname(
       void *interface_msg_ref,
       const axutil_env_t *env);
@@ -139,9 +139,9 @@
 woden_wsdl10_interface_msg_ref_set_msg_qname(
       void *interface_msg_ref,
       const axutil_env_t *env,
-      axis2_qname_t *element);
+      axutil_qname_t *element);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_interface_msg_ref_get_msg_qname(
       void *interface_msg_ref,
       const axutil_env_t *env);
@@ -162,9 +162,9 @@
 woden_wsdl10_interface_msg_ref_set_element_qname(
       void *interface_msg_ref,
       const axutil_env_t *env,
-      axis2_qname_t *element);
+      axutil_qname_t *element);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_interface_msg_ref_get_element_qname(
       void *interface_msg_ref,
       const axutil_env_t *env);
@@ -725,13 +725,13 @@
 
       if (interface_msg_ref_impl->f_qname)
       {
-	    axis2_qname_free(interface_msg_ref_impl->f_qname, env);
+	    axutil_qname_free(interface_msg_ref_impl->f_qname, env);
 	    interface_msg_ref_impl->f_qname = NULL;
       }
 
       if (interface_msg_ref_impl->f_msg_qname)
       {
-	    axis2_qname_free(interface_msg_ref_impl->f_msg_qname, env);
+	    axutil_qname_free(interface_msg_ref_impl->f_msg_qname, env);
 	    interface_msg_ref_impl->f_msg_qname = NULL;
       }
 
@@ -979,7 +979,7 @@
 woden_wsdl10_interface_msg_ref_set_qname(
       void *interface_msg_ref,
       const axutil_env_t *env,
-      axis2_qname_t *qname)
+      axutil_qname_t *qname)
 {
       woden_wsdl10_interface_msg_ref_impl_t *interface_msg_ref_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -992,13 +992,13 @@
 
       if (interface_msg_ref_impl->f_qname)
       {
-	    axis2_qname_free(interface_msg_ref_impl->f_qname, env);
+	    axutil_qname_free(interface_msg_ref_impl->f_qname, env);
       }
-      interface_msg_ref_impl->f_qname = axis2_qname_clone(qname, env);
+      interface_msg_ref_impl->f_qname = axutil_qname_clone(qname, env);
       return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_interface_msg_ref_get_qname(
       void *interface_msg_ref,
       const axutil_env_t *env)
@@ -1054,7 +1054,7 @@
 woden_wsdl10_interface_msg_ref_set_msg_qname(
       void *interface_msg_ref,
       const axutil_env_t *env,
-      axis2_qname_t *element)
+      axutil_qname_t *element)
 {
       woden_wsdl10_interface_msg_ref_impl_t *interface_msg_ref_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -1067,13 +1067,13 @@
 
       if (interface_msg_ref_impl->f_msg_qname)
       {
-	    axis2_qname_free(interface_msg_ref_impl->f_msg_qname, env);
+	    axutil_qname_free(interface_msg_ref_impl->f_msg_qname, env);
       }
-      interface_msg_ref_impl->f_msg_qname = axis2_qname_clone(element, env);
+      interface_msg_ref_impl->f_msg_qname = axutil_qname_clone(element, env);
       return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_interface_msg_ref_get_msg_qname(
       void *interface_msg_ref,
       const axutil_env_t *env)
@@ -1137,7 +1137,7 @@
 woden_wsdl10_interface_msg_ref_set_element_qname(
       void *interface_msg_ref,
       const axutil_env_t *env,
-      axis2_qname_t *element)
+      axutil_qname_t *element)
 {
       woden_wsdl10_interface_msg_ref_impl_t *interface_msg_ref_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -1162,7 +1162,7 @@
 
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_interface_msg_ref_get_element_qname(
       void *interface_msg_ref,
       const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c Fri Mar 30 12:24:00 2007
@@ -36,8 +36,8 @@
       woden_configurable_t *configurable;
       axutil_hash_t *super;
       axutil_hash_t *methods;
-      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;
       axutil_array_list_t *f_endpoints;
 };
@@ -67,7 +67,7 @@
  *  Service interface methods (the WSDL Component model)
  * ************************************************************/
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_svc_get_qname(
       void *svc,
       const axutil_env_t *env);
@@ -89,15 +89,15 @@
 woden_wsdl10_svc_set_qname(
       void *svc,
       const axutil_env_t *env,
-      axis2_qname_t *qname);
+      axutil_qname_t *qname);
 
 axis2_status_t AXIS2_CALL
 woden_wsdl10_svc_set_interface_qname(
       void *svc,
       const axutil_env_t *env,
-      axis2_qname_t *interface_qname);
+      axutil_qname_t *interface_qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_svc_get_interface_qname(
       void *svc,
       const axutil_env_t *env);
@@ -617,13 +617,13 @@
 
       if (svc_impl->f_qname)
       {
-	    axis2_qname_free(svc_impl->f_qname, env);
+	    axutil_qname_free(svc_impl->f_qname, env);
 	    svc_impl->f_qname = NULL;
       }
 
       if (svc_impl->f_interface_qname)
       {
-	    axis2_qname_free(svc_impl->f_interface_qname, env);
+	    axutil_qname_free(svc_impl->f_interface_qname, env);
 	    svc_impl->f_interface_qname = NULL;
       }
 
@@ -764,7 +764,7 @@
  *  Service interface methods (the WSDL Component model)
  * ************************************************************/
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_svc_get_qname(
       void *svc,
       const axutil_env_t *env)
@@ -819,7 +819,7 @@
 woden_wsdl10_svc_set_qname(
       void *svc,
       const axutil_env_t *env,
-      axis2_qname_t *qname)
+      axutil_qname_t *qname)
 {
       woden_wsdl10_svc_impl_t *svc_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -831,9 +831,9 @@
 
       if (svc_impl->f_qname)
       {
-	    axis2_qname_free(svc_impl->f_qname, env);
+	    axutil_qname_free(svc_impl->f_qname, env);
       }
-      svc_impl->f_qname = axis2_qname_clone(qname, env);
+      svc_impl->f_qname = axutil_qname_clone(qname, env);
       return AXIS2_SUCCESS;
 }
 
@@ -841,7 +841,7 @@
 woden_wsdl10_svc_set_interface_qname(
       void *svc,
       const axutil_env_t *env,
-      axis2_qname_t *interface_qname)
+      axutil_qname_t *interface_qname)
 {
       woden_wsdl10_svc_impl_t *svc_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -853,14 +853,14 @@
 
       if (svc_impl->f_interface_qname)
       {
-	    axis2_qname_free(svc_impl->f_interface_qname, env);
+	    axutil_qname_free(svc_impl->f_interface_qname, env);
       }
 
-      svc_impl->f_interface_qname = axis2_qname_clone(interface_qname, env);
+      svc_impl->f_interface_qname = axutil_qname_clone(interface_qname, env);
       return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 woden_wsdl10_svc_get_interface_qname(
       void *svc,
       const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_exts.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_exts.c Fri Mar 30 12:24:00 2007
@@ -36,7 +36,7 @@
     axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
 };
 
 #define INTF_TO_IMPL(binding_exts) ((woden_soap_binding_exts_impl_t *) binding_exts)
@@ -257,7 +257,7 @@
 
     if (binding_exts_impl->qname)
     {
-        axis2_qname_free(binding_exts_impl->qname, env);
+        axutil_qname_free(binding_exts_impl->qname, env);
         binding_exts_impl->qname = NULL;
     }
     woden_soap_binding_exts_free_ops(binding_exts, env);
@@ -378,7 +378,7 @@
                 binding_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_VERSION);
+    binding_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_VERSION);
     version = (woden_string_attr_t *)
             WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_exts_impl->qname);
     return version  ? WODEN_STRING_ATTR_GET_STRING(version, env) :
@@ -402,7 +402,7 @@
 
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_PROTOCOL);
+    binding_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_PROTOCOL);
     protocol = (woden_uri_attr_t *) WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(
                 parent_element, env, binding_exts_impl->qname);
     return protocol  ? WODEN_URI_ATTR_GET_URI(protocol, env) : NULL;
@@ -425,7 +425,7 @@
 
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_MEPDEFAULT);
+    binding_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_MEPDEFAULT);
     mep_default = (woden_uri_attr_t *)
             WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_exts_impl->qname);
     return mep_default  ? WODEN_URI_ATTR_GET_URI(mep_default, env) :
@@ -448,7 +448,7 @@
                 binding_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ELEM_SOAP_MODULE);
+    binding_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_Q_ELEM_SOAP_MODULE);
     ext_els = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, binding_exts_impl->qname);
     return ext_els;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_exts.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_exts.c Fri Mar 30 12:24:00 2007
@@ -39,7 +39,7 @@
     axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
 };
 
 #define INTF_TO_IMPL(binding_fault_exts) ((woden_soap_binding_fault_exts_impl_t *) binding_fault_exts)
@@ -260,7 +260,7 @@
 
     if (binding_fault_exts_impl->qname)
     {
-        axis2_qname_free(binding_fault_exts_impl->qname, env);
+        axutil_qname_free(binding_fault_exts_impl->qname, env);
         binding_fault_exts_impl->qname = NULL;
     }
     woden_soap_binding_fault_exts_free_ops(binding_fault_exts, env);
@@ -385,7 +385,7 @@
                 binding_fault_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_CODE);
+    binding_fault_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_CODE);
     code = (woden_qname_or_token_any_attr_t *)
             WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_fault_exts_impl->qname);
     if (! code)
@@ -433,7 +433,7 @@
                 binding_fault_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element,
             env);
-    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_SUBCODES);
+    binding_fault_exts_impl->qname = axutil_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_SUBCODES);
     subcodes = (woden_qname_list_or_token_any_attr_t *)
             WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_fault_exts_impl->qname);
     if (! subcodes)
@@ -478,7 +478,7 @@
                 binding_fault_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_element_extensible(parent_element,
             env);
-    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env,
+    binding_fault_exts_impl->qname = axutil_qname_create_from_string(env,
             WODEN_Q_ELEM_SOAP_MODULE);
     soap_mods = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, binding_fault_exts_impl->qname);
@@ -502,7 +502,7 @@
                 binding_fault_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_element_extensible(parent_element,
             env);
-    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env,
+    binding_fault_exts_impl->qname = axutil_qname_create_from_string(env,
             WODEN_Q_ELEM_SOAP_HEADER);
     soap_headers = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, binding_fault_exts_impl->qname);

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_ref_exts.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_ref_exts.c Fri Mar 30 12:24:00 2007
@@ -37,7 +37,7 @@
     axutil_hash_t *super;
     woden_obj_types_t obj_type;
 
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
 };
 
 #define INTF_TO_IMPL(binding_fault_ref_exts) ((woden_soap_binding_fault_ref_exts_impl_t *) binding_fault_ref_exts)
@@ -228,7 +228,7 @@
 
     if (binding_fault_ref_exts_impl->qname)
     {
-        axis2_qname_free(binding_fault_ref_exts_impl->qname, env);
+        axutil_qname_free(binding_fault_ref_exts_impl->qname, env);
         binding_fault_ref_exts_impl->qname = NULL;
     }
     woden_soap_binding_fault_ref_exts_free_ops(binding_fault_ref_exts, env);
@@ -331,7 +331,7 @@
                 binding_fault_ref_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_element_extensible(parent_element,
             env);
-    binding_fault_ref_exts_impl->qname = axis2_qname_create_from_string(env,
+    binding_fault_ref_exts_impl->qname = axutil_qname_create_from_string(env,
             WODEN_Q_ELEM_SOAP_MODULE);
     soap_mods = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
                 parent_element, env, binding_fault_ref_exts_impl->qname);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org