axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r524255 [6/6] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/ axiom/src/parser/libxml2/ axiom/src/util/ guththila/include/ include/ modules/core/clientapi/ modules/core/contex...
Date Fri, 30 Mar 2007 19:54:23 GMT
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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -350,7 +350,7 @@
             WODEN_WSDL10_ATTR_REF);
     if (ref)
     {
-        axis2_uri_t *uri = axis2_uri_parse_string(env, ref);
+        axutil_uri_t *uri = axutil_uri_parse_string(env, ref);
 
         soap_mod = woden_wsdl10_soap_module_to_soap_module_element(soap_mod, env);
         WODEN_WSDL10_SOAP_MODULE_ELEMENT_SET_REF(soap_mod, env, uri);
@@ -369,18 +369,18 @@
     if (AXIS2_TRUE == axutil_qname_equals(element_type, env, element_type_l))
     {
         axis2_char_t *action_str = NULL;
-        axis2_uri_t *soap_action = NULL;
+        axutil_uri_t *soap_action = NULL;
         void *binding_op_exts = NULL;
 
         action_str = axiom_element_get_attribute_value_by_name(el, env,
                 WODEN_WSDL10_ATTR_ACTION);
-        soap_action = axis2_uri_parse_string(env, action_str);
+        soap_action = axutil_uri_parse_string(env, action_str);
         binding_op_exts = woden_wsdl10_soap_binding_op_exts_create(env);
         WODEN_WSDL10_SOAP_BINDING_OP_EXTS_SET_SOAP_ACTION(binding_op_exts,
                 env, soap_action);
         if( soap_action != NULL)
         {
-            axis2_uri_free(soap_action, env);
+            axutil_uri_free(soap_action, env);
         }
 
 
@@ -395,16 +395,16 @@
     if (AXIS2_TRUE == axutil_qname_equals(element_type, env, element_type_l))
     {
         axis2_char_t *address_str = NULL;
-        axis2_uri_t *soap_address = NULL;
+        axutil_uri_t *soap_address = NULL;
         void *address_exts = NULL;
 
         address_str = axiom_element_get_attribute_value_by_name(el, env,
                 WODEN_WSDL10_ATTR_LOCATION);
-        soap_address = axis2_uri_parse_string(env, address_str);
+        soap_address = axutil_uri_parse_string(env, address_str);
         address_exts = woden_wsdl10_soap_address_exts_create(env);
         WODEN_WSDL10_SOAP_ADDRESS_EXTS_SET_SOAP_ADDRESS(address_exts,
                 env, soap_address);
-        axis2_uri_free(soap_address, env);
+        axutil_uri_free(soap_address, env);
 
         soap_mod = woden_wsdl10_soap_module_to_soap_module_element(soap_mod,
                 env);

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -36,7 +36,7 @@
 #include <woden_uri_attr.h>
 #include <woden_qname_or_token_any_attr.h>
 #include <woden_qname_list_or_token_any_attr.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
 #include <axutil_hash.h>
 
 typedef struct woden_wsdl10_ext_registry_impl woden_wsdl10_ext_registry_impl_t;
@@ -151,7 +151,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_uri_t *ext_namespc,
+    axutil_uri_t *ext_namespc,
     void *comp_ext);
 
 void *AXIS2_CALL
@@ -159,7 +159,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_uri_t *ext_namespc);
+    axutil_uri_t *ext_namespc);
 
 axutil_array_list_t *AXIS2_CALL
 woden_wsdl10_ext_registry_query_component_ext_namespaces(
@@ -610,7 +610,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_uri_t *ext_namespc,
+    axutil_uri_t *ext_namespc,
     void *comp_ext)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
@@ -628,7 +628,7 @@
         axutil_hash_set(registry_impl->comp_ext_reg, parent_class,
                 AXIS2_HASH_KEY_STRING, inner_comp_ext_reg);
     }
-    namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+    namespc = axutil_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
     axutil_hash_set(inner_comp_ext_reg, namespc, AXIS2_HASH_KEY_STRING, comp_ext);
     return AXIS2_SUCCESS;
 }
@@ -646,7 +646,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_uri_t *ext_namespc)
+    axutil_uri_t *ext_namespc)
 {
     woden_wsdl10_ext_registry_impl_t *registry_impl = NULL;
     axutil_hash_t *inner_comp_ext_reg = NULL;
@@ -658,7 +658,7 @@
 
     inner_comp_ext_reg = axutil_hash_get(registry_impl->comp_ext_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
-    namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+    namespc = axutil_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
     if (inner_comp_ext_reg)
     {
         comp_ext = axutil_hash_get(inner_comp_ext_reg, namespc,
@@ -719,7 +719,7 @@
     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;
+    axutil_uri_t *uri_ns_soap = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     registry_impl = INTF_TO_IMPL(registry);
@@ -865,7 +865,7 @@
     registry_impl->soap_binding_fault_ref_ext =
         woden_wsdl10_soap_binding_fault_ref_exts_create(env);
 
-    uri_ns_soap = axis2_uri_parse_string(env, WODEN_URI_NS_SOAP);
+    uri_ns_soap = axutil_uri_parse_string(env, WODEN_URI_NS_SOAP);
 
     woden_wsdl10_ext_registry_register_component_ext(registry, env, "binding",
             uri_ns_soap,

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -56,7 +56,7 @@
 
 #include "../wsdl20/woden_constants.h"
 #include <axutil_array_list.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
 
 typedef struct woden_wsdl10_component_model_builder_impl
 {
@@ -103,7 +103,7 @@
       void *builder,
       const axutil_env_t *env,
       void *schema_def,
-      axis2_uri_t *type_system_uri);
+      axutil_uri_t *type_system_uri);
 
 /*
  * Extract the type definitions from the given schema.
@@ -113,7 +113,7 @@
       void *builder,
       const axutil_env_t *env,
       void *schema_def,
-      axis2_uri_t *type_system_uri);
+      axutil_uri_t *type_system_uri);
 
 /* *******************************************************************************
  *  MESSAGE
@@ -232,7 +232,7 @@
       const axutil_env_t *env,
       axis2_char_t *parent_class,
       void *parent_elem,
-      axis2_uri_t *ext_ns);
+      axutil_uri_t *ext_ns);
 
 /* *******************************************************************************
  *  SERVICE
@@ -397,7 +397,7 @@
 {
       woden_wsdl10_component_model_builder_impl_t *builder_impl = NULL;
       void *types = NULL;
-      axis2_uri_t *type_system_uri = NULL;
+      axutil_uri_t *type_system_uri = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
       AXIS2_PARAM_CHECK(env->error, desc, AXIS2_FAILURE);
@@ -406,7 +406,7 @@
       desc = woden_wsdl10_desc_to_desc_element(desc, env);
       types = WODEN_WSDL10_DESC_ELEMENT_GET_TYPES_ELEMENT(desc, env);
 
-      type_system_uri = axis2_uri_parse_string(env, WODEN_TYPE_XSD_2001);
+      type_system_uri = axutil_uri_parse_string(env, WODEN_TYPE_XSD_2001);
 
       if (types)
       {
@@ -466,7 +466,7 @@
       void *builder,
       const axutil_env_t *env,
       void *schema_def,
-      axis2_uri_t *type_system_uri)
+      axutil_uri_t *type_system_uri)
 {
       woden_wsdl10_component_model_builder_impl_t *builder_impl = NULL;
       axis2_char_t *schema_tns = NULL;
@@ -523,7 +523,7 @@
       void *builder,
       const axutil_env_t *env,
       void *schema_def,
-      axis2_uri_t *type_system_uri)
+      axutil_uri_t *type_system_uri)
 {
       woden_wsdl10_component_model_builder_impl_t *builder_impl = NULL;
       axis2_char_t *schema_tns = NULL;
@@ -998,7 +998,7 @@
       woden_wsdl10_ext_registry_t *er = NULL;
       axutil_array_list_t *ext_namespcs = NULL;
       int i = 0, size = 0;
-      axis2_uri_t *binding_type = NULL;
+      axutil_uri_t *binding_type = NULL;
       axis2_char_t *binding_type_str = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1017,7 +1017,7 @@
       size = axutil_array_list_size(ext_namespcs, env);
       for (i = 0; i < size; i++)
       {
-	    axis2_uri_t *ext_ns = NULL;
+	    axutil_uri_t *ext_ns = NULL;
 	    axis2_bool_t temp1 = AXIS2_FALSE;
 	    axis2_bool_t temp2 = AXIS2_FALSE;
 	    void *wsdl_obj = NULL;
@@ -1057,18 +1057,18 @@
        * extensions can be registered in some way and interpreted here at run time.
        */
       binding_type = WODEN_BINDING_GET_TYPE(binding, env);
-      binding_type_str = axis2_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
+      binding_type_str = axutil_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
       if (0 == axis2_strcmp(WODEN_URI_NS_SOAP, binding_type_str))
       {
 	    void *sbe = NULL;
-	    axis2_uri_t *uri_ns_soap = NULL;
+	    axutil_uri_t *uri_ns_soap = NULL;
 
 	    /* If the binding type is SOAP, the {soap version} property defaults to "1.2" so if a
 	     * a SOAP Binding Extensions object has not already been created, create one now to handle
 	     * this default value.
 	     */
 	    binding = woden_binding_to_wsdl_component(binding, env);
-	    uri_ns_soap = axis2_uri_parse_string(env, WODEN_URI_NS_SOAP);
+	    uri_ns_soap = axutil_uri_parse_string(env, WODEN_URI_NS_SOAP);
 	    if (! WODEN_WSDL_COMPONENT_GET_COMPONENT_EXTS_FOR_NAMESPACE(binding,
 									      env, uri_ns_soap))
 	    {
@@ -1098,7 +1098,7 @@
       axutil_array_list_t *ext_namespcs = NULL;
       int i = 0, size = 0;
       void *parent_element = NULL;
-      axis2_uri_t *binding_type = NULL;
+      axutil_uri_t *binding_type = NULL;
       axis2_char_t *binding_type_str = NULL;
 
       AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1116,7 +1116,7 @@
        */
       for (i = 0; i < size; i++)
       {
-	    axis2_uri_t *ext_ns = NULL;
+	    axutil_uri_t *ext_ns = NULL;
 	    axis2_bool_t temp1 = AXIS2_FALSE;
 	    axis2_bool_t temp2 = AXIS2_FALSE;
 
@@ -1152,10 +1152,10 @@
       parent_element = WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(bind_op, env);
       parent_element = woden_binding_to_binding_element(parent_element, env);
       binding_type = WODEN_BINDING_ELEMENT_GET_TYPE(parent_element, env);
-      binding_type_str = axis2_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
+      binding_type_str = axutil_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
       if (0 == axis2_strcmp(WODEN_URI_NS_SOAP, binding_type_str))
       {
-	    axis2_uri_t *uri_ns_soap = axis2_uri_parse_string(env, WODEN_URI_NS_SOAP);
+	    axutil_uri_t *uri_ns_soap = axutil_uri_parse_string(env, WODEN_URI_NS_SOAP);
 	    /*
 	     * If the binding type is HTTP then the {http input serialization} and {http output serialization} 
 	     * properties have default values defined by the HTTP Binding rules in the WSDL 2.0 Part 2 Adjuncts
@@ -1203,7 +1203,7 @@
 	    size = axutil_array_list_size(ext_namespcs, env);
       for (i = 0; i < size; i++)
       {
-	    axis2_uri_t *ext_ns = NULL;
+	    axutil_uri_t *ext_ns = NULL;
 	    axis2_bool_t temp1 = AXIS2_FALSE;
 	    axis2_bool_t temp2 = AXIS2_FALSE;
 
@@ -1252,7 +1252,7 @@
 	    size = axutil_array_list_size(ext_namespcs, env);
       for (i = 0; i < size; i++)
       {
-	    axis2_uri_t *ext_ns = NULL;
+	    axutil_uri_t *ext_ns = NULL;
 	    axis2_bool_t temp1 = AXIS2_FALSE;
 	    axis2_bool_t temp2 = AXIS2_FALSE;
 
@@ -1289,7 +1289,7 @@
       const axutil_env_t *env,
       axis2_char_t *parent_class,
       void *parent_elem,
-      axis2_uri_t *ext_ns)
+      axutil_uri_t *ext_ns)
 {
       woden_wsdl10_component_model_builder_impl_t *builder_impl = NULL;
       woden_wsdl10_ext_registry_t *er = NULL;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h Fri Mar 30 12:54:08 2007
@@ -24,7 +24,7 @@
  * Constants for WSDL 1.0 elements, attributes and URIs.
  */
  
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 #ifdef __cplusplus
 extern "C" 

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -66,9 +66,9 @@
       axutil_array_list_t *f_all_element_decls;
       axutil_array_list_t *f_all_type_defs;
       /* WSDL Element model data */
-      axis2_uri_t *f_doc_base_uri;
+      axutil_uri_t *f_doc_base_uri;
       /* <description> attributes */
-      axis2_uri_t *f_target_namespc;
+      axutil_uri_t *f_target_namespc;
       axutil_hash_t *f_namespcs;
       /* <description> child elements */
       axutil_array_list_t *f_import_elements;
@@ -169,9 +169,9 @@
 woden_wsdl10_desc_set_document_base_uri(
       void *desc,
       const axutil_env_t *env,
-      axis2_uri_t *doc_base_uri);
+      axutil_uri_t *doc_base_uri);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_wsdl10_desc_get_document_base_uri(
       void *desc,
       const axutil_env_t *env);
@@ -180,9 +180,9 @@
 woden_wsdl10_desc_set_target_namespace(
       void *desc,
       const axutil_env_t *env,
-      axis2_uri_t *namespc);
+      axutil_uri_t *namespc);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_wsdl10_desc_get_target_namespace(
       void *desc,
       const axutil_env_t *env);
@@ -192,7 +192,7 @@
       void *desc,
       const axutil_env_t *env,
       axis2_char_t *prefix,
-      axis2_uri_t *namespc);
+      axutil_uri_t *namespc);
 
 axis2_status_t AXIS2_CALL
 woden_wsdl10_desc_remove_namespace(
@@ -200,7 +200,7 @@
       const axutil_env_t *env,
       axis2_char_t *prefix);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_wsdl10_desc_get_namespace(
       void *desc,
       const axutil_env_t *env,
@@ -239,7 +239,7 @@
       const axutil_env_t *env,
       void *types_el);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_wsdl10_desc_get_types_element(
       void *desc,
       const axutil_env_t *env);
@@ -1057,12 +1057,12 @@
       /* TODO free f_parent */
       if (desc_impl->f_target_namespc)
       {
-	    axis2_uri_free(desc_impl->f_target_namespc, env);
+	    axutil_uri_free(desc_impl->f_target_namespc, env);
 	    desc_impl->f_target_namespc = NULL;
       }
       if (desc_impl->f_doc_base_uri)
       {
-	    axis2_uri_free(desc_impl->f_doc_base_uri, env);
+	    axutil_uri_free(desc_impl->f_doc_base_uri, env);
 	    desc_impl->f_doc_base_uri = NULL;
       }
       if (desc_impl->f_import_elements)
@@ -1085,15 +1085,15 @@
       if (desc_impl->f_namespcs)
       {
 	    axutil_hash_index_t *i = NULL;
-	    axis2_uri_t *namespc = NULL;
+	    axutil_uri_t *namespc = NULL;
 	    void *v = NULL;
 
 	    for (i = axutil_hash_first(desc_impl->f_namespcs, env); i; i =
 		       axutil_hash_next(env, i))
 	    {
 		  axutil_hash_this(i, NULL, NULL, &v);
-		  namespc = (axis2_uri_t *) v;
-		  axis2_uri_free(namespc, env);
+		  namespc = (axutil_uri_t *) v;
+		  axutil_uri_free(namespc, env);
 	    }
 	    axutil_hash_free(desc_impl->f_namespcs, env);
 	    desc_impl->f_namespcs = NULL;
@@ -1489,7 +1489,7 @@
 woden_wsdl10_desc_set_document_base_uri(
       void *desc,
       const axutil_env_t *env,
-      axis2_uri_t *doc_base_uri)
+      axutil_uri_t *doc_base_uri)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -1501,15 +1501,15 @@
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
       if (desc_impl->f_doc_base_uri)
       {
-	    axis2_uri_free(desc_impl->f_doc_base_uri, env);
+	    axutil_uri_free(desc_impl->f_doc_base_uri, env);
 	    desc_impl->f_doc_base_uri = NULL;
       }
 
-      desc_impl->f_doc_base_uri = axis2_uri_clone(doc_base_uri, env);
+      desc_impl->f_doc_base_uri = axutil_uri_clone(doc_base_uri, env);
       return AXIS2_SUCCESS;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_wsdl10_desc_get_document_base_uri(
       void *desc,
       const axutil_env_t *env)
@@ -1530,7 +1530,7 @@
 woden_wsdl10_desc_set_target_namespace(
       void *desc,
       const axutil_env_t *env,
-      axis2_uri_t *namespc)
+      axutil_uri_t *namespc)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -1542,15 +1542,15 @@
 					      "WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
       if (desc_impl->f_target_namespc)
       {
-	    axis2_uri_free(desc_impl->f_target_namespc, env);
+	    axutil_uri_free(desc_impl->f_target_namespc, env);
 	    desc_impl->f_target_namespc = NULL;
       }
 
-      desc_impl->f_target_namespc = axis2_uri_clone(namespc, env);
+      desc_impl->f_target_namespc = axutil_uri_clone(namespc, env);
       return AXIS2_SUCCESS;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_wsdl10_desc_get_target_namespace(
       void *desc,
       const axutil_env_t *env)
@@ -1571,7 +1571,7 @@
       void *desc,
       const axutil_env_t *env,
       axis2_char_t *prefix,
-      axis2_uri_t *namespc)
+      axutil_uri_t *namespc)
 {
       woden_wsdl10_desc_impl_t *desc_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -1585,7 +1585,7 @@
       pfx = (prefix) ? prefix : "";
       if (namespc)
 	    axutil_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING,
-			   axis2_uri_clone(namespc, env));
+			   axutil_uri_clone(namespc, env));
       else
 	    axutil_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING, NULL);
       return AXIS2_SUCCESS;
@@ -1611,7 +1611,7 @@
       return AXIS2_SUCCESS;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_wsdl10_desc_get_namespace(
       void *desc,
       const axutil_env_t *env,
@@ -1737,7 +1737,7 @@
       return AXIS2_SUCCESS;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_wsdl10_desc_get_types_element(
       void *desc,
       const axutil_env_t *env)

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -40,7 +40,7 @@
       woden_nc_name_t *f_name;
       axutil_qname_t *f_binding_qname;
       void *f_binding;
-      axis2_uri_t *f_address;
+      axutil_uri_t *f_address;
 };
 
 #define INTF_TO_IMPL(endpoint) ((woden_wsdl10_endpoint_impl_t *) endpoint)
@@ -79,7 +79,7 @@
       void *endpoint,
       const axutil_env_t *env);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_wsdl10_endpoint_get_address(
       void *endpoint,
       const axutil_env_t *env);
@@ -113,7 +113,7 @@
 woden_wsdl10_endpoint_set_address(
       void *endpoint,
       const axutil_env_t *env,
-      axis2_uri_t *uri);
+      axutil_uri_t *uri);
 
 /******************************************************************************
  *  Non-API implementation methods
@@ -783,7 +783,7 @@
 
       if (endpoint_impl->f_address)
       {
-	    axis2_uri_free(endpoint_impl->f_address, env);
+	    axutil_uri_free(endpoint_impl->f_address, env);
 	    endpoint_impl->f_address = NULL;
       }
 
@@ -944,7 +944,7 @@
       return endpoint_impl->f_binding;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_wsdl10_endpoint_get_address(
       void *endpoint,
       const axutil_env_t *env)
@@ -1044,7 +1044,7 @@
 woden_wsdl10_endpoint_set_address(
       void *endpoint,
       const axutil_env_t *env,
-      axis2_uri_t *uri)
+      axutil_uri_t *uri)
 {
       woden_wsdl10_endpoint_impl_t *endpoint_impl = NULL;
       axutil_hash_t *super = NULL;
@@ -1056,11 +1056,11 @@
 
       if (endpoint_impl->f_address)
       {
-	    axis2_uri_free(endpoint_impl->f_address, env);
+	    axutil_uri_free(endpoint_impl->f_address, env);
 	    endpoint_impl->f_address = NULL;
       }
 
-      endpoint_impl->f_address = axis2_uri_clone(uri, env);
+      endpoint_impl->f_address = axutil_uri_clone(uri, env);
       return AXIS2_SUCCESS;
 }
 

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -66,12 +66,12 @@
     void *binding_exts,
     const axutil_env_t *env);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_soap_binding_exts_get_soap_underlying_protocol(
     void *binding_exts,
     const axutil_env_t *env);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_soap_binding_exts_get_soap_mep_default(
     void *binding_exts,
     const axutil_env_t *env);
@@ -385,7 +385,7 @@
             NULL;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_soap_binding_exts_get_soap_underlying_protocol(
     void *binding_exts,
     const axutil_env_t *env)
@@ -408,7 +408,7 @@
     return protocol  ? WODEN_URI_ATTR_GET_URI(protocol, env) : NULL;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_soap_binding_exts_get_soap_mep_default(
     void *binding_exts,
     const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c Fri Mar 30 12:54:08 2007
@@ -63,12 +63,12 @@
     void *binding_op_exts,
     const axutil_env_t *env);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_soap_binding_op_exts_get_soap_mep(
     void *binding_op_exts,
     const axutil_env_t *env);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_soap_binding_op_exts_get_soap_action(
     void *binding_op_exts,
     const axutil_env_t *env);
@@ -336,7 +336,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_soap_binding_op_exts_get_soap_mep(
     void *binding_op_exts,
     const axutil_env_t *env)
@@ -360,7 +360,7 @@
     return mep  ? WODEN_URI_ATTR_GET_URI(mep, env) : NULL;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_soap_binding_op_exts_get_soap_action(
     void *binding_op_exts,
     const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_constants.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_constants.h (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_constants.h Fri Mar 30 12:54:08 2007
@@ -24,7 +24,7 @@
  *          Constants for XML Soap elements, attributes and URIs.
  */
  
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 #ifdef __cplusplus
 extern "C" 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c Fri Mar 30 12:54:08 2007
@@ -180,7 +180,7 @@
 woden_soap_header_block_get_ext_attrs_for_namespace(
     void *header_block,
     const axutil_env_t *env,
-    axis2_uri_t *namespc);
+    axutil_uri_t *namespc);
 
 axutil_array_list_t *AXIS2_CALL
 woden_soap_header_block_get_ext_attrs(
@@ -191,7 +191,7 @@
 woden_soap_header_block_has_ext_attrs_for_namespace(
     void *header_block,
     const axutil_env_t *env,
-    axis2_uri_t *namespc);
+    axutil_uri_t *namespc);
 
 axis2_status_t AXIS2_CALL
 woden_soap_header_block_add_ext_element(
@@ -220,7 +220,7 @@
 woden_soap_header_block_has_ext_elements_for_namespace(
     void *header_block,
     const axutil_env_t *env,
-    axis2_uri_t *namespc);
+    axutil_uri_t *namespc);
 
 /* ************************************************************
  *  Non-API implementation methods
@@ -1138,7 +1138,7 @@
 woden_soap_header_block_get_ext_attrs_for_namespace(
     void *header_block,
     const axutil_env_t *env,
-    axis2_uri_t *namespc)
+    axutil_uri_t *namespc)
 {
     woden_soap_header_block_impl_t *header_block_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -1174,7 +1174,7 @@
 woden_soap_header_block_has_ext_attrs_for_namespace(
     void *header_block,
     const axutil_env_t *env,
-    axis2_uri_t *namespc)
+    axutil_uri_t *namespc)
 {
     woden_soap_header_block_impl_t *header_block_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -1269,7 +1269,7 @@
 woden_soap_header_block_has_ext_elements_for_namespace(
     void *header_block,
     const axutil_env_t *env,
-    axis2_uri_t *namespc)
+    axutil_uri_t *namespc)
 {
     woden_soap_header_block_impl_t *header_block_impl = NULL;
     axutil_hash_t *super = NULL;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c Fri Mar 30 12:54:08 2007
@@ -41,7 +41,7 @@
     axis2_bool_t f_required;
     void *f_attr_ext;
     void *f_elem_ext;
-    axis2_uri_t *f_ref;
+    axutil_uri_t *f_ref;
 };
 
 #define INTF_TO_IMPL(module) ((woden_soap_module_impl_t *) module)
@@ -65,7 +65,7 @@
  *  Component model methods (SOAPHeaderBlock interface), some shared with Element model
  * ***********************************************************************/
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_soap_module_get_ref(
     void *module,
     axutil_env_t *env);
@@ -93,7 +93,7 @@
 woden_soap_module_set_ref(
     void *module,
     axutil_env_t *env,
-    axis2_uri_t *uri);
+    axutil_uri_t *uri);
 
 axis2_status_t AXIS2_CALL
 woden_soap_module_set_parent_element(
@@ -155,7 +155,7 @@
 woden_soap_module_get_ext_attrs_for_namespace(
     void *module,
     axutil_env_t *env,
-    axis2_uri_t *namespc);
+    axutil_uri_t *namespc);
 
 axutil_array_list_t *AXIS2_CALL
 woden_soap_module_get_ext_attrs(
@@ -166,7 +166,7 @@
 woden_soap_module_has_ext_attrs_for_namespace(
     void *module,
     axutil_env_t *env,
-    axis2_uri_t *namespc);
+    axutil_uri_t *namespc);
 
 axis2_status_t AXIS2_CALL
 woden_soap_module_add_ext_element(
@@ -195,7 +195,7 @@
 woden_soap_module_has_ext_elements_for_namespace(
     void *module,
     axutil_env_t *env,
-    axis2_uri_t *namespc);
+    axutil_uri_t *namespc);
 
 static woden_soap_module_t *
 create(const axutil_env_t *env);
@@ -569,7 +569,7 @@
 
     if (module_impl->f_ref)
     {
-        axis2_uri_free(module_impl->f_ref, env);
+        axutil_uri_free(module_impl->f_ref, env);
         module_impl->f_ref = NULL;
     }
 
@@ -666,7 +666,7 @@
  *  Component model methods (SOAPHeaderBlock interface), some shared with Element model
  * ***********************************************************************/
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_soap_module_get_ref(
     void *module,
     axutil_env_t *env)
@@ -739,7 +739,7 @@
 woden_soap_module_set_ref(
     void *module,
     axutil_env_t *env,
-    axis2_uri_t *uri)
+    axutil_uri_t *uri)
 {
     woden_soap_module_impl_t *module_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -752,11 +752,11 @@
 
     if (module_impl->f_ref)
     {
-        axis2_uri_free(module_impl->f_ref, env);
+        axutil_uri_free(module_impl->f_ref, env);
         module_impl->f_ref = NULL;
     }
 
-    module_impl->f_ref = axis2_uri_clone(uri, env);
+    module_impl->f_ref = axutil_uri_clone(uri, env);
 
     return AXIS2_SUCCESS;
 
@@ -955,7 +955,7 @@
 woden_soap_module_get_ext_attrs_for_namespace(
     void *module,
     axutil_env_t *env,
-    axis2_uri_t *namespc)
+    axutil_uri_t *namespc)
 {
     woden_soap_module_impl_t *module_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -991,7 +991,7 @@
 woden_soap_module_has_ext_attrs_for_namespace(
     void *module,
     axutil_env_t *env,
-    axis2_uri_t *namespc)
+    axutil_uri_t *namespc)
 {
     woden_soap_module_impl_t *module_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -1086,7 +1086,7 @@
 woden_soap_module_has_ext_elements_for_namespace(
     void *module,
     axutil_env_t *env,
-    axis2_uri_t *namespc)
+    axutil_uri_t *namespc)
 {
     woden_soap_module_impl_t *module_impl = NULL;
     axutil_hash_t *super = NULL;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c Fri Mar 30 12:54:08 2007
@@ -344,7 +344,7 @@
             WODEN_ATTR_REF);
     if (ref)
     {
-        axis2_uri_t *uri = axis2_uri_parse_string(env, ref);
+        axutil_uri_t *uri = axutil_uri_parse_string(env, ref);
 
         soap_mod = woden_soap_module_to_soap_module_element(soap_mod, env);
         WODEN_SOAP_MODULE_ELEMENT_SET_REF(soap_mod, env, uri);

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c Fri Mar 30 12:54:08 2007
@@ -36,7 +36,7 @@
 #include <woden_uri_attr.h>
 #include <woden_qname_or_token_any_attr.h>
 #include <woden_qname_list_or_token_any_attr.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
 #include <axutil_hash.h>
 
 typedef struct woden_ext_registry_impl woden_ext_registry_impl_t;
@@ -151,7 +151,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_uri_t *ext_namespc,
+    axutil_uri_t *ext_namespc,
     void *comp_ext);
 
 void *AXIS2_CALL
@@ -159,7 +159,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_uri_t *ext_namespc);
+    axutil_uri_t *ext_namespc);
 
 axutil_array_list_t *AXIS2_CALL
 woden_ext_registry_query_component_ext_namespaces(
@@ -603,7 +603,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_uri_t *ext_namespc,
+    axutil_uri_t *ext_namespc,
     void *comp_ext)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
@@ -621,7 +621,7 @@
         axutil_hash_set(registry_impl->comp_ext_reg, parent_class,
                 AXIS2_HASH_KEY_STRING, inner_comp_ext_reg);
     }
-    namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+    namespc = axutil_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
     axutil_hash_set(inner_comp_ext_reg, namespc, AXIS2_HASH_KEY_STRING, comp_ext);
     return AXIS2_SUCCESS;
 }
@@ -639,7 +639,7 @@
     void *registry,
     const axutil_env_t *env,
     axis2_char_t *parent_class,
-    axis2_uri_t *ext_namespc)
+    axutil_uri_t *ext_namespc)
 {
     woden_ext_registry_impl_t *registry_impl = NULL;
     axutil_hash_t *inner_comp_ext_reg = NULL;
@@ -651,7 +651,7 @@
 
     inner_comp_ext_reg = axutil_hash_get(registry_impl->comp_ext_reg,
             parent_class, AXIS2_HASH_KEY_STRING);
-    namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+    namespc = axutil_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
     if (inner_comp_ext_reg)
     {
         comp_ext = axutil_hash_get(inner_comp_ext_reg, namespc,
@@ -712,7 +712,7 @@
     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;
+    axutil_uri_t *uri_ns_soap = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     registry_impl = INTF_TO_IMPL(registry);
@@ -846,7 +846,7 @@
     registry_impl->soap_binding_fault_ref_ext =
         woden_soap_binding_fault_ref_exts_create(env);
 
-    uri_ns_soap = axis2_uri_parse_string(env, WODEN_URI_NS_SOAP);
+    uri_ns_soap = axutil_uri_parse_string(env, WODEN_URI_NS_SOAP);
 
     woden_ext_registry_register_component_ext(registry, env, "binding",
             uri_ns_soap,

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c Fri Mar 30 12:54:08 2007
@@ -55,7 +55,7 @@
 
 #include "../wsdl20/woden_constants.h"
 #include <axutil_array_list.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
 
 typedef struct woden_component_model_builder_impl
 {
@@ -101,7 +101,7 @@
     void *builder,
     const axutil_env_t *env,
     void *schema_def,
-    axis2_uri_t *type_system_uri);
+    axutil_uri_t *type_system_uri);
 
 /*
  * Extract the type definitions from the given schema.
@@ -111,7 +111,7 @@
     void *builder,
     const axutil_env_t *env,
     void *schema_def,
-    axis2_uri_t *type_system_uri);
+    axutil_uri_t *type_system_uri);
 
 /* *******************************************************************************
  *  INTERFACE
@@ -229,7 +229,7 @@
     const axutil_env_t *env,
     axis2_char_t *parent_class,
     void *parent_elem,
-    axis2_uri_t *ext_ns);
+    axutil_uri_t *ext_ns);
 
 /* *******************************************************************************
  *  SERVICE
@@ -393,7 +393,7 @@
 {
     woden_component_model_builder_impl_t *builder_impl = NULL;
     void *types = NULL;
-    axis2_uri_t *type_system_uri = NULL;
+    axutil_uri_t *type_system_uri = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, desc, AXIS2_FAILURE);
@@ -402,7 +402,7 @@
     desc = woden_desc_to_desc_element(desc, env);
     types = WODEN_DESC_ELEMENT_GET_TYPES_ELEMENT(desc, env);
 
-    type_system_uri = axis2_uri_parse_string(env, WODEN_TYPE_XSD_2001);
+    type_system_uri = axutil_uri_parse_string(env, WODEN_TYPE_XSD_2001);
 
     if (types)
     {
@@ -462,7 +462,7 @@
     void *builder,
     const axutil_env_t *env,
     void *schema_def,
-    axis2_uri_t *type_system_uri)
+    axutil_uri_t *type_system_uri)
 {
     woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_char_t *schema_tns = NULL;
@@ -519,7 +519,7 @@
     void *builder,
     const axutil_env_t *env,
     void *schema_def,
-    axis2_uri_t *type_system_uri)
+    axutil_uri_t *type_system_uri)
 {
     woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_char_t *schema_tns = NULL;
@@ -1014,7 +1014,7 @@
     woden_ext_registry_t *er = NULL;
     axutil_array_list_t *ext_namespcs = NULL;
     int i = 0, size = 0;
-    axis2_uri_t *binding_type = NULL;
+    axutil_uri_t *binding_type = NULL;
     axis2_char_t *binding_type_str = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1033,7 +1033,7 @@
     size = axutil_array_list_size(ext_namespcs, env);
     for (i = 0; i < size; i++)
     {
-        axis2_uri_t *ext_ns = NULL;
+        axutil_uri_t *ext_ns = NULL;
         axis2_bool_t temp1 = AXIS2_FALSE;
         axis2_bool_t temp2 = AXIS2_FALSE;
         void *configurable = NULL;
@@ -1072,18 +1072,18 @@
      * extensions can be registered in some way and interpreted here at run time.
      */
     binding_type = WODEN_BINDING_GET_TYPE(binding, env);
-    binding_type_str = axis2_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
+    binding_type_str = axutil_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
     if (0 == axis2_strcmp(WODEN_URI_NS_SOAP, binding_type_str))
     {
         void *sbe = NULL;
-        axis2_uri_t *uri_ns_soap = NULL;
+        axutil_uri_t *uri_ns_soap = NULL;
 
         /* If the binding type is SOAP, the {soap version} property defaults to "1.2" so if a
          * a SOAP Binding Extensions object has not already been created, create one now to handle
          * this default value.
          */
         binding = woden_binding_to_wsdl_component(binding, env);
-        uri_ns_soap = axis2_uri_parse_string(env, WODEN_URI_NS_SOAP);
+        uri_ns_soap = axutil_uri_parse_string(env, WODEN_URI_NS_SOAP);
         if (! WODEN_WSDL_COMPONENT_GET_COMPONENT_EXTS_FOR_NAMESPACE(binding,
                 env, uri_ns_soap))
         {
@@ -1114,7 +1114,7 @@
     axutil_array_list_t *ext_namespcs = NULL;
     int i = 0, size = 0;
     void *parent_element = NULL;
-    axis2_uri_t *binding_type = NULL;
+    axutil_uri_t *binding_type = NULL;
     axis2_char_t *binding_type_str = NULL;
 
 
@@ -1134,7 +1134,7 @@
     size = axutil_array_list_size(ext_namespcs, env);
     for (i = 0; i < size; i++)
     {
-        axis2_uri_t *ext_ns = NULL;
+        axutil_uri_t *ext_ns = NULL;
         axis2_bool_t temp1 = AXIS2_FALSE;
         axis2_bool_t temp2 = AXIS2_FALSE;
 
@@ -1170,10 +1170,10 @@
     parent_element = WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(bind_fault, env);
     parent_element = woden_binding_to_binding_element(parent_element, env);
     binding_type = WODEN_BINDING_ELEMENT_GET_TYPE(parent_element, env);
-    binding_type_str = axis2_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
+    binding_type_str = axutil_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
     if (0 == axis2_strcmp(WODEN_URI_NS_SOAP, binding_type_str))
     {
-        axis2_uri_t *uri_ns_soap = axis2_uri_parse_string(env, WODEN_URI_NS_SOAP);
+        axutil_uri_t *uri_ns_soap = axutil_uri_parse_string(env, WODEN_URI_NS_SOAP);
 
         /* If the binding type is SOAP, the {soap fault code} and {soap fault subcodes} properties
          * default to xs:token "#any", so if a SOAP Binding Fault Extensions object has not already 
@@ -1206,7 +1206,7 @@
     axutil_array_list_t *ext_namespcs = NULL;
     int i = 0, size = 0;
     void *parent_element = NULL;
-    axis2_uri_t *binding_type = NULL;
+    axutil_uri_t *binding_type = NULL;
     axis2_char_t *binding_type_str = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1224,7 +1224,7 @@
      */
     for (i = 0; i < size; i++)
     {
-        axis2_uri_t *ext_ns = NULL;
+        axutil_uri_t *ext_ns = NULL;
         axis2_bool_t temp1 = AXIS2_FALSE;
         axis2_bool_t temp2 = AXIS2_FALSE;
 
@@ -1260,10 +1260,10 @@
     parent_element = WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(bind_op, env);
     parent_element = woden_binding_to_binding_element(parent_element, env);
     binding_type = WODEN_BINDING_ELEMENT_GET_TYPE(parent_element, env);
-    binding_type_str = axis2_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
+    binding_type_str = axutil_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
     if (0 == axis2_strcmp(WODEN_URI_NS_SOAP, binding_type_str))
     {
-        axis2_uri_t *uri_ns_soap = axis2_uri_parse_string(env, WODEN_URI_NS_SOAP);
+        axutil_uri_t *uri_ns_soap = axutil_uri_parse_string(env, WODEN_URI_NS_SOAP);
         /*
          * If the binding type is HTTP then the {http input serialization} and {http output serialization} 
          * properties have default values defined by the HTTP Binding rules in the WSDL 2.0 Part 2 Adjuncts
@@ -1311,7 +1311,7 @@
         size = axutil_array_list_size(ext_namespcs, env);
     for (i = 0; i < size; i++)
     {
-        axis2_uri_t *ext_ns = NULL;
+        axutil_uri_t *ext_ns = NULL;
         axis2_bool_t temp1 = AXIS2_FALSE;
         axis2_bool_t temp2 = AXIS2_FALSE;
 
@@ -1360,7 +1360,7 @@
         size = axutil_array_list_size(ext_namespcs, env);
     for (i = 0; i < size; i++)
     {
-        axis2_uri_t *ext_ns = NULL;
+        axutil_uri_t *ext_ns = NULL;
         axis2_bool_t temp1 = AXIS2_FALSE;
         axis2_bool_t temp2 = AXIS2_FALSE;
 
@@ -1397,7 +1397,7 @@
     const axutil_env_t *env,
     axis2_char_t *parent_class,
     void *parent_elem,
-    axis2_uri_t *ext_ns)
+    axutil_uri_t *ext_ns)
 {
     woden_component_model_builder_impl_t *builder_impl = NULL;
     woden_ext_registry_t *er = NULL;

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_constants.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_constants.h (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_constants.h Fri Mar 30 12:54:08 2007
@@ -24,7 +24,7 @@
  * Constants for WSDL 2.0 elements, attributes and URIs.
  */
  
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 #ifdef __cplusplus
 extern "C" 

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c Fri Mar 30 12:54:08 2007
@@ -64,9 +64,9 @@
     axutil_array_list_t *f_all_element_decls;
     axutil_array_list_t *f_all_type_defs;
     /* WSDL Element model data */
-    axis2_uri_t *f_doc_base_uri;
+    axutil_uri_t *f_doc_base_uri;
     /* <description> attributes */
-    axis2_uri_t *f_target_namespc;
+    axutil_uri_t *f_target_namespc;
     axutil_hash_t *f_namespcs;
     /* <description> child elements */
     axutil_array_list_t *f_import_elements;
@@ -161,9 +161,9 @@
 woden_desc_set_document_base_uri(
     void *desc,
     const axutil_env_t *env,
-    axis2_uri_t *doc_base_uri);
+    axutil_uri_t *doc_base_uri);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_desc_get_document_base_uri(
     void *desc,
     const axutil_env_t *env);
@@ -172,9 +172,9 @@
 woden_desc_set_target_namespace(
     void *desc,
     const axutil_env_t *env,
-    axis2_uri_t *namespc);
+    axutil_uri_t *namespc);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_desc_get_target_namespace(
     void *desc,
     const axutil_env_t *env);
@@ -184,7 +184,7 @@
     void *desc,
     const axutil_env_t *env,
     axis2_char_t *prefix,
-    axis2_uri_t *namespc);
+    axutil_uri_t *namespc);
 
 axis2_status_t AXIS2_CALL
 woden_desc_remove_namespace(
@@ -192,7 +192,7 @@
     const axutil_env_t *env,
     axis2_char_t *prefix);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_desc_get_namespace(
     void *desc,
     const axutil_env_t *env,
@@ -231,7 +231,7 @@
     const axutil_env_t *env,
     void *types_el);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_desc_get_types_element(
     void *desc,
     const axutil_env_t *env);
@@ -1005,12 +1005,12 @@
     /* TODO free f_parent */
     if (desc_impl->f_target_namespc)
     {
-        axis2_uri_free(desc_impl->f_target_namespc, env);
+        axutil_uri_free(desc_impl->f_target_namespc, env);
         desc_impl->f_target_namespc = NULL;
     }
     if (desc_impl->f_doc_base_uri)
     {
-        axis2_uri_free(desc_impl->f_doc_base_uri, env);
+        axutil_uri_free(desc_impl->f_doc_base_uri, env);
         desc_impl->f_doc_base_uri = NULL;
     }
     /* TODO free f_namespcs */
@@ -1373,7 +1373,7 @@
 woden_desc_set_document_base_uri(
     void *desc,
     const axutil_env_t *env,
-    axis2_uri_t *doc_base_uri)
+    axutil_uri_t *doc_base_uri)
 {
     woden_desc_impl_t *desc_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -1385,15 +1385,15 @@
             "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     if (desc_impl->f_doc_base_uri)
     {
-        axis2_uri_free(desc_impl->f_doc_base_uri, env);
+        axutil_uri_free(desc_impl->f_doc_base_uri, env);
         desc_impl->f_doc_base_uri = NULL;
     }
 
-    desc_impl->f_doc_base_uri = axis2_uri_clone(doc_base_uri, env);
+    desc_impl->f_doc_base_uri = axutil_uri_clone(doc_base_uri, env);
     return AXIS2_SUCCESS;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_desc_get_document_base_uri(
     void *desc,
     const axutil_env_t *env)
@@ -1414,7 +1414,7 @@
 woden_desc_set_target_namespace(
     void *desc,
     const axutil_env_t *env,
-    axis2_uri_t *namespc)
+    axutil_uri_t *namespc)
 {
     woden_desc_impl_t *desc_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -1426,15 +1426,15 @@
             "WODEN_DESC", AXIS2_HASH_KEY_STRING));
     if (desc_impl->f_target_namespc)
     {
-        axis2_uri_free(desc_impl->f_target_namespc, env);
+        axutil_uri_free(desc_impl->f_target_namespc, env);
         desc_impl->f_target_namespc = NULL;
     }
 
-    desc_impl->f_target_namespc = axis2_uri_clone(namespc, env);
+    desc_impl->f_target_namespc = axutil_uri_clone(namespc, env);
     return AXIS2_SUCCESS;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_desc_get_target_namespace(
     void *desc,
     const axutil_env_t *env)
@@ -1455,7 +1455,7 @@
     void *desc,
     const axutil_env_t *env,
     axis2_char_t *prefix,
-    axis2_uri_t *namespc)
+    axutil_uri_t *namespc)
 {
     woden_desc_impl_t *desc_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -1469,7 +1469,7 @@
     pfx = (prefix) ? prefix : "";
     if (namespc)
         axutil_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING,
-                axis2_uri_clone(namespc, env));
+                axutil_uri_clone(namespc, env));
     else
         axutil_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING, NULL);
     return AXIS2_SUCCESS;
@@ -1495,7 +1495,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_desc_get_namespace(
     void *desc,
     const axutil_env_t *env,
@@ -1621,7 +1621,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_desc_get_types_element(
     void *desc,
     const axutil_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_endpoint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_endpoint.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_endpoint.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_endpoint.c Fri Mar 30 12:54:08 2007
@@ -40,7 +40,7 @@
     woden_nc_name_t *f_name;
     axutil_qname_t *f_binding_qname;
     void *f_binding;
-    axis2_uri_t *f_address;
+    axutil_uri_t *f_address;
 };
 
 #define INTF_TO_IMPL(endpoint) ((woden_endpoint_impl_t *) endpoint)
@@ -79,7 +79,7 @@
     void *endpoint,
     const axutil_env_t *env);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_endpoint_get_address(
     void *endpoint,
     const axutil_env_t *env);
@@ -113,7 +113,7 @@
 woden_endpoint_set_address(
     void *endpoint,
     const axutil_env_t *env,
-    axis2_uri_t *uri);
+    axutil_uri_t *uri);
 
 /******************************************************************************
  *  Non-API implementation methods
@@ -732,7 +732,7 @@
 
     if (endpoint_impl->f_address)
     {
-        axis2_uri_free(endpoint_impl->f_address, env);
+        axutil_uri_free(endpoint_impl->f_address, env);
         endpoint_impl->f_address = NULL;
     }
 
@@ -893,7 +893,7 @@
     return endpoint_impl->f_binding;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_endpoint_get_address(
     void *endpoint,
     const axutil_env_t *env)
@@ -993,7 +993,7 @@
 woden_endpoint_set_address(
     void *endpoint,
     const axutil_env_t *env,
-    axis2_uri_t *uri)
+    axutil_uri_t *uri)
 {
     woden_endpoint_impl_t *endpoint_impl = NULL;
     axutil_hash_t *super = NULL;
@@ -1005,11 +1005,11 @@
 
     if (endpoint_impl->f_address)
     {
-        axis2_uri_free(endpoint_impl->f_address, env);
+        axutil_uri_free(endpoint_impl->f_address, env);
         endpoint_impl->f_address = NULL;
     }
 
-    endpoint_impl->f_address = axis2_uri_clone(uri, env);
+    endpoint_impl->f_address = axutil_uri_clone(uri, env);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <woden_string_attr.h>
 #include <woden_xml_attr.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
 #include <axiom_element.h>
 #include <axiom_node.h>
 

Modified: webservices/axis2/trunk/c/woden/src/xml/woden_uri_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_uri_attr.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_uri_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_uri_attr.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <woden_uri_attr.h>
 #include <woden_xml_attr.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
 #include <axiom_element.h>
 #include <axiom_node.h>
 
@@ -53,7 +53,7 @@
     void *uri_attr,
     const axutil_env_t *env);
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_uri_attr_get_uri(
     void *uri_attr,
     const axutil_env_t *env);
@@ -209,7 +209,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_uri_t *AXIS2_CALL
+axutil_uri_t *AXIS2_CALL
 woden_uri_attr_get_uri(
     void *uri_attr,
     const axutil_env_t *env)
@@ -218,7 +218,7 @@
 
     AXIS2_ENV_CHECK(env, NULL);
     uri_attr_impl = INTF_TO_IMPL(uri_attr);
-    return (axis2_uri_t *) WODEN_XML_ATTR_GET_CONTENT(
+    return (axutil_uri_t *) WODEN_XML_ATTR_GET_CONTENT(
                 uri_attr_impl->xml_attr, env);
 }
 
@@ -231,14 +231,14 @@
     axis2_char_t *attr_value)
 {
     woden_uri_attr_impl_t *uri_attr_impl = NULL;
-    axis2_uri_t *url = NULL;
+    axutil_uri_t *url = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     uri_attr_impl = INTF_TO_IMPL(uri_attr);
 
     if (attr_value)
     {
-        /* TODO url = axis2_uri_create(env, attr_value);*/
+        /* TODO url = axutil_uri_create(env, attr_value);*/
     }
 
     if (!url)

Modified: webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <woden_xml_attr.h>
-#include <axis2_uri.h>
+#include <axutil_uri.h>
 #include <axutil_hash.h>
 #include <axiom_element.h>
 #include <axiom_node.h>

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h Fri Mar 30 12:54:08 2007
@@ -28,7 +28,7 @@
 #include <axutil_env.h>
 #include <axutil_error.h>
 #include <axutil_string.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 #include <axutil_array_list.h>
 #include <axutil_hash.h>

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_constants.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema_constants.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_constants.h Fri Mar 30 12:54:08 2007
@@ -23,7 +23,7 @@
  * @brief Axis2 Xml Schema Constants
  */
  
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_hash.h>
 #include <xml_schema_defines.h>
 

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h Fri Mar 30 12:54:08 2007
@@ -27,7 +27,7 @@
 #include <axutil_env.h>
 #include <axutil_error.h>
 #include <axutil_string.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_array_list.h>
 #include <axutil_hash.h>
 #include <xml_schema_defines.h>

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj.h Fri Mar 30 12:54:08 2007
@@ -37,7 +37,7 @@
 #include <axutil_env.h>
 #include <axutil_error.h>
 #include <axutil_string.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 #include <axutil_array_list.h>
 #include <axutil_hash.h>
 #include <xml_schema_defines.h>

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h Fri Mar 30 12:54:08 2007
@@ -37,7 +37,7 @@
 #include <axutil_env.h>
 #include <axutil_error.h>
 #include <axutil_string.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <axutil_array_list.h>
 #include <axutil_hash.h>
 #include <axutil_qname.h>

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema_url_resolver.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_url_resolver.h?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema_url_resolver.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_url_resolver.h Fri Mar 30 12:54:08 2007
@@ -21,7 +21,7 @@
 /**
  * @file xml_schema_url_resolver.h
  */
-#include <axis2_url.h>
+#include <axutil_url.h>
 #include <xml_schema_input_source.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/xml_schema/samples/test_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/samples/test_schema.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/samples/test_schema.c (original)
+++ webservices/axis2/trunk/c/xml_schema/samples/test_schema.c Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
 #include <xml_schema_includes.h>
 #include <stdio.h>
 #include <axutil_env.h>
-#include <axis2_utils_defines.h>
+#include <axutil_utils_defines.h>
 
 axis2_status_t
 xml_schema_test(

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <xml_schema_annotated.h>
 #include <xml_schema_annotation.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_annotated_impl
             xml_schema_annotated_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_annotation.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 /**
  * @brief xml_schema_annotation struct

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_any.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_any_impl
             xml_schema_any_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_any_attribute.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 
 typedef struct xml_schema_any_attribute_impl

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <xml_schema_app_info.h>
 #include <xml_schema_use.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 #include <xml_schema_constants.h>
 
 typedef struct xml_schema_app_info_impl

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_attribute.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_attribute_impl
             xml_schema_attribute_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_attribute_group.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_attribute_group_impl
             xml_schema_attribute_group_impl_t;

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_attribute_group_ref.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 
 typedef struct xml_schema_attribute_group_ref_impl

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_complex_content.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_complex_content_impl
             xml_schema_complex_content_impl_t;

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_complex_content_extension.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_complex_content_extension_impl
             xml_schema_complex_content_extension_impl_t;

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_complex_content_restriction.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_complex_content_restriction_impl
             xml_schema_complex_content_restriction_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <xml_schema_content_processing.h>
 #include <xml_schema_use.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_content_processing_impl
             xml_schema_content_processing_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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -16,7 +16,7 @@
  */
 #include <xml_schema_defines.h>
 #include <xml_schema_content_type.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 #include <axutil_string.h>
 

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c Fri Mar 30 12:54:08 2007
@@ -18,7 +18,7 @@
 #include <xml_schema_data_type.h>
 #include <xml_schema_tokenized_type.h>
 #include <axutil_hash.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_data_type_impl
             xml_schema_data_type_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <xml_schema_constants.h>
 #include <xml_schema_derivation_method.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_derivation_method_impl
             xml_schema_derivation_method_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <xml_schema_documentation.h>
 #include <xml_schema_use.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_documentation_impl
             xml_schema_documentation_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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -24,7 +24,7 @@
 #include <xml_schema_simple_type.h>
 #include <xml_schema_complex_type.h>
 #include <xml_schema_form.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 
 typedef struct xml_schema_element_impl

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <xml_schema_enum.h>
 #include <axutil_hash.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_enum_impl
             xml_schema_enum_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_form.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 typedef struct xml_schema_form_impl
             xml_schema_form_impl_t;
 

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <xml_schema_group.h>
 #include <xml_schema_group_base.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_group_impl
             xml_schema_group_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_group_base.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_group_base_impl
             xml_schema_group_base_impl_t;

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <xml_schema_group_ref.h>
 #include <xml_schema_group_base.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_group_ref_impl
             xml_schema_group_ref_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include  <xml_schema_import.h>
 #include  <xml_schema.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 /**
  * @brief xml_schema_import_impl
  */

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <xml_schema_obj.h>
 #include <axutil_hash.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 /**
  * @brief xml_schema_obj struct impl

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c Fri Mar 30 12:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <xml_schema_obj_collection.h>
 #include <axutil_hash.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_obj_collection_impl
             xml_schema_obj_collection_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_particle.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_particle_impl
             xml_schema_particle_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_simple_content.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_simple_content_impl
             xml_schema_simple_content_impl_t;

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_simple_content_extension.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_simple_content_extension_impl
             xml_schema_simple_content_extension_impl_t;

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_simple_content_restriction.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_simple_content_restriction_impl
             xml_schema_simple_content_restriction_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_simple_type_content.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_simple_type_content_impl
             xml_schema_simple_type_content_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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_simple_type_list.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_simple_type_list_impl
             xml_schema_simple_type_list_impl_t;

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=524255&r1=524254&r2=524255
==============================================================================
--- 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:54:08 2007
@@ -17,7 +17,7 @@
 
 #include <xml_schema_simple_type_restriction.h>
 #include <xml_schema_obj_collection.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_simple_type_restriction_impl
             xml_schema_simple_type_restriction_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_simple_type_union.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_simple_type_union_impl
             xml_schema_simple_type_union_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_url_resolver.h>
-#include <axis2_url.h>
+#include <axutil_url.h>
 #include <axutil_file_handler.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
@@ -38,29 +38,29 @@
 {
     if (base_uri && NULL != schema_location)
     {
-        axis2_uri_t *uri1 = NULL;
-        axis2_uri_t *uri2 = NULL;
+        axutil_uri_t *uri1 = NULL;
+        axutil_uri_t *uri2 = NULL;
         axis2_char_t *abs_path = NULL;
         axis2_char_t *ref = NULL;
         /*
         if(axutil_file_handler_access(base_uri, AXIS2_F_OK))
         {
              abs_path = AXIS2_GETCWD(base_uri);
-            uri1 = axis2_uri_parse_string(env, get_file_url(env, bas));
+            uri1 = axutil_uri_parse_string(env, get_file_url(env, bas));
 
         }
         */
         abs_path = get_file_url(env, base_uri);
 
-        uri1 = axis2_uri_parse_string(env, abs_path);
+        uri1 = axutil_uri_parse_string(env, abs_path);
 
         if (uri1)
         {
-            uri2 = axis2_uri_parse_relative(env, uri1, schema_location);
+            uri2 = axutil_uri_parse_relative(env, uri1, schema_location);
             if (uri2)
             {
-                ref = axis2_uri_to_string(uri2, env, 1);
-                /* axis2_uri_free(uri2, env);  */
+                ref = axutil_uri_to_string(uri2, env, 1);
+                /* axutil_uri_free(uri2, env);  */
                 return xml_schema_input_source_create_with_system_id(env, ref);
             }
         }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_use.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_use_impl xml_schema_use_impl_t;
 

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_severity_type.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_severity_type_impl
             xml_schema_severity_type_impl_t;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c?view=diff&rev=524255&r1=524254&r2=524255
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c Fri Mar 30 12:54:08 2007
@@ -16,7 +16,7 @@
  */
 
 #include <xml_schema_tokenized_type.h>
-#include <axis2_utils.h>
+#include <axutil_utils.h>
 
 typedef struct xml_schema_tokenized_type_impl xml_schema_tokenized_type_impl_t;
 



---------------------------------------------------------------------
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