axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r524243 [17/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...
Date Fri, 30 Mar 2007 19:24:23 GMT
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema.c Fri Mar 30 12:24:00 2007
@@ -152,13 +152,13 @@
 xml_schema_get_element_by_qname(
     void *schema,
     const axutil_env_t *env,
-    const axis2_qname_t *qname);
+    const axutil_qname_t *qname);
 
 xml_schema_type_t *AXIS2_CALL
 xml_schema_get_type_by_qname(
     void *schema,
     const axutil_env_t *env,
-    axis2_qname_t *qname);
+    axutil_qname_t *qname);
 
 xml_schema_derivation_method_t *AXIS2_CALL
 xml_schema_get_final_default(
@@ -814,7 +814,7 @@
 xml_schema_get_element_by_qname(
     void *schema,
     const axutil_env_t *env,
-    const axis2_qname_t *qname)
+    const axutil_qname_t *qname)
 {
     xml_schema_impl_t *schema_impl = NULL;
     axutil_hash_t *ht_super = NULL;
@@ -840,7 +840,7 @@
 xml_schema_get_type_by_qname(
     void *schema,
     const axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     xml_schema_impl_t *schema_impl = NULL;
     axutil_hash_t *ht_super = NULL;
@@ -1185,7 +1185,7 @@
     xml_schema_type_t *type)
 {
 
-    axis2_qname_t *qname = NULL;
+    axutil_qname_t *qname = NULL;
     xml_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c Fri Mar 30 12:24:00 2007
@@ -45,11 +45,11 @@
 
     xml_schema_simple_type_t *schema_type;
 
-    axis2_qname_t *schema_type_name;
+    axutil_qname_t *schema_type_name;
 
-    axis2_qname_t *qualified_name;
+    axutil_qname_t *qualified_name;
 
-    axis2_qname_t *ref_name;
+    axutil_qname_t *ref_name;
 
     xml_schema_types_t obj_type;
 
@@ -110,14 +110,14 @@
         const axutil_env_t *env,
         xml_schema_form_t *schema_form);
 
-axis2_qname_t*  AXIS2_CALL
+axutil_qname_t*  AXIS2_CALL
 xml_schema_attribute_get_qname(void *attr,
         const axutil_env_t *env);
 
 axis2_status_t  AXIS2_CALL
 xml_schema_attribute_set_qname(void *attr,
         const axutil_env_t *env,
-        axis2_qname_t *qualified_name);
+        axutil_qname_t *qualified_name);
 
 axis2_char_t*  AXIS2_CALL
 xml_schema_attribute_get_name(void *attr,
@@ -128,14 +128,14 @@
         const axutil_env_t *env,
         axis2_char_t *name);
 
-axis2_qname_t*  AXIS2_CALL
+axutil_qname_t*  AXIS2_CALL
 xml_schema_attribute_get_ref_name(void *attr,
         const axutil_env_t *env);
 
 axis2_status_t  AXIS2_CALL
 xml_schema_attribute_set_ref_name(void *attr,
         const axutil_env_t *env,
-        axis2_qname_t *ref_name);
+        axutil_qname_t *ref_name);
 
 xml_schema_simple_type_t*  AXIS2_CALL
 xml_schema_attribute_get_schema_type(void *attr,
@@ -146,7 +146,7 @@
         const axutil_env_t *env,
         xml_schema_simple_type_t* sch_type);
 
-axis2_qname_t*  AXIS2_CALL
+axutil_qname_t*  AXIS2_CALL
 xml_schema_attribute_get_schema_type_name(void *attr,
         const axutil_env_t *env);
 
@@ -154,7 +154,7 @@
 axis2_status_t  AXIS2_CALL
 xml_schema_attribute_set_schema_type_name(void *attr,
         const axutil_env_t *env,
-        axis2_qname_t *sch_type_name);
+        axutil_qname_t *sch_type_name);
 
 xml_schema_use_t*  AXIS2_CALL
 xml_schema_attribute_get_use(void *attr,
@@ -476,7 +476,7 @@
 
 }
 
-axis2_qname_t*  AXIS2_CALL
+axutil_qname_t*  AXIS2_CALL
 xml_schema_attribute_get_qname(void *attr,
         const axutil_env_t *env)
 {
@@ -486,7 +486,7 @@
 axis2_status_t  AXIS2_CALL
 xml_schema_attribute_set_qname(void *attr,
         const axutil_env_t *env,
-        axis2_qname_t *qualified_name)
+        axutil_qname_t *qualified_name)
 {
     xml_schema_attribute_impl_t *attr_impl = NULL;
     AXIS2_PARAM_CHECK(env->error, qualified_name, AXIS2_FAILURE);
@@ -526,7 +526,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t*  AXIS2_CALL
+axutil_qname_t*  AXIS2_CALL
 xml_schema_attribute_get_ref_name(void *attr,
         const axutil_env_t *env)
 {
@@ -536,7 +536,7 @@
 axis2_status_t  AXIS2_CALL
 xml_schema_attribute_set_ref_name(void *attr,
         const axutil_env_t *env,
-        axis2_qname_t *ref_name)
+        axutil_qname_t *ref_name)
 {
     xml_schema_attribute_impl_t *attr_impl = NULL;
     AXIS2_PARAM_CHECK(env->error, ref_name, AXIS2_FAILURE);
@@ -573,7 +573,7 @@
 
 }
 
-axis2_qname_t*  AXIS2_CALL
+axutil_qname_t*  AXIS2_CALL
 xml_schema_attribute_get_schema_type_name(void *attr,
         const axutil_env_t *env)
 {
@@ -584,7 +584,7 @@
 axis2_status_t  AXIS2_CALL
 xml_schema_attribute_set_schema_type_name(void *attr,
         const axutil_env_t *env,
-        axis2_qname_t *sch_type_name)
+        axutil_qname_t *sch_type_name)
 {
     xml_schema_attribute_impl_t *attr_impl = NULL;
     AXIS2_PARAM_CHECK(env->error, sch_type_name, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c Fri Mar 30 12:24:00 2007
@@ -32,7 +32,7 @@
 
     xml_schema_annotated_t *annotated;
 
-    axis2_qname_t *ref_qname;
+    axutil_qname_t *ref_qname;
 
     xml_schema_types_t obj_type;
 
@@ -62,7 +62,7 @@
 xml_schema_attribute_group_ref_super_objs(void *grp_ref,
         const axutil_env_t *env);
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_attribute_group_ref_get_ref_qname(
     void *grp_ref,
     const axutil_env_t *env);
@@ -71,7 +71,7 @@
 xml_schema_attribute_group_ref_set_ref_qname(
     void *grp_ref,
     const axutil_env_t *env,
-    axis2_qname_t *any_attr);
+    axutil_qname_t *any_attr);
 
 /************************ end function prototypes ******************************/
 
@@ -173,7 +173,7 @@
     }
     if (attr_impl->ref_qname)
     {
-        axis2_qname_free(attr_impl->ref_qname, env);
+        axutil_qname_free(attr_impl->ref_qname, env);
         attr_impl->ref_qname = NULL;
     }
 
@@ -227,7 +227,7 @@
     return AXIS2_INTF_TO_IMPL(grp_ref)->ht_super;
 }
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_attribute_group_ref_get_ref_qname(
     void *grp_ref,
     const axutil_env_t *env)
@@ -239,7 +239,7 @@
 xml_schema_attribute_group_ref_set_ref_qname(
     void *grp_ref,
     const axutil_env_t *env,
-    axis2_qname_t *ref_qname)
+    axutil_qname_t *ref_qname)
 {
     xml_schema_attribute_group_ref_impl_t *attr_grp_impl = NULL;
     AXIS2_PARAM_CHECK(env->error, ref_qname, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Fri Mar 30 12:24:00 2007
@@ -19,10 +19,10 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <axis2_string_util.h>
+#include <axutil_string_util.h>
 #include <axutil_allocator.h>
 #include <limits.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
 #include <axiom_util.h>
 #include <xml_schema_complex_content_restriction.h>
 
@@ -598,7 +598,7 @@
         {
             void *type = NULL;
             void *t = NULL;
-            axis2_qname_t *qn = NULL;
+            axutil_qname_t *qn = NULL;
 
 
             type = handle_simple_type(builder, env, child_ele_node, ele_node);
@@ -615,8 +615,8 @@
                 axis2_char_t *u = NULL;
                 axis2_char_t *p = NULL;
 
-                u = axis2_qname_get_uri(qn, env);
-                p = axis2_qname_get_localpart(qn, env);
+                u = axutil_qname_get_uri(qn, env);
+                p = axutil_qname_get_localpart(qn, env);
                 XML_SCHEMA_COLLECTION_RESOLVE_TYPE(builder_impl->collection,
                         env, qn, type);
             }
@@ -626,7 +626,7 @@
         else if (axis2_strcmp(localname, "complexType") == 0)
         {
             void *type = NULL;
-            axis2_qname_t *qn = NULL;
+            axutil_qname_t *qn = NULL;
             type = handle_complex_type(builder, env, child_ele_node, ele_node);
 
             XML_SCHEMA_ADD_TYPE(builder_impl->schema, env, type);
@@ -648,9 +648,9 @@
             sch_ele = handle_element(builder, env, child_ele_node, ele_node, AXIS2_TRUE);
             if (sch_ele)
             {
-                axis2_qname_t *qualified_qname = NULL;
+                axutil_qname_t *qualified_qname = NULL;
                 axis2_char_t *qname_uri = NULL; /* for debuging */
-                axis2_qname_t *ref_qname = NULL;
+                axutil_qname_t *ref_qname = NULL;
                 xml_schema_obj_table_t *elements = NULL;
 
                 elements = XML_SCHEMA_GET_ELEMENTS(builder_impl->schema, env);
@@ -660,7 +660,7 @@
 
                 if (qualified_qname && NULL != elements)
                 {
-                    qname_uri = axis2_qname_get_uri(qualified_qname, env);
+                    qname_uri = axutil_qname_get_uri(qualified_qname, env);
                     XML_SCHEMA_OBJ_TABLE_ADD(elements, env,
                             qualified_qname, sch_ele);
                 }
@@ -730,7 +730,7 @@
             attr_tbl = XML_SCHEMA_GET_ATTRS(builder_impl->schema, env);
             if (attr)
             {
-                axis2_qname_t *qn = NULL;
+                axutil_qname_t *qn = NULL;
                 qn = XML_SCHEMA_ATTRIBUTE_GET_QNAME(attr, env);
                 XML_SCHEMA_OBJ_TABLE_ADD(attr_tbl, env, qn, attr);
                 XML_SCHEMA_OBJ_COLLECTION_ADD(items, env, attr);
@@ -867,7 +867,7 @@
         if (axis2_strcmp(localname, "simpleType") == 0)
         {
             void *type = NULL;
-            axis2_qname_t *qn = NULL;
+            axutil_qname_t *qn = NULL;
 
             type = handle_simple_type(builder, env, child_ele_node, sch_node);
 
@@ -881,7 +881,7 @@
         else if (axis2_strcmp(localname, "complexType") == 0)
         {
             void *type = NULL;
-            axis2_qname_t *qn = NULL;
+            axutil_qname_t *qn = NULL;
 
             type = handle_complex_type(builder, env, child_ele_node, sch_node);
 
@@ -946,7 +946,7 @@
     axiom_element_t *om_ele = NULL;
 
     axutil_hash_t *ht_sch_ns = NULL;
-    axis2_qname_t *target_ns_qn = NULL;
+    axutil_qname_t *target_ns_qn = NULL;
     axis2_char_t *contain = NULL;
 
     AXIS2_PARAM_CHECK(env->error, schema, AXIS2_FAILURE);
@@ -1008,12 +1008,12 @@
         }
     }
     /** note: targetNamespace may availabe even though namespace declarations not available */ 
-    target_ns_qn = axis2_qname_create(env, "targetNamespace", NULL, NULL);
+    target_ns_qn = axutil_qname_create(env, "targetNamespace", NULL, NULL);
 
     contain = axiom_element_get_attribute_value(om_ele, env, target_ns_qn);
 
     if (target_ns_qn)
-        axis2_qname_free(target_ns_qn, env);
+        axutil_qname_free(target_ns_qn, env);
 
     if (contain &&
             (value_exist_in_hash(env, ht_sch_ns, contain)) == AXIS2_FALSE)
@@ -1171,7 +1171,7 @@
             axis2_char_t *namesp          = NULL;
             axutil_array_list_t *last_list = NULL;
             axis2_char_t *name            = NULL;
-            axis2_qname_t *qn              = NULL;
+            axutil_qname_t *qn              = NULL;
 
             temp_list = axis2_tokenize(env, attribute_value, ':');
 
@@ -1187,7 +1187,7 @@
 
             name = axutil_array_list_get(last_list, env, ':');
 
-            qn = axis2_qname_create(env, name, namesp, NULL);
+            qn = axutil_qname_create(env, name, namesp, NULL);
 
             XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_SET_BASE_TYPE_NAME(restriction, env, qn);
         }
@@ -1256,7 +1256,7 @@
             axutil_array_list_t *namespaces_form_ele = NULL;
             axutil_array_list_t *last_list = NULL;
             axis2_char_t *name = NULL;
-            axis2_qname_t *item_type_qn = NULL;
+            axutil_qname_t *item_type_qn = NULL;
             axis2_char_t *ns = NULL;
             axis2_char_t *key = NULL;
             axutil_hash_t *ht_ns = NULL;
@@ -1284,7 +1284,7 @@
 
             name = axutil_array_list_get(last_list, env, 1);
 
-            item_type_qn = axis2_qname_create(env, name, ns, NULL);
+            item_type_qn = axutil_qname_create(env, name, ns, NULL);
 
             XML_SCHEMA_SIMPLE_TYPE_LIST_SET_ITEM_TYPE_NAME(list, env, item_type_qn);
         }
@@ -1350,7 +1350,7 @@
                 axis2_char_t *member = NULL;
                 axis2_char_t *mem_dup = NULL;
                 axis2_char_t *index = NULL;
-                axis2_qname_t *qn = NULL;
+                axutil_qname_t *qn = NULL;
                 member = axutil_array_list_get(v, env, i);
                 mem_dup = axis2_strdup(env, member);
 
@@ -1366,7 +1366,7 @@
                     localname = mem_dup;
                 }
                 uri = axutil_hash_get(ht_namespaces, prefix, AXIS2_HASH_KEY_STRING);
-                qn = axis2_qname_create(env, localname, uri, prefix);
+                qn = axutil_qname_create(env, localname, uri, prefix);
                 /*
                 AXIS2_FREE(env->allocator, mem_dup);
                 AXIS2_FFRE(env->allocator, localname);
@@ -1769,7 +1769,7 @@
 
         axis2_char_t *name = NULL;
 
-        axis2_qname_t *qn = NULL;
+        axutil_qname_t *qn = NULL;
 
         if (strchr(attr_value, ':'))
         {
@@ -1791,7 +1791,7 @@
         if (last_list && axutil_array_list_size(last_list, env) >= 2)
             name = (axis2_char_t *)axutil_array_list_get(last_list, env, 1);
 
-        qn = axis2_qname_create(env, name, result, NULL);
+        qn = axutil_qname_create(env, name, result, NULL);
 
         XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SET_BASE_TYPE_NAME(sim_cnt_res, env, qn);
         attr_value = NULL;
@@ -1909,7 +1909,7 @@
         axis2_char_t *result = NULL;
         axutil_array_list_t* last_list = NULL;
         axis2_char_t *name = NULL;
-        axis2_qname_t *qn = NULL;
+        axutil_qname_t *qn = NULL;
 
         if (strchr(attr_value, ':'))
         {
@@ -1932,7 +1932,7 @@
         if (last_list && axutil_array_list_size(last_list, env) >= 2)
             name = (axis2_char_t *)axutil_array_list_get(last_list, env, 1);
 
-        qn = axis2_qname_create(env, name, result, NULL);
+        qn = axutil_qname_create(env, name, result, NULL);
 
         XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_SET_BASE_TYPE_NAME(sim_cnt_ext, env, qn);
 
@@ -2011,7 +2011,7 @@
         axis2_char_t *result = NULL;
         axutil_array_list_t* last_list = NULL;
         axis2_char_t *name = NULL;
-        axis2_qname_t *qn = NULL;
+        axutil_qname_t *qn = NULL;
 
         if (strchr(attr_value, ':'))
         {
@@ -2033,7 +2033,7 @@
         if (last_list && axutil_array_list_size(last_list, env) >= 2)
             name = (axis2_char_t *)axutil_array_list_get(last_list, env, 1);
 
-        qn = axis2_qname_create(env, name, result, NULL);
+        qn = axutil_qname_create(env, name, result, NULL);
 
         XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_SET_BASE_TYPE_NAME(cmp_cnt_res, env, qn);
 
@@ -2129,7 +2129,7 @@
         axis2_char_t *result = NULL;
         axutil_array_list_t* last_list = NULL;
         axis2_char_t *name = NULL;
-        axis2_qname_t *qn = NULL;
+        axutil_qname_t *qn = NULL;
 
         if (strchr(attr_value, ':'))
         {
@@ -2152,7 +2152,7 @@
         if (last_list && axutil_array_list_size(last_list, env) >= 2)
             name = (axis2_char_t *)axutil_array_list_get(last_list, env, 1);
 
-        qn = axis2_qname_create(env, name, result, NULL);
+        qn = axutil_qname_create(env, name, result, NULL);
 
         XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_SET_BASE_TYPE_NAME(cmp_cnt_ext, env, qn);
 
@@ -2247,7 +2247,7 @@
         axis2_char_t *uri = NULL;
         axis2_char_t *ref = NULL;
         axutil_array_list_t *last_list = NULL;
-        axis2_qname_t *ref_qname = NULL;
+        axutil_qname_t *ref_qname = NULL;
         parts = axis2_tokenize(env, attr_value, ':');
 
         if (parts && axutil_array_list_size(parts, env) > 1)
@@ -2267,7 +2267,7 @@
         last_list = axis2_last_token(env, attr_value, ':');
         ref = axutil_array_list_get(last_list, env, 1);
         /** check this */
-        ref_qname = axis2_qname_create(env, ref, uri, NULL);
+        ref_qname = axutil_qname_create(env, ref, uri, NULL);
         XML_SCHEMA_ATTRIBUTE_GROUP_REF_SET_REF_QNAME(attr_grp_ref, env, ref_qname);
     }
 
@@ -2792,7 +2792,7 @@
         axis2_char_t *result  = NULL;
         axutil_array_list_t *last_list = NULL;
         axis2_char_t *ref = NULL;
-        axis2_qname_t *ref_qname = NULL;
+        axutil_qname_t *ref_qname = NULL;
 
         parts = axis2_tokenize(env, attr_value, ':');
         ht_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(
@@ -2810,7 +2810,7 @@
         }
         last_list = axis2_last_token(env, attr_value, ':');
         ref = axutil_array_list_get(last_list, env, 1);
-        ref_qname = axis2_qname_create(env, ref, XML_SCHEMA_NS, NULL);
+        ref_qname = axutil_qname_create(env, ref, XML_SCHEMA_NS, NULL);
         return group;
     }
 
@@ -2877,9 +2877,9 @@
 
     if (attr_value)
     {
-        axis2_qname_t *qn = NULL;
+        axutil_qname_t *qn = NULL;
         XML_SCHEMA_ATTRIBUTE_SET_NAME(attr, env, attr_value);
-        qn = axis2_qname_create(env, attr_value, target_namespace, NULL);
+        qn = axutil_qname_create(env, attr_value, target_namespace, NULL);
         XML_SCHEMA_ATTRIBUTE_SET_QNAME(attr, env, qn);
     }
 
@@ -2893,7 +2893,7 @@
         axis2_char_t *prefix = NULL;
         axutil_array_list_t *last_list = NULL;
         axis2_char_t *name = NULL;
-        axis2_qname_t *qn = NULL;
+        axutil_qname_t *qn = NULL;
 
         args = axis2_tokenize(env, attr_value, ':');
 
@@ -2931,7 +2931,7 @@
         last_list = axis2_last_token(env, attr_value, ':');
         name = axutil_array_list_get(last_list, env, 1);
 
-        qn = axis2_qname_create(env, name, namesp, NULL);
+        qn = axutil_qname_create(env, name, namesp, NULL);
         XML_SCHEMA_ATTRIBUTE_SET_SCHEMA_TYPE_NAME(attr, env, qn);
     }
 
@@ -2987,7 +2987,7 @@
         axis2_char_t *namesp        = NULL;
         axutil_array_list_t *last_list = NULL;
         axis2_char_t *name          = NULL;
-        axis2_qname_t *ref_name     = NULL;
+        axutil_qname_t *ref_name     = NULL;
 
         ns_list = axis2_tokenize(env, attr_value, ':');
         if (axutil_array_list_size(ns_list, env) > 1)
@@ -3018,7 +3018,7 @@
 
         last_list = axis2_last_token(env, attr_value, ':');
         name = axutil_array_list_get(last_list, env, 1);
-        ref_name = axis2_qname_create(env, name, namesp, NULL);
+        ref_name = axutil_qname_create(env, name, namesp, NULL);
 
         XML_SCHEMA_ATTRIBUTE_SET_REF_NAME(attr, env, ref_name);
         XML_SCHEMA_ATTRIBUTE_SET_NAME(attr, env, name);
@@ -3175,8 +3175,8 @@
 
     if (element_name)
     {
-        axis2_qname_t *qn = NULL;
-        qn = axis2_qname_create(env, element_name, ns , NULL);
+        axutil_qname_t *qn = NULL;
+        qn = axutil_qname_create(env, element_name, ns , NULL);
         XML_SCHEMA_ELEMENT_SET_QNAME(sch_ele, env, qn);
     }
 
@@ -3201,7 +3201,7 @@
         axis2_char_t *prefix = NULL;
         axutil_array_list_t *last_list = NULL;
         axis2_char_t *type_name = NULL;
-        axis2_qname_t *type_qname = NULL;
+        axutil_qname_t *type_qname = NULL;
         void *type = NULL;
 
         args = axis2_tokenize(env, attr_value, ':');
@@ -3239,7 +3239,7 @@
 
         last_list = axis2_last_token(env, attr_value, ':');
         type_name = axutil_array_list_get(last_list, env, 1);
-        type_qname = axis2_qname_create(env, type_name, namesp, NULL);
+        type_qname = axutil_qname_create(env, type_name, namesp, NULL);
         XML_SCHEMA_ELEMENT_SET_SCHEMA_TYPE_QNAME(sch_ele, env, type_qname);
 
         type = XML_SCHEMA_COLLECTION_GET_TYPE_BY_QNAME(
@@ -3272,7 +3272,7 @@
         axis2_char_t *args0      = NULL;
         axis2_char_t *namesp     = NULL;
         axutil_hash_t *ht_ns      = NULL;
-        axis2_qname_t *qn        = NULL;
+        axutil_qname_t *qn        = NULL;
 
         args = axis2_tokenize(env, attr_value, ':');
         ht_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
@@ -3297,7 +3297,7 @@
 
         last_list = axis2_last_token(env, attr_value, ':');
         ref_name = axutil_array_list_get(last_list, env, 1);
-        qn = axis2_qname_create(env, ref_name, namesp, NULL);
+        qn = axutil_qname_create(env, ref_name, namesp, NULL);
 
         XML_SCHEMA_ELEMENT_SET_REF_NAME(sch_ele, env, qn);
         XML_SCHEMA_ELEMENT_SET_NAME(sch_ele, env, ref_name);
@@ -3308,7 +3308,7 @@
                 om_ele, env, ele_node, "simpleType", XML_SCHEMA_NS, &sim_type_node)))
     {
         void *sim_type = NULL;
-        axis2_qname_t *qn = NULL;
+        axutil_qname_t *qn = NULL;
 
         sim_type = handle_simple_type(builder, env, sim_type_node, ele_node);
 
@@ -3356,7 +3356,7 @@
             axis2_char_t *args0      = NULL;
             axis2_char_t *namesp     = NULL;
             axutil_hash_t *ht_ns      = NULL;
-            axis2_qname_t *qn        = NULL;
+            axutil_qname_t *qn        = NULL;
 
             args = axis2_tokenize(env, attr_val, ':');
             ht_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
@@ -3381,7 +3381,7 @@
 
             last_list = axis2_last_token(env, attr_val, ':');
             ref_name = axutil_array_list_get(last_list, env, 1);
-            qn = axis2_qname_create(env, ref_name, namesp, NULL);
+            qn = axutil_qname_create(env, ref_name, namesp, NULL);
 
             XML_SCHEMA_IDENTITY_CONSTRAINT_SET_REFER(keyref, env, qn);
         }
@@ -3553,7 +3553,7 @@
         axutil_array_list_t *last_list = NULL;
         axis2_char_t *ns = NULL;
         axis2_char_t *name = NULL;
-        axis2_qname_t *qname = NULL;
+        axutil_qname_t *qname = NULL;
 
         ns_from_ele = axis2_tokenize(env, attr_value, ':');
         /** check this */
@@ -3579,7 +3579,7 @@
 
         XML_SCHEMA_IDENTITY_CONSTRAINT_SET_NAME(constraint, env, name);
 
-        qname = axis2_qname_create(env, name, ns, NULL);
+        qname = axutil_qname_create(env, name, ns, NULL);
 
         XML_SCHEMA_IDENTITY_CONSTRAINT_SET_REFER(constraint, env, qname);
     }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c Fri Mar 30 12:24:00 2007
@@ -104,27 +104,27 @@
 xml_schema_collection_get_element_by_qname(
     xml_schema_collection_t* collection,
     const axutil_env_t *env,
-    axis2_qname_t *qname);
+    axutil_qname_t *qname);
 
 xml_schema_type_t * AXIS2_CALL
 xml_schema_collection_get_type_by_qname(
     xml_schema_collection_t* collection,
     const axutil_env_t *env,
-    axis2_qname_t *schema_type_qname);
+    axutil_qname_t *schema_type_qname);
 
 
 axis2_status_t AXIS2_CALL
 xml_schema_collection_add_unresolved_type(
     xml_schema_collection_t* collection,
     const axutil_env_t *env,
-    axis2_qname_t *qtype,
+    axutil_qname_t *qtype,
     void *receiver);
 
 axis2_status_t AXIS2_CALL
 xml_schema_collection_resolve_type(
     xml_schema_collection_t* collection,
     const axutil_env_t *env,
-    axis2_qname_t *type_qname,
+    axutil_qname_t *type_qname,
     xml_schema_type_t *type);
 
 axis2_char_t * AXIS2_CALL
@@ -555,7 +555,7 @@
 xml_schema_collection_get_element_by_qname(
     xml_schema_collection_t* collection,
     const axutil_env_t *env,
-    axis2_qname_t *qname)
+    axutil_qname_t *qname)
 {
     axis2_char_t *uri = NULL;
     xml_schema_t *schema = NULL;
@@ -564,7 +564,7 @@
 
     collec_impl = AXIS2_INTF_TO_IMPL(collection);
 
-    uri = axis2_qname_get_uri(qname, env);
+    uri = axutil_qname_get_uri(qname, env);
 
     if (collec_impl->namespaces)
         schema = axutil_hash_get(collec_impl->namespaces, uri, AXIS2_HASH_KEY_STRING);
@@ -579,7 +579,7 @@
 xml_schema_collection_get_type_by_qname(
     xml_schema_collection_t* collection,
     const axutil_env_t *env,
-    axis2_qname_t *schema_type_qname)
+    axutil_qname_t *schema_type_qname)
 {
 
     xml_schema_collection_impl_t *collecion_impl = NULL;
@@ -591,7 +591,7 @@
     AXIS2_PARAM_CHECK(env->error, schema_type_qname, NULL);
     collecion_impl = AXIS2_INTF_TO_IMPL(collection);
 
-    uri = axis2_qname_get_uri(schema_type_qname, env);
+    uri = axutil_qname_get_uri(schema_type_qname, env);
 
     if (collecion_impl->namespaces && NULL != uri)
         schema = axutil_hash_get(collecion_impl->namespaces, uri, AXIS2_HASH_KEY_STRING);
@@ -606,7 +606,7 @@
 xml_schema_collection_add_unresolved_type(
     xml_schema_collection_t* collection,
     const axutil_env_t *env,
-    axis2_qname_t *qtype,
+    axutil_qname_t *qtype,
     void *obj)
 {
     xml_schema_collection_impl_t *collection_impl = NULL;
@@ -618,7 +618,7 @@
     AXIS2_PARAM_CHECK(env->error, obj, AXIS2_FAILURE);
     collection_impl = AXIS2_INTF_TO_IMPL(collection);
 
-    qn_string = axis2_qname_to_string(qtype, env);
+    qn_string = axutil_qname_to_string(qtype, env);
     if (collection_impl->unresolved_types &&
             qn_string)
     {
@@ -642,7 +642,7 @@
 xml_schema_collection_resolve_type(
     xml_schema_collection_t* collection,
     const axutil_env_t *env,
-    axis2_qname_t *type_qname,
+    axutil_qname_t *type_qname,
     xml_schema_type_t *type)
 {
     xml_schema_collection_impl_t *collection_impl = NULL;
@@ -652,7 +652,7 @@
     AXIS2_PARAM_CHECK(env->error, type, AXIS2_FAILURE);
 
     collection_impl = AXIS2_INTF_TO_IMPL(collection);
-    qn_string = axis2_qname_to_string(type_qname, env);
+    qn_string = axutil_qname_to_string(type_qname, env);
     if (qn_string && NULL != collection_impl->unresolved_types)
     {
         receivers = axutil_hash_get(collection_impl->unresolved_types,

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c Fri Mar 30 12:24:00 2007
@@ -35,7 +35,7 @@
 
     xml_schema_any_attribute_t *any_attribute;
 
-    axis2_qname_t *base_type_name;
+    axutil_qname_t *base_type_name;
 
     xml_schema_particle_t *particle;
 
@@ -87,9 +87,9 @@
 xml_schema_complex_content_extension_set_base_type_name(
     void *cmp_cnt_ext,
     const axutil_env_t *env,
-    axis2_qname_t *base_type_name);
+    axutil_qname_t *base_type_name);
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_complex_content_extension_get_base_type_name(
     void *cmp_cnt_ext,
     const axutil_env_t *env);
@@ -233,7 +233,7 @@
     }
     if (content_ext_impl->base_type_name)
     {
-        axis2_qname_free(content_ext_impl->base_type_name, env);
+        axutil_qname_free(content_ext_impl->base_type_name, env);
         content_ext_impl->base_type_name = NULL;
     }
     if (content_ext_impl->annotated)
@@ -307,7 +307,7 @@
     return cnt_ext_impl->attributes;
 }
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_complex_content_extension_get_base_type_name(
     void *cmp_cnt_ext,
     const axutil_env_t *env)
@@ -322,14 +322,14 @@
 xml_schema_complex_content_extension_set_base_type_name(
     void *cmp_cnt_ext,
     const axutil_env_t *env,
-    axis2_qname_t *base_type_name)
+    axutil_qname_t *base_type_name)
 {
     xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     content_ext_impl = AXIS2_INTF_TO_IMPL(cmp_cnt_ext);
     if (content_ext_impl->base_type_name)
     {
-        axis2_qname_free(content_ext_impl->base_type_name, env);
+        axutil_qname_free(content_ext_impl->base_type_name, env);
         content_ext_impl->base_type_name = NULL;
     }
     content_ext_impl->base_type_name = base_type_name;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c Fri Mar 30 12:24:00 2007
@@ -35,7 +35,7 @@
 
     xml_schema_any_attribute_t *any_attribute;
 
-    axis2_qname_t *base_type_name;
+    axutil_qname_t *base_type_name;
 
     xml_schema_particle_t *particle;
 
@@ -87,9 +87,9 @@
 xml_schema_complex_content_restriction_set_base_type_name(
     void *cmp_content_res,
     const axutil_env_t *env,
-    axis2_qname_t *base_type_name);
+    axutil_qname_t *base_type_name);
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_complex_content_restriction_get_base_type_name(
     void *cmp_content_res,
     const axutil_env_t *env);
@@ -248,7 +248,7 @@
 
     if (content_res_impl->base_type_name)
     {
-        axis2_qname_free(content_res_impl->base_type_name, env);
+        axutil_qname_free(content_res_impl->base_type_name, env);
         content_res_impl->base_type_name = NULL;
     }
 
@@ -328,7 +328,7 @@
     return cnt_res_impl->attributes;
 }
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_complex_content_restriction_get_base_type_name(
     void *cmp_content,
     const axutil_env_t *env)
@@ -343,14 +343,14 @@
 xml_schema_complex_content_restriction_set_base_type_name(
     void *cmp_content,
     const axutil_env_t *env,
-    axis2_qname_t *base_type_name)
+    axutil_qname_t *base_type_name)
 {
     xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     content_res_impl = AXIS2_INTF_TO_IMPL(cmp_content);
     if (content_res_impl->base_type_name)
     {
-        axis2_qname_free(content_res_impl->base_type_name, env);
+        axutil_qname_free(content_res_impl->base_type_name, env);
         content_res_impl->base_type_name = NULL;
     }
     content_res_impl->base_type_name = base_type_name;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c Fri Mar 30 12:24:00 2007
@@ -20,7 +20,7 @@
 #include <xml_schema_complex_type.h>
 #include <xml_schema_data_type.h>
 #include <xml_schema_derivation_method.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 typedef struct xml_schema_complex_type_impl
             xml_schema_complex_type_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
 #include <xml_schema_content_type.h>
 #include <axis2_utils.h>
 
-#include <axis2_string.h>
+#include <axutil_string.h>
 
 typedef struct xml_schema_content_type_impl
             xml_schema_content_type_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c Fri Mar 30 12:24:00 2007
@@ -86,9 +86,9 @@
 
     axis2_char_t *name;
 
-    axis2_qname_t *qualified_qname;
+    axutil_qname_t *qualified_qname;
 
-    axis2_qname_t *ref_qname;
+    axutil_qname_t *ref_qname;
 
     /**
      * Returns the type of the element.
@@ -100,12 +100,12 @@
      * QName of a built-in data type defined in this schema or another
      * schema indicated by the specified namespace.
      */
-    axis2_qname_t *schema_type_qname;
+    axutil_qname_t *schema_type_qname;
 
     /**
      * QName of an element that can be a substitute for this element.
      */
-    axis2_qname_t *substitution_group;
+    axutil_qname_t *substitution_group;
 
     axutil_hash_t *ht_super;
 
@@ -241,7 +241,7 @@
     const axutil_env_t *env,
     axis2_char_t *name);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_element_get_ref_qname(
     void *element,
     const axutil_env_t *env);
@@ -250,9 +250,9 @@
 xml_schema_element_set_ref_qname(
     void *element,
     const axutil_env_t *env,
-    axis2_qname_t *ref_qname);
+    axutil_qname_t *ref_qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_element_get_qname(
     void *element,
     const axutil_env_t *env);
@@ -261,7 +261,7 @@
 xml_schema_element_set_qname(
     void *element,
     const axutil_env_t *env,
-    axis2_qname_t *qualified_name);
+    axutil_qname_t *qualified_name);
 
 xml_schema_type_t *AXIS2_CALL
 xml_schema_element_get_schema_type(
@@ -274,7 +274,7 @@
     const axutil_env_t *env,
     void *schema_type);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_element_get_schema_type_qname(
     void *element,
     const axutil_env_t *env);
@@ -283,9 +283,9 @@
 xml_schema_element_set_schema_type_qname(
     void *element,
     const axutil_env_t *env,
-    axis2_qname_t *schema_type_qname);
+    axutil_qname_t *schema_type_qname);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_element_get_substitution_group(
     void *element,
     const axutil_env_t *env);
@@ -294,7 +294,7 @@
 xml_schema_element_set_substitution_group(
     void *element,
     const axutil_env_t *env,
-    axis2_qname_t *substitution_group);
+    axutil_qname_t *substitution_group);
 
 axis2_char_t *AXIS2_CALL
 xml_schema_element_to_string(
@@ -776,7 +776,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_element_get_ref_qname(
     void *element,
     const axutil_env_t *env)
@@ -788,21 +788,21 @@
 xml_schema_element_set_ref_qname(
     void *element,
     const axutil_env_t *env,
-    axis2_qname_t *ref_qname)
+    axutil_qname_t *ref_qname)
 {
     xml_schema_element_impl_t *element_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     element_impl = AXIS2_INTF_TO_IMPL(element);
     if (element_impl->ref_qname)
     {
-        axis2_qname_free(element_impl->ref_qname, env);
+        axutil_qname_free(element_impl->ref_qname, env);
         element_impl->ref_qname = NULL;
     }
     element_impl->ref_qname = ref_qname;
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_element_get_qname(
     void *element,
     const axutil_env_t *env)
@@ -814,14 +814,14 @@
 xml_schema_element_set_qname(
     void *element,
     const axutil_env_t *env,
-    axis2_qname_t *qualified_name)
+    axutil_qname_t *qualified_name)
 {
     xml_schema_element_impl_t *element_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     element_impl = AXIS2_INTF_TO_IMPL(element);
     if (element_impl->qualified_qname)
     {
-        axis2_qname_free(element_impl->qualified_qname, env);
+        axutil_qname_free(element_impl->qualified_qname, env);
         element_impl->qualified_qname = NULL;
     }
     element_impl->qualified_qname = qualified_name;
@@ -855,7 +855,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_element_get_schema_type_qname(
     void *element,
     const axutil_env_t *env)
@@ -867,7 +867,7 @@
 xml_schema_element_set_schema_type_qname(
     void *element,
     const axutil_env_t *env,
-    axis2_qname_t *schema_type_qname)
+    axutil_qname_t *schema_type_qname)
 {
     xml_schema_element_impl_t *element_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -880,7 +880,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_element_get_substitution_group(
     void *element,
     const axutil_env_t *env)
@@ -892,7 +892,7 @@
 xml_schema_element_set_substitution_group(
     void *element,
     const axutil_env_t *env,
-    axis2_qname_t *substitution_group)
+    axutil_qname_t *substitution_group)
 {
     xml_schema_element_impl_t *element_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c Fri Mar 30 12:24:00 2007
@@ -36,7 +36,7 @@
 
     axutil_hash_t *ht_super;
 
-    axis2_qname_t *ref_qname;
+    axutil_qname_t *ref_qname;
 
     void *particle;
 };
@@ -64,7 +64,7 @@
     void *group_ref,
     const axutil_env_t *env);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_group_ref_get_ref_qname(
     void *group_ref,
     const axutil_env_t *env);
@@ -73,7 +73,7 @@
 xml_schema_group_ref_set_ref_qname(
     void *group_ref,
     const axutil_env_t *env,
-    axis2_qname_t *ref_qname);
+    axutil_qname_t *ref_qname);
 
 void *AXIS2_CALL
 xml_schema_group_ref_get_particle(
@@ -261,7 +261,7 @@
     return group_ref_impl->base;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_group_ref_get_ref_qname(void *group_ref,
         const axutil_env_t *env)
 {
@@ -271,15 +271,15 @@
 axis2_status_t AXIS2_CALL
 xml_schema_group_ref_set_ref_qname(void *group_ref,
         const axutil_env_t *env,
-        axis2_qname_t *ref_qname)
+        axutil_qname_t *ref_qname)
 {
     xml_schema_group_ref_impl_t *group_ref_impl = NULL;
     if (group_ref_impl->ref_qname)
     {
-        axis2_qname_free(group_ref_impl->ref_qname, env);
+        axutil_qname_free(group_ref_impl->ref_qname, env);
         group_ref_impl->ref_qname = NULL;
     }
-    group_ref_impl->ref_qname = axis2_qname_clone(ref_qname, env);
+    group_ref_impl->ref_qname = axutil_qname_clone(ref_qname, env);
     if (!group_ref_impl->ref_qname)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c Fri Mar 30 12:24:00 2007
@@ -35,7 +35,7 @@
     xml_schema_xpath_t *selector;
 
     /** keyref field */
-    axis2_qname_t *refer;
+    axutil_qname_t *refer;
 
     axutil_hash_t *ht_super;
     xml_schema_types_t obj_type;
@@ -61,14 +61,14 @@
 axutil_hash_t* AXIS2_CALL
 xml_schema_identity_constraint_super_objs(void *id_constr,
         const axutil_env_t *env);
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_identity_constraint_get_refer(void *id_constr,
         const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_identity_constraint_set_refer(void *id_constr,
         const axutil_env_t *env,
-        axis2_qname_t *refer);
+        axutil_qname_t *refer);
 
 xml_schema_obj_collection_t *AXIS2_CALL
 xml_schema_identity_constraint_get_fields(void *id_constr,
@@ -245,7 +245,7 @@
     }
     if (id_cns_impl->refer)
     {
-        axis2_qname_free(id_cns_impl->refer, env);
+        axutil_qname_free(id_cns_impl->refer, env);
         id_cns_impl->refer = NULL;
     }
     if (id_cns_impl->annotated)
@@ -404,7 +404,7 @@
 {
     return AXIS2_INTF_TO_IMPL(id_constr)->ht_super;
 }
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_identity_constraint_get_refer(void *id_constr,
         const axutil_env_t *env)
 {
@@ -414,7 +414,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_identity_constraint_set_refer(void *id_constr,
         const axutil_env_t *env,
-        axis2_qname_t *refer)
+        axutil_qname_t *refer)
 {
     xml_schema_identity_constraint_impl_t *id_cns_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -423,7 +423,7 @@
     if (id_cns_impl->refer)
     {
         /*
-        axis2_qname_free(id_cns_impl->reref, env);
+        axutil_qname_free(id_cns_impl->reref, env);
         id_cns_impl->reref = NULL;
         */
     }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c Fri Mar 30 12:24:00 2007
@@ -51,7 +51,7 @@
 void *AXIS2_CALL
 xml_schema_obj_table_get_item(xml_schema_obj_table_t *obj_table,
         const axutil_env_t *env,
-        const axis2_qname_t *qname);
+        const axutil_qname_t *qname);
 
 axutil_array_list_t *AXIS2_CALL
 xml_schema_obj_table_get_names(xml_schema_obj_table_t *obj_table,
@@ -64,12 +64,12 @@
 axis2_bool_t AXIS2_CALL
 xml_schema_obj_table_contains(xml_schema_obj_table_t *obj_table,
         const axutil_env_t *env,
-        axis2_qname_t *qname);
+        axutil_qname_t *qname);
 
 axis2_status_t AXIS2_CALL
 xml_schema_obj_table_add(xml_schema_obj_table_t *obj_table,
         const axutil_env_t *env,
-        axis2_qname_t *qname,
+        axutil_qname_t *qname,
         void *value);
 
 axis2_status_t AXIS2_CALL
@@ -204,7 +204,7 @@
 void *AXIS2_CALL
 xml_schema_obj_table_get_item(xml_schema_obj_table_t *obj_table,
         const axutil_env_t *env,
-        const axis2_qname_t *qname)
+        const axutil_qname_t *qname)
 {
     xml_schema_obj_table_impl_t *obj_table_impl = NULL;
     axis2_char_t *name = NULL;
@@ -214,7 +214,7 @@
 
     obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
 
-    name = axis2_qname_to_string((axis2_qname_t *)qname, env);
+    name = axutil_qname_to_string((axutil_qname_t *)qname, env);
     if (name)
     {
         return axutil_hash_get(obj_table_impl->collection, name,
@@ -250,10 +250,10 @@
             hi = axutil_hash_next(env, hi))
     {
         const void *val = NULL;
-        axis2_qname_t *qname = NULL;
+        axutil_qname_t *qname = NULL;
         /*axutil_hash_this (hi, NULL, NULL, &val);*/
         axutil_hash_this(hi, &val, NULL, NULL);
-        qname = axis2_qname_create_from_string(env, val);
+        qname = axutil_qname_create_from_string(env, val);
         axutil_array_list_add(obj_table_impl->names, env, qname);
         val = NULL;
     }
@@ -296,7 +296,7 @@
 axis2_bool_t AXIS2_CALL
 xml_schema_obj_table_contains(xml_schema_obj_table_t *obj_table,
         const axutil_env_t *env,
-        axis2_qname_t *qname)
+        axutil_qname_t *qname)
 {
     xml_schema_obj_table_impl_t *obj_table_impl = NULL;
     void *value = NULL;
@@ -305,7 +305,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
     obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
-    name = axis2_qname_to_string(qname, env);
+    name = axutil_qname_to_string(qname, env);
     if (name)
     {
         value = axutil_hash_get(obj_table_impl->collection, name,
@@ -320,7 +320,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_obj_table_add(xml_schema_obj_table_t *obj_table,
         const axutil_env_t *env,
-        axis2_qname_t *qname,
+        axutil_qname_t *qname,
         void *value)
 {
     xml_schema_obj_table_impl_t *obj_table_impl = NULL;
@@ -330,7 +330,7 @@
     AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
     obj_table_impl = AXIS2_INTF_TO_IMPL(obj_table);
-    name = axis2_qname_to_string(qname, env);
+    name = axutil_qname_to_string(qname, env);
     if (name)
     {
         axutil_hash_set(obj_table_impl->collection,

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c Fri Mar 30 12:24:00 2007
@@ -34,7 +34,7 @@
 
     xml_schema_any_attribute_t *any_attribute;
 
-    axis2_qname_t *base_type_name;
+    axutil_qname_t *base_type_name;
 
     xml_schema_types_t obj_type;
 
@@ -86,10 +86,10 @@
 xml_schema_simple_content_extension_set_base_type_name(
     void *sim_content_ext,
     const axutil_env_t *env,
-    axis2_qname_t *base_type_name);
+    axutil_qname_t *base_type_name);
 
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_simple_content_extension_get_base_type_name(
     void *sim_content_ext,
     const axutil_env_t *env);
@@ -214,7 +214,7 @@
     }
     if (content_ext_impl->base_type_name)
     {
-        axis2_qname_free(content_ext_impl->base_type_name, env);
+        axutil_qname_free(content_ext_impl->base_type_name, env);
         content_ext_impl->base_type_name = NULL;
     }
     if (content_ext_impl->annotated)
@@ -292,7 +292,7 @@
     return cnt_ext_impl->attributes;
 }
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_simple_content_extension_get_base_type_name(
     void *sim_content,
     const axutil_env_t *env)
@@ -307,14 +307,14 @@
 xml_schema_simple_content_extension_set_base_type_name(
     void *sim_content,
     const axutil_env_t *env,
-    axis2_qname_t *base_type_name)
+    axutil_qname_t *base_type_name)
 {
     xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content);
     if (content_ext_impl->base_type_name)
     {
-        axis2_qname_free(content_ext_impl->base_type_name, env);
+        axutil_qname_free(content_ext_impl->base_type_name, env);
         content_ext_impl->base_type_name = NULL;
     }
     content_ext_impl->base_type_name = base_type_name;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c Fri Mar 30 12:24:00 2007
@@ -37,7 +37,7 @@
 
     xml_schema_any_attribute_t *any_attribute;
 
-    axis2_qname_t *base_type_name;
+    axutil_qname_t *base_type_name;
 
     xml_schema_simple_type_t *base_type;
 
@@ -102,10 +102,10 @@
 xml_schema_simple_content_restriction_set_base_type_name(
     void *sim_content_res,
     const axutil_env_t *env,
-    axis2_qname_t *base_type_name);
+    axutil_qname_t *base_type_name);
 
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_simple_content_restriction_get_base_type_name(
     void *sim_content_res,
     const axutil_env_t *env);
@@ -273,7 +273,7 @@
     }
     if (content_res_impl->base_type_name)
     {
-        axis2_qname_free(content_res_impl->base_type_name, env);
+        axutil_qname_free(content_res_impl->base_type_name, env);
         content_res_impl->base_type_name = NULL;
     }
     if (content_res_impl->annotated)
@@ -346,7 +346,7 @@
     return cnt_res_impl->attributes;
 }
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_simple_content_restriction_get_base_type_name(
     void *sim_content,
     const axutil_env_t *env)
@@ -361,14 +361,14 @@
 xml_schema_simple_content_restriction_set_base_type_name(
     void *sim_content,
     const axutil_env_t *env,
-    axis2_qname_t *base_type_name)
+    axutil_qname_t *base_type_name)
 {
     xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     content_res_impl = AXIS2_INTF_TO_IMPL(sim_content);
     if (content_res_impl->base_type_name)
     {
-        axis2_qname_free(content_res_impl->base_type_name, env);
+        axutil_qname_free(content_res_impl->base_type_name, env);
         content_res_impl->base_type_name = NULL;
     }
     content_res_impl->base_type_name = base_type_name;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c Fri Mar 30 12:24:00 2007
@@ -21,7 +21,7 @@
 #include <xml_schema_data_type.h>
 #include <xml_schema_derivation_method.h>
 
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 typedef struct xml_schema_simple_type_impl
             xml_schema_simple_type_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c Fri Mar 30 12:24:00 2007
@@ -37,7 +37,7 @@
 
     xml_schema_simple_type_t *item_type;
 
-    axis2_qname_t *item_type_name;
+    axutil_qname_t *item_type_name;
 
 };
 
@@ -71,14 +71,14 @@
         const axutil_env_t *env,
         xml_schema_simple_type_t *base_type);
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_simple_type_list_get_item_type_name(void *simple_type_list,
         const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_list_set_item_type_name(void *simple_type_list,
         const axutil_env_t *env,
-        axis2_qname_t *base_type_name);
+        axutil_qname_t *base_type_name);
 
 /*************** function prototypes *****************************************/
 
@@ -312,7 +312,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_simple_type_list_get_item_type_name(void *simple_type_list,
         const axutil_env_t *env)
 {
@@ -323,7 +323,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_list_set_item_type_name(void *simple_type_list,
         const axutil_env_t *env,
-        axis2_qname_t *item_type_name)
+        axutil_qname_t *item_type_name)
 {
     xml_schema_simple_type_list_impl_t *sim_type_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -332,7 +332,7 @@
     sim_type_res_impl = AXIS2_INTF_TO_IMPL(simple_type_list);
     if (sim_type_res_impl->item_type_name)
     {
-        axis2_qname_free(sim_type_res_impl->item_type_name, env);
+        axutil_qname_free(sim_type_res_impl->item_type_name, env);
         sim_type_res_impl->item_type_name = NULL;
     }
     sim_type_res_impl->item_type_name = item_type_name;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c Fri Mar 30 12:24:00 2007
@@ -38,7 +38,7 @@
 
     xml_schema_simple_type_t *base_type;
 
-    axis2_qname_t *base_type_name;
+    axutil_qname_t *base_type_name;
 
     xml_schema_obj_collection_t *facets;
 };
@@ -74,14 +74,14 @@
         const axutil_env_t *env,
         xml_schema_simple_type_t *base_type);
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_simple_type_restriction_get_base_type_name(void *simple_type_restriction,
         const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_restriction_set_base_type_name(void *simple_type_restriction,
         const axutil_env_t *env,
-        axis2_qname_t *base_type_name);
+        axutil_qname_t *base_type_name);
 
 xml_schema_obj_collection_t* AXIS2_CALL
 xml_schema_simple_type_restriction_get_facets(void *simple_type_restriction,
@@ -334,7 +334,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t* AXIS2_CALL
+axutil_qname_t* AXIS2_CALL
 xml_schema_simple_type_restriction_get_base_type_name(void *simple_type_restriction,
         const axutil_env_t *env)
 {
@@ -345,7 +345,7 @@
 axis2_status_t AXIS2_CALL
 xml_schema_simple_type_restriction_set_base_type_name(void *simple_type_restriction,
         const axutil_env_t *env,
-        axis2_qname_t *base_type_name)
+        axutil_qname_t *base_type_name)
 {
     xml_schema_simple_type_restriction_impl_t *sim_type_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -354,7 +354,7 @@
     sim_type_res_impl = AXIS2_INTF_TO_IMPL(simple_type_restriction);
     if (sim_type_res_impl->base_type_name)
     {
-        axis2_qname_free(sim_type_res_impl->base_type_name, env);
+        axutil_qname_free(sim_type_res_impl->base_type_name, env);
         sim_type_res_impl->base_type_name = NULL;
     }
     sim_type_res_impl->base_type_name = base_type_name;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c Fri Mar 30 12:24:00 2007
@@ -21,7 +21,7 @@
 #include <xml_schema_data_type.h>
 #include <xml_schema_derivation_method.h>
 #include <xml_schema.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
 
 typedef struct xml_schema_type_impl
             xml_schema_type_impl_t;
@@ -53,7 +53,7 @@
 
     xml_schema_t *schema;
 
-    axis2_qname_t *qname;
+    axutil_qname_t *qname;
 
     axutil_hash_t *ht_super;
 
@@ -124,7 +124,7 @@
         const axutil_env_t *env,
         axis2_char_t *name);
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_type_get_qname(void *type,
         const axutil_env_t *env);
 
@@ -259,7 +259,7 @@
     type_impl = AXIS2_INTF_TO_IMPL(type);
     if (type_impl->qname)
     {
-        axis2_qname_free(type_impl->qname, env);
+        axutil_qname_free(type_impl->qname, env);
         type_impl->qname = NULL;
 
     }
@@ -560,7 +560,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_qname_t *AXIS2_CALL
+axutil_qname_t *AXIS2_CALL
 xml_schema_type_get_qname(void *type,
         const axutil_env_t *env)
 {
@@ -592,7 +592,7 @@
             XML_SCHEMA_GET_TARGET_NAMESPACE(type_impl->schema, env);
     }
 
-    type_impl->qname = axis2_qname_create(env, type_impl->name, target_ns, NULL);
+    type_impl->qname = axutil_qname_create(env, type_impl->name, target_ns, NULL);
     return type_impl->qname;
 }
 

Modified: webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c (original)
+++ webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Fri Mar 30 12:24:00 2007
@@ -117,7 +117,7 @@
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
-    axis2_qname_t *qn = NULL;
+    axutil_qname_t *qn = NULL;
     void *ele = NULL;
     void *sch_type = NULL;
     void *particle = NULL;
@@ -135,7 +135,7 @@
     schema = XML_SCHEMA_COLLECTION_READ_DOCUMENT(
                 sch_collection, env, om_doc);
 
-    qn = axis2_qname_create(env, "AnyAttContainer",
+    qn = axutil_qname_create(env, "AnyAttContainer",
             "http://unqualified-elements.example.com", NULL);
 
     ele = XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, qn);
@@ -165,7 +165,7 @@
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
-    axis2_qname_t *qn = NULL;
+    axutil_qname_t *qn = NULL;
     void *ele = NULL;
     void *block = NULL;
     void *value = NULL;
@@ -181,7 +181,7 @@
     schema = XML_SCHEMA_COLLECTION_READ_DOCUMENT(
                 sch_collection, env, om_doc);
 
-    qn = axis2_qname_create(env, "complexElt",
+    qn = axutil_qname_create(env, "complexElt",
             "http://soapinterop.org/xsd", NULL);
 
     ele = XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, qn);
@@ -272,7 +272,7 @@
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
-    axis2_qname_t *qn = NULL;
+    axutil_qname_t *qn = NULL;
     void *sch_ele = NULL;
 
     axis2_char_t *filename = "./..//test-resources/mixedContent.xsd";
@@ -280,7 +280,7 @@
 
     env = axutil_env_create_all("test.log", 1);
 
-    qn = axis2_qname_create(env, "complexElt",
+    qn = axutil_qname_create(env, "complexElt",
             "http://soapinterop.org/xsd", NULL);
 
     om_doc = get_document_from_filename(env, filename);
@@ -304,17 +304,17 @@
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
-    axis2_qname_t *qn = NULL;
+    axutil_qname_t *qn = NULL;
     void *ele = NULL;
     void *cmp_type = NULL;
     void *seq = NULL;
     xml_schema_obj_collection_t *items = NULL;
     void *sub_element1 = NULL;
-    axis2_qname_t *qn1 = NULL;
+    axutil_qname_t *qn1 = NULL;
     axis2_char_t *uri1 = NULL;
 
     void *sub_element2 = NULL;
-    axis2_qname_t *qn2 = NULL;
+    axutil_qname_t *qn2 = NULL;
     axis2_char_t *uri2 = NULL;
 
 
@@ -329,7 +329,7 @@
     schema = XML_SCHEMA_COLLECTION_READ_DOCUMENT(
                 sch_collection, env, om_doc);
 
-    qn = axis2_qname_create(env, "unQualifiedLocals",
+    qn = axutil_qname_create(env, "unQualifiedLocals",
             "http://unqualified-elements.example.com", NULL);
 
     ele = XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, qn);
@@ -356,7 +356,7 @@
 
     CuAssertPtrNotNull(tc, qn1);
 
-    uri1 = axis2_qname_get_uri(qn1, env);
+    uri1 = axutil_qname_get_uri(qn1, env);
 
     CuAssertPtrNotNull(tc, uri1);
 
@@ -368,7 +368,7 @@
 
     CuAssertPtrNotNull(tc, qn2);
 
-    uri2 = axis2_qname_get_uri(qn2, env);
+    uri2 = axutil_qname_get_uri(qn2, env);
 
     CuAssertPtrNotNull(tc, uri2);
 
@@ -381,7 +381,7 @@
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
-    axis2_qname_t *qn = NULL;
+    axutil_qname_t *qn = NULL;
     axis2_char_t *filename = NULL;
     void *element = NULL;
     void *cmp_type = NULL;
@@ -402,7 +402,7 @@
 
     CuAssertPtrNotNull(tc, schema);
 
-    qn = axis2_qname_create(env, "attTests" , "http://soapinterop.org/types", NULL);
+    qn = axutil_qname_create(env, "attTests" , "http://soapinterop.org/types", NULL);
 
     element = XML_SCHEMA_COLLECTION_GET_ELEMENT_BY_QNAME(
                 sch_collection, env, qn);
@@ -423,7 +423,7 @@
 
     for (i = 0; i < count; i++)
     {
-        axis2_qname_t *name = NULL;
+        axutil_qname_t *name = NULL;
         void *inner_ele = NULL;
         inner_ele = XML_SCHEMA_OBJ_COLLECTION_GET_ITEM(items, env, i);
         CuAssertPtrNotNull(tc, inner_ele);
@@ -441,7 +441,7 @@
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
-    axis2_qname_t *qn = NULL;
+    axutil_qname_t *qn = NULL;
     axis2_char_t *filename = NULL;
     void *element = NULL;
     void *sch_type = NULL;
@@ -461,7 +461,7 @@
 
     CuAssertPtrNotNull(tc, schema);
 
-    qn = axis2_qname_create(env, "attrTest",
+    qn = axutil_qname_create(env, "attrTest",
             "http://soapinterop.org/types", NULL);
 
     element = XML_SCHEMA_COLLECTION_GET_ELEMENT_BY_QNAME(
@@ -537,8 +537,8 @@
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
-    axis2_qname_t *type_qname = NULL;
-    axis2_qname_t *element_qname = NULL;
+    axutil_qname_t *type_qname = NULL;
+    axutil_qname_t *element_qname = NULL;
     void *element = NULL;
     void *simple_type = NULL;
 
@@ -556,14 +556,14 @@
 
     CuAssertPtrNotNull(tc, schema);
 
-    type_qname = axis2_qname_create(env, "layoutComponentType",
+    type_qname = axutil_qname_create(env, "layoutComponentType",
             "http://soapinterop.org/types", NULL);
 
     simple_type = XML_SCHEMA_GET_TYPE_BY_QNAME(schema, env, type_qname);
 
     CuAssertPtrNotNull(tc, simple_type);
 
-    element_qname = axis2_qname_create(env, "foo",
+    element_qname = axutil_qname_create(env, "foo",
             "http://soapinterop.org/types", NULL);
 
     element = XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, element_qname);
@@ -577,7 +577,7 @@
     axiom_document_t *om_doc = NULL;
     xml_schema_collection_t *sch_collection = NULL;
     xml_schema_t *schema = NULL;
-    axis2_qname_t *element_qname = NULL;
+    axutil_qname_t *element_qname = NULL;
 
     void *element = NULL;
 
@@ -605,7 +605,7 @@
 
     CuAssertPtrNotNull(tc, schema);
 
-    element_qname = axis2_qname_create(env, "complexElt",
+    element_qname = axutil_qname_create(env, "complexElt",
             "http://soapinterop.org/xsd", NULL);
 
     element = XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, element_qname);



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


Mime
View raw message