You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2006/06/07 13:22:28 UTC

svn commit: r412366 [1/2] - in /webservices/axis2/trunk/c: ./ axiom/ axiom/include/ axiom/src/ axiom/src/om/ axiom/src/util/ woden/include/woden/ woden/include/woden/schema/ woden/include/woden/types/ woden/include/woden/util/ woden/include/woden/wsdl2...

Author: damitha
Date: Wed Jun  7 04:22:25 2006
New Revision: 412366

URL: http://svn.apache.org/viewvc?rev=412366&view=rev
Log:
changes due to change of using axis2_url instead of axis2_uri

Added:
    webservices/axis2/trunk/c/axiom/include/axis2_om_util.h
      - copied unchanged from r412360, webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_om_util.h
    webservices/axis2/trunk/c/axiom/src/util/
    webservices/axis2/trunk/c/axiom/src/util/Makefile.am
    webservices/axis2/trunk/c/axiom/src/util/om_util.c
      - copied unchanged from r412360, webservices/axis2/trunk/c/xml_schema/src/om_util.c
Removed:
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_om_util.h
    webservices/axis2/trunk/c/xml_schema/src/om_util.c
Modified:
    webservices/axis2/trunk/c/axiom/configure.ac
    webservices/axis2/trunk/c/axiom/src/Makefile.am
    webservices/axis2/trunk/c/axiom/src/om/Makefile.am
    webservices/axis2/trunk/c/configure.ac
    webservices/axis2/trunk/c/woden/include/woden/axis2_woden_schema_constants.h
    webservices/axis2/trunk/c/woden/include/woden/axis2_woden_wsdl_obj.h
    webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_imported_schema.h
    webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_schema.h
    webservices/axis2/trunk/c/woden/include/woden/types/woden_nc_name.h
    webservices/axis2/trunk/c/woden/include/woden/types/woden_xml_char.h
    webservices/axis2/trunk/c/woden/include/woden/util/axis2_woden_generic_obj.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_binding.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_configurable_component.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_element_decl.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_endpoint.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_feature.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_import.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_op.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_nested_component.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_property.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_type_def.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_types.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_wsdl_component.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_wsdl_ref.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_direction.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_msg_label.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_soap_fault_code.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_soap_fault_subcodes.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_attr_extensible.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_component_exts.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_element_extensible.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_registry.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_binding_exts.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_binding_op_exts.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_header_block_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_op_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_configurable_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentable_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_endpoint_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_fault_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_feature_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_import_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_include_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_msg_ref_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_op_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_nested_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_property_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_svc_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_types_element.h
    webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_wsdl_element.h
    webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_uri_attr.h
    webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_xml_attr.h
    webservices/axis2/trunk/c/woden/src/Makefile.am
    webservices/axis2/trunk/c/woden/src/builder/reader.c
    webservices/axis2/trunk/c/woden/src/schema/imported_schema.c
    webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c
    webservices/axis2/trunk/c/woden/src/schema/schema.c
    webservices/axis2/trunk/c/woden/src/util/component_model_builder.c
    webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
    webservices/axis2/trunk/c/woden/src/xml/string_attr.c
    webservices/axis2/trunk/c/woden/src/xml/uri_attr.c
    webservices/axis2/trunk/c/woden/src/xml/xml_attr.c

Modified: webservices/axis2/trunk/c/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/configure.ac?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/configure.ac (original)
+++ webservices/axis2/trunk/c/axiom/configure.ac Wed Jun  7 04:22:25 2006
@@ -139,6 +139,7 @@
     src/parser/libxml2/Makefile \
     src/soap/Makefile \
     src/om/Makefile \
+    src/util/Makefile \
     src/attachments/Makefile \
     test/Makefile \
     test/om/Makefile \

Modified: webservices/axis2/trunk/c/axiom/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/Makefile.am?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/Makefile.am Wed Jun  7 04:22:25 2006
@@ -1,2 +1,2 @@
-SUBDIRS = parser attachments soap om
+SUBDIRS = parser attachments soap om util
 

Modified: webservices/axis2/trunk/c/axiom/src/om/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/Makefile.am?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/om/Makefile.am Wed Jun  7 04:22:25 2006
@@ -18,7 +18,8 @@
 
 libaxis2_axiom_la_LIBADD =  \
                     $(top_builddir)/src/soap/libaxis2_soap.la \
-					$(top_builddir)/src/attachments/libaxis2_attachments.la
+					$(top_builddir)/src/attachments/libaxis2_attachments.la \
+					$(top_builddir)/src/util/libaxis2_axiom_util.la
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/src/parser \

Added: webservices/axis2/trunk/c/axiom/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/Makefile.am?rev=412366&view=auto
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/Makefile.am (added)
+++ webservices/axis2/trunk/c/axiom/src/util/Makefile.am Wed Jun  7 04:22:25 2006
@@ -0,0 +1,10 @@
+noinst_LTLIBRARIES = libaxis2_axiom_util.la
+libaxis2_axiom_util_la_SOURCES = \
+                           om_util.c
+
+libaxis2_axiom_util_la_LIBADD = 
+INCLUDES = -I$(top_builddir)/include \
+            -I$(top_builddir)/src/parser \
+            -I$(top_builddir)/src/om \
+			@UTILINC@
+

Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed Jun  7 04:22:25 2006
@@ -25,7 +25,7 @@
 #CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
 CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
 if test "$GCC" = "yes"; then
-    CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration -Werror"
+    CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
 fi
 LDFLAGS="-lpthread"
 

Modified: webservices/axis2/trunk/c/woden/include/woden/axis2_woden_schema_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/axis2_woden_schema_constants.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/axis2_woden_schema_constants.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/axis2_woden_schema_constants.h Wed Jun  7 04:22:25 2006
@@ -23,7 +23,7 @@
  *          Constants for XML Schema elements, attributes and URIs.
  */
  
-#include <axis2_const.h>
+#include <axis2_utils.h>
 
 #ifdef __cplusplus
 extern "C" 

Modified: webservices/axis2/trunk/c/woden/include/woden/axis2_woden_wsdl_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/axis2_woden_wsdl_obj.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/axis2_woden_wsdl_obj.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/axis2_woden_wsdl_obj.h Wed Jun  7 04:22:25 2006
@@ -82,7 +82,7 @@
     get_component_exts_for_namespace) (
             void *wsdl_obj,
             const axis2_env_t *env,
-            axis2_url_t *namespc);
+            axis2_uri_t *namespc);
     
     /*
      * Store the extensions in a map using the namespace string as the key.
@@ -93,7 +93,7 @@
     set_component_exts) (
             void *wsdl_obj,
             const axis2_env_t *env,
-            axis2_url_t *namespc,
+            axis2_uri_t *namespc,
             struct axis2_woden_component_exts *exts);
 };
 

Modified: webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_imported_schema.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_imported_schema.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_imported_schema.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_imported_schema.h Wed Jun  7 04:22:25 2006
@@ -67,9 +67,9 @@
     set_location) (
             void *schema,
             const axis2_env_t *env,
-            struct axis2_url *location);
+            struct axis2_uri *location);
 
-    struct axis2_url *(AXIS2_CALL *
+    struct axis2_uri *(AXIS2_CALL *
     get_location) (
             void *schema,
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_schema.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_schema.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_schema.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/schema/axis2_woden_schema.h Wed Jun  7 04:22:25 2006
@@ -27,9 +27,9 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 
 #ifdef __cplusplus
@@ -66,9 +66,9 @@
     set_namespace) (
             void *schema,
             const axis2_env_t *env,
-            axis2_url_t *namespc);
+            axis2_uri_t *namespc);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_namespace) (
             void *schema,
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/types/woden_nc_name.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/types/woden_nc_name.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/types/woden_nc_name.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/types/woden_nc_name.h Wed Jun  7 04:22:25 2006
@@ -29,9 +29,9 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/woden/include/woden/types/woden_xml_char.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/types/woden_xml_char.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/types/woden_xml_char.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/types/woden_xml_char.h Wed Jun  7 04:22:25 2006
@@ -44,7 +44,7 @@
 #include <axis2_string.h>
 #include <axis2_utils.h>
 #include <axis2_hash.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/woden/include/woden/util/axis2_woden_generic_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/util/axis2_woden_generic_obj.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/util/axis2_woden_generic_obj.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/util/axis2_woden_generic_obj.h Wed Jun  7 04:22:25 2006
@@ -20,7 +20,7 @@
 #include <axis2_defines.h>
 #include <axis2_error.h>
 #include <axis2_env.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_binding.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_binding.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_binding.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_binding.h Wed Jun  7 04:22:25 2006
@@ -79,7 +79,7 @@
             void *binding,
             const axis2_env_t *env);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_type) (
             void *binding,
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_configurable_component.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_configurable_component.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_configurable_component.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_configurable_component.h Wed Jun  7 04:22:25 2006
@@ -29,9 +29,9 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/axis2_woden_wsdl_component.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_element_decl.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_element_decl.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_element_decl.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_element_decl.h Wed Jun  7 04:22:25 2006
@@ -37,10 +37,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <axis2_generic_obj.h>
 #include <woden/axis2_woden.h>
@@ -108,7 +108,7 @@
      *  
      * @return the URI identifying the type system
      */
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_system) (
             void *decl,
             const axis2_env_t *env); 
@@ -161,7 +161,7 @@
     set_system) (
             void *decl,
             const axis2_env_t *env,
-            axis2_url_t *type_system_uri); 
+            axis2_uri_t *type_system_uri); 
 
     axis2_status_t (AXIS2_CALL *
     set_content_model) (

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_endpoint.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_endpoint.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_endpoint.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_endpoint.h Wed Jun  7 04:22:25 2006
@@ -87,7 +87,7 @@
             void *endpoint,
             const axis2_env_t *env);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_address) (
             void *endpoint,
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_feature.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_feature.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_feature.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_feature.h Wed Jun  7 04:22:25 2006
@@ -74,7 +74,7 @@
             void *feature,
             const axis2_env_t *env);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_ref) (
             void *feature,
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_import.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_import.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_import.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_import.h Wed Jun  7 04:22:25 2006
@@ -69,7 +69,7 @@
             void *import,
             const axis2_env_t *env);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_namespace) (
             void *import,
             const axis2_env_t *env);
@@ -78,7 +78,7 @@
     set_namespace) (
             void *import,
             const axis2_env_t *env,
-            axis2_url_t *ns_uri);
+            axis2_uri_t *ns_uri);
 
 };
 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_op.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_op.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_interface_op.h Wed Jun  7 04:22:25 2006
@@ -73,7 +73,7 @@
             void *interface_op,
             const axis2_env_t *env);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_msg_exchange_pattern) (
             void *interface_op,
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_nested_component.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_nested_component.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_nested_component.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_nested_component.h Wed Jun  7 04:22:25 2006
@@ -33,7 +33,7 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/axis2_woden_wsdl_component.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_property.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_property.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_property.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_property.h Wed Jun  7 04:22:25 2006
@@ -74,7 +74,7 @@
             void *property,
             const axis2_env_t *env);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_ref) (
             void *property,
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_type_def.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_type_def.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_type_def.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_type_def.h Wed Jun  7 04:22:25 2006
@@ -31,7 +31,7 @@
 #include <woden/axis2_woden.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 
 /** @defgroup axis2_woden_type_def Type Definition
   * @ingroup axis2_wsdl
@@ -87,9 +87,9 @@
     set_system) (
             void *type_def,
             const axis2_env_t *env,
-            axis2_url_t *type_system_uri);
+            axis2_uri_t *type_system_uri);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_system) (
             void *type_def,
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_types.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_types.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_types.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_types.h Wed Jun  7 04:22:25 2006
@@ -147,7 +147,7 @@
     is_namespace_in_scope_with_namespace_uri) (
             void *types,
             const axis2_env_t *env,
-            axis2_url_t *namespc_uri);
+            axis2_uri_t *namespc_uri);
 
     /*
      * Indicates if the namespace represented by the specified QName

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_wsdl_component.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_wsdl_component.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_wsdl_component.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_wsdl_component.h Wed Jun  7 04:22:25 2006
@@ -29,9 +29,9 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 
 #ifdef __cplusplus
@@ -73,7 +73,7 @@
     get_component_exts_for_namespace) (
             void *wsdl_component,
             const axis2_env_t *env,
-            axis2_url_t *namespc);
+            axis2_uri_t *namespc);
 
 };
 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_wsdl_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_wsdl_ref.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_wsdl_ref.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/axis2_woden_wsdl_ref.h Wed Jun  7 04:22:25 2006
@@ -75,7 +75,7 @@
             void *wsdl_ref,
             const axis2_env_t *env);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_location) (
             void *wsdl_ref,
             const axis2_env_t *env);
@@ -84,7 +84,7 @@
     set_location) (
             void *wsdl_ref,
             const axis2_env_t *env,
-            axis2_url_t *loc_uri);
+            axis2_uri_t *loc_uri);
 
     void *(AXIS2_CALL *
     get_desc_element) (

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_direction.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_direction.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_direction.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_direction.h Wed Jun  7 04:22:25 2006
@@ -50,7 +50,7 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 #include <woden/axis2_woden.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_msg_label.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_msg_label.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_msg_label.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_msg_label.h Wed Jun  7 04:22:25 2006
@@ -51,7 +51,7 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 #include <woden/axis2_woden.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_soap_fault_code.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_soap_fault_code.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_soap_fault_code.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_soap_fault_code.h Wed Jun  7 04:22:25 2006
@@ -35,7 +35,7 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 #include <woden/axis2_woden.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_soap_fault_subcodes.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_soap_fault_subcodes.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_soap_fault_subcodes.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/enumeration/axis2_woden_soap_fault_subcodes.h Wed Jun  7 04:22:25 2006
@@ -36,7 +36,7 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 #include <woden/axis2_woden.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_attr_extensible.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_attr_extensible.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_attr_extensible.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_attr_extensible.h Wed Jun  7 04:22:25 2006
@@ -28,10 +28,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 
@@ -97,13 +97,13 @@
     get_ext_attrs_for_namespace) (
             void *extensible,
             const axis2_env_t *env,
-            axis2_url_t *namespc);
+            axis2_uri_t *namespc);
 
     axis2_bool_t (AXIS2_CALL *
     has_ext_attrs_for_namespace) (
             void *extensible,
             const axis2_env_t *env,
-            axis2_url_t *namespc);
+            axis2_uri_t *namespc);
 
 
 };

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_component_exts.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_component_exts.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_component_exts.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_component_exts.h Wed Jun  7 04:22:25 2006
@@ -43,10 +43,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 
 #ifdef __cplusplus
@@ -88,7 +88,7 @@
     type) (void *component_exts,
             const axis2_env_t *env);
     
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_namespace) (
             void *component_exts,
             const axis2_env_t *env);
@@ -98,7 +98,7 @@
             void *component_exts,
             const axis2_env_t *env,
             struct axis2_woden_wsdl_element *parent_el,
-            axis2_url_t *namespc);
+            axis2_uri_t *namespc);
 
     void *(AXIS2_CALL *
     get_parent_element) (

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_element_extensible.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_element_extensible.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_element_extensible.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_element_extensible.h Wed Jun  7 04:22:25 2006
@@ -28,10 +28,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 
@@ -99,7 +99,7 @@
     has_ext_elements_for_namespace) (
             void *extensible,
             const axis2_env_t *env,
-            axis2_url_t *namespc);
+            axis2_uri_t *namespc);
  
 };
 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_element.h Wed Jun  7 04:22:25 2006
@@ -36,7 +36,7 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 #include <woden/axis2_woden.h>
@@ -49,7 +49,7 @@
 typedef struct axis2_woden_ext_element axis2_woden_ext_element_t;
 typedef struct axis2_woden_ext_element_ops axis2_woden_ext_element_ops_t;
 struct axis2_xml_ext_element;
-struct axis2_url;
+struct axis2_uri;
 
 /** @defgroup axis2_woden_ext_element Extension Element
   * @ingroup axis2_wsdl

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_registry.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_registry.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_registry.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_registry.h Wed Jun  7 04:22:25 2006
@@ -27,10 +27,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 
@@ -217,7 +217,7 @@
             void *registry,
             const axis2_env_t *env,
             axis2_char_t *parent_class,
-            axis2_url_t *ext_namespc,
+            axis2_uri_t *ext_namespc,
             void *comp_ext);
 
     /**
@@ -233,7 +233,7 @@
             void *registry,
             const axis2_env_t *env,
             axis2_char_t *parent_class,
-            axis2_url_t *ext_namespc);
+            axis2_uri_t *ext_namespc);
 
     /**
     * Return the extension namespaces registered for the specified WSDL Component class.

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_binding_exts.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_binding_exts.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_binding_exts.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_binding_exts.h Wed Jun  7 04:22:25 2006
@@ -83,12 +83,12 @@
             void *binding_exts,
             const axis2_env_t *env);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_soap_underlying_protocol) (
             void *binding_exts,
             const axis2_env_t *env);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_soap_mep_default) (
             void *binding_exts,
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_binding_op_exts.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_binding_op_exts.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_binding_op_exts.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_binding_op_exts.h Wed Jun  7 04:22:25 2006
@@ -77,12 +77,12 @@
             void *soap_binding_op_exts,
             const axis2_env_t *env);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_soap_mep) (
             void *binding_op_exts,
             const axis2_env_t *env);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_soap_action) (
             void *binding_op_exts,
             const axis2_env_t *env); 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_header_block_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_header_block_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_header_block_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_header_block_element.h Wed Jun  7 04:22:25 2006
@@ -28,10 +28,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/extensions/axis2_woden_ext_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module.h Wed Jun  7 04:22:25 2006
@@ -73,7 +73,7 @@
      *  Component model methods (SOAPHeaderBlock interface), some shared with Element model
      * ***********************************************************************/
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_ref) (
             void *module,
             axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/soap/axis2_woden_soap_module_element.h Wed Jun  7 04:22:25 2006
@@ -29,10 +29,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/extensions/axis2_woden_ext_element.h>
@@ -73,9 +73,9 @@
     set_ref) (
             void *soap_module_element,
             const axis2_env_t *env,
-            axis2_url_t *uri);
+            axis2_uri_t *uri);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_ref) (
             void *soap_module_element,
             const axis2_env_t *env); 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_element.h Wed Jun  7 04:22:25 2006
@@ -27,10 +27,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
@@ -122,9 +122,9 @@
     set_type) (
             void *binding_element,
             const axis2_env_t *env,
-            axis2_url_t *type);
+            axis2_uri_t *type);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_type) (
             void *binding_element,
             const axis2_env_t *env); 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_element.h Wed Jun  7 04:22:25 2006
@@ -27,10 +27,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_ref_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_fault_ref_element.h Wed Jun  7 04:22:25 2006
@@ -28,10 +28,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_msg_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_msg_ref_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_msg_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_msg_ref_element.h Wed Jun  7 04:22:25 2006
@@ -28,10 +28,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_op_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_op_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_op_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_binding_op_element.h Wed Jun  7 04:22:25 2006
@@ -28,10 +28,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_configurable_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_configurable_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_configurable_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_configurable_element.h Wed Jun  7 04:22:25 2006
@@ -37,7 +37,7 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 #include <woden/axis2_woden.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_desc_element.h Wed Jun  7 04:22:25 2006
@@ -35,10 +35,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
 #include <woden/wsdl20/xml/axis2_woden_nested_element.h>
@@ -76,9 +76,9 @@
     set_document_base_uri) (
             void *desc_ele,
             const axis2_env_t *env,
-            axis2_url_t *document_base_uri);
+            axis2_uri_t *document_base_uri);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_document_base_uri) (
             void *desc_ele,
             const axis2_env_t *env);
@@ -90,9 +90,9 @@
     set_target_namespace) (
             void *desc_ele,
             const axis2_env_t *env,
-            axis2_url_t *namespace_uri);
+            axis2_uri_t *namespace_uri);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_target_namespace) (
             void *desc_ele,
             const axis2_env_t *env);
@@ -115,7 +115,7 @@
             void *desc_el,
             const axis2_env_t *env,
             axis2_char_t *prefix,
-            axis2_url_t *namespc);
+            axis2_uri_t *namespc);
     
     axis2_status_t (AXIS2_CALL *
     remove_namespace) (
@@ -128,10 +128,10 @@
      * there is no namespace URI associated with this prefix. This is
      * unrelated to the &lt;wsdl:import&gt; element.
      *
-     * @see #add_namespace(axis2_char_t , axis2_url_t)
+     * @see #add_namespace(axis2_char_t , axis2_uri_t)
      * @see #get_prefix(axis2_char_t)
      */
-    axis2_url_t *(AXIS2_CALL * 
+    axis2_uri_t *(AXIS2_CALL * 
     get_namespace) (
             void *desc_el,
             const axis2_env_t *env,

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentable_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentable_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentable_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentable_element.h Wed Jun  7 04:22:25 2006
@@ -30,7 +30,7 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_array_list.h>
 #include <woden/wsdl20/xml/axis2_woden_wsdl_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_documentation_element.h Wed Jun  7 04:22:25 2006
@@ -31,7 +31,7 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 #include <woden/wsdl20/xml/axis2_woden_wsdl_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_endpoint_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_endpoint_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_endpoint_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_endpoint_element.h Wed Jun  7 04:22:25 2006
@@ -29,10 +29,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
 #include <woden/wsdl20/xml/axis2_woden_configurable_element.h>
@@ -100,9 +100,9 @@
     set_address) (
             void *endpoint_el,
             const axis2_env_t *env,
-            axis2_url_t *uri);
+            axis2_uri_t *uri);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_address) (
             void *endpoint_el,
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_fault_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_fault_ref_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_fault_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_fault_ref_element.h Wed Jun  7 04:22:25 2006
@@ -29,10 +29,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_feature_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_feature_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_feature_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_feature_element.h Wed Jun  7 04:22:25 2006
@@ -28,10 +28,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
 #include <woden/wsdl20/xml/axis2_woden_nested_element.h>
@@ -68,9 +68,9 @@
     axis2_status_t (AXIS2_CALL *
     set_ref) (void *doc_el,
             const axis2_env_t *env,
-            axis2_url_t *uri);
+            axis2_uri_t *uri);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_ref) (void *doc_el,
             const axis2_env_t *env);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_import_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_import_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_import_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_import_element.h Wed Jun  7 04:22:25 2006
@@ -30,10 +30,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
 #include <woden/wsdl20/xml/axis2_woden_nested_element.h>
@@ -70,9 +70,9 @@
     axis2_status_t (AXIS2_CALL *
     set_namespace) (void *import_el,
             const axis2_env_t *env,
-            axis2_url_t *ns_uri);
+            axis2_uri_t *ns_uri);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_namespace) (void *import_el,
             const axis2_env_t *env);
 
@@ -80,9 +80,9 @@
     axis2_status_t (AXIS2_CALL *
     set_location) (void *import_el,
             const axis2_env_t *env,
-            axis2_url_t *loc_uri);
+            axis2_uri_t *loc_uri);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_location) (void *import_el,
             const axis2_env_t *env);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_include_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_include_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_include_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_include_element.h Wed Jun  7 04:22:25 2006
@@ -30,10 +30,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
 #include <woden/wsdl20/xml/axis2_woden_nested_element.h>
@@ -70,9 +70,9 @@
     axis2_status_t (AXIS2_CALL *
     set_location) (void *include_el,
             const axis2_env_t *env,
-            axis2_url_t *loc_uri);
+            axis2_uri_t *loc_uri);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_location) (void *include_el,
             const axis2_env_t *env);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_element.h Wed Jun  7 04:22:25 2006
@@ -29,10 +29,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
@@ -94,9 +94,9 @@
     add_style_default_uri) (
             void *interface_element,
             const axis2_env_t *env,
-            axis2_url_t *uri);
+            axis2_uri_t *uri);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_style_default) (
             void *interface_element,
             const axis2_env_t *env); 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_element.h Wed Jun  7 04:22:25 2006
@@ -30,10 +30,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_fault_ref_element.h Wed Jun  7 04:22:25 2006
@@ -30,10 +30,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_msg_ref_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_msg_ref_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_msg_ref_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_msg_ref_element.h Wed Jun  7 04:22:25 2006
@@ -28,10 +28,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_op_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_op_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_op_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_interface_op_element.h Wed Jun  7 04:22:25 2006
@@ -30,10 +30,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
@@ -85,9 +85,9 @@
     set_pattern) (
             void *iface_op_ele,
             const axis2_env_t *env,
-            axis2_url_t *uri);
+            axis2_uri_t *uri);
     
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_pattern) (
             void *iface_op_ele,
             const axis2_env_t *env);
@@ -96,15 +96,15 @@
     add_style_uri) (
             void *iface_op_ele,
             const axis2_env_t *env,
-            axis2_url_t *uri);
+            axis2_uri_t *uri);
 
     axis2_status_t (AXIS2_CALL *
     remove_style_uri) (
             void *iface_op_ele,
             const axis2_env_t *env,
-            axis2_url_t *uri);
+            axis2_uri_t *uri);
     
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_style) (
             void *iface_op_ele,
             const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_nested_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_nested_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_nested_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_nested_element.h Wed Jun  7 04:22:25 2006
@@ -36,7 +36,7 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 #include <woden/axis2_woden.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_property_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_property_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_property_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_property_element.h Wed Jun  7 04:22:25 2006
@@ -37,10 +37,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
 #include <woden/wsdl20/xml/axis2_woden_nested_element.h>
@@ -80,9 +80,9 @@
     axis2_status_t (AXIS2_CALL *
     set_ref) (void *doc_el,
             const axis2_env_t *env,
-            axis2_url_t *uri);
+            axis2_uri_t *uri);
 
-    axis2_url_t *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_ref) (void *doc_el,
             const axis2_env_t *env);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_svc_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_svc_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_svc_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_svc_element.h Wed Jun  7 04:22:25 2006
@@ -28,10 +28,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
 #include <woden/wsdl20/xml/axis2_woden_configurable_element.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_types_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_types_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_types_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_types_element.h Wed Jun  7 04:22:25 2006
@@ -38,10 +38,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/xml/axis2_woden_documentable_element.h>
 #include <xml_schema/axis2_xml_schema.h>
@@ -141,7 +141,7 @@
     get_schemas_with_namespace) (
             void *types_el,
             const axis2_env_t *env,
-            axis2_url_t *namespc);
+            axis2_uri_t *namespc);
 
     /**
      * Return all schemas inlined within the &lt;types&gt; element, in the order

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_wsdl_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_wsdl_element.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_wsdl_element.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/xml/axis2_woden_wsdl_element.h Wed Jun  7 04:22:25 2006
@@ -30,10 +30,10 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 #include <axis2_array_list.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/extensions/axis2_woden_attr_extensible.h>

Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_uri_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_uri_attr.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_uri_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_uri_attr.h Wed Jun  7 04:22:25 2006
@@ -24,6 +24,7 @@
  */
 
 #include <woden/axis2_woden.h>
+#include <axis2_uri.h>
 #include <woden/xml/axis2_woden_xml_attr.h>
 
 /** @defgroup axis2_woden_uri_attr URI Attribute
@@ -74,7 +75,7 @@
      *  QNameAttr interface declared methods 
      * ************************************************************/
 
-    struct axis2_url *(AXIS2_CALL *
+    axis2_uri_t *(AXIS2_CALL *
     get_uri) (
             void *uri_attr,
             const axis2_env_t *env);
@@ -84,7 +85,7 @@
      * ************************************************************/
     
     /*
-     * Convert a string of type xs:anyURI to a axis2_url_t.
+     * Convert a string of type xs:anyURI to a axis2_uri_t.
      * An empty string argument will return an empty string URI.
      * A null argument will return a null value.
      * Any conversion error will be reported and a null value will be returned.

Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_xml_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_xml_attr.h?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_xml_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_xml_attr.h Wed Jun  7 04:22:25 2006
@@ -28,7 +28,7 @@
 #include <axis2_env.h>
 #include <axis2_error.h>
 #include <axis2_string.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 #include <axis2_generic_obj.h>

Modified: webservices/axis2/trunk/c/woden/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/Makefile.am?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/woden/src/Makefile.am Wed Jun  7 04:22:25 2006
@@ -1 +1 @@
-SUBDIRS = util types schema xml wsdl20 builder
+SUBDIRS = util types schema xml wsdl20

Modified: webservices/axis2/trunk/c/woden/src/builder/reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/reader.c?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/reader.c Wed Jun  7 04:22:25 2006
@@ -166,9 +166,9 @@
     woden_reader_impl_t *reader_impl = NULL;
     void *desc = NULL;
     void *ext_reg = NULL;
-    axis2_url_t *uri = NULL;
+    axis2_uri_t *uri = NULL;
     axis2_char_t *target_namespc = NULL;
-    axis2_url_t *target_namespc_uri = NULL;
+    axis2_uri_t *target_namespc_uri = NULL;
     axis2_om_element_t *desc_el = NULL;
     axis2_hash_t *attrs = NULL;
     axis2_hash_index_t *index = NULL;
@@ -461,7 +461,7 @@
 
     if(NULL != namespc_uri) 
     {
-        axis2_url_t *uri = NULL;
+        axis2_uri_t *uri = NULL;
 
         /* TODO handle missing namespace attribute (REQUIRED attr) */
         uri = get_uri(reader, env, namespc_uri);
@@ -470,7 +470,7 @@
     
     if(NULL != location_uri)
     {
-        axis2_url_t *uri = NULL;
+        axis2_uri_t *uri = NULL;
         void *imported_desc = NULL;
         
         /* TODO handle missing locationURI (OPTIONAL attr) */
@@ -617,9 +617,9 @@
 {
     woden_reader_impl_t *reader_impl = NULL;
     void *schema = NULL;
-    axis2_url_t *uri = NULL;
+    axis2_uri_t *uri = NULL;
     void *schema_def = NULL; 
-    axis2_url_t *context_uri = NULL;
+    axis2_uri_t *context_uri = NULL;
     axis2_char_t *shcema_loc = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -658,7 +658,7 @@
     desc = axis2_woden_desc_to_desc_element(desc, env);
     context_uri = AXIS2_WODEN_DESC_ELEMENT_GET_DOCUMENT_BASE_URI(desc, env);
     uri = AXIS2_WODEN_IMPORTED_SCHEMA_GET_LOCATION(schema, env);
-    schema_loc = AXIS2_URL_TO_EXTERNAL_FORM(uri, env);
+    schema_loc = AXIS2_URI_TO_STRING(uri, env);
     uri = axis2_string_util_get_url(env, context_uri, schema_loc);
     if(AXIS2_ERROR_NONE != AXIS2_ERROR_GET_STATUS_CODE(env->error))
     {
@@ -726,11 +726,11 @@
     if(NULL != name)
     {
         axis2_qname_t *qname = NULL;
-        axis2_url_t *namespc = NULL;
+        axis2_uri_t *namespc = NULL;
         axis2_char_t *namespc_str = NULL;
 
         namespc = AXIS2_WODEN_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
-        namespc_str = AXIS2_URL_TO_EXTERNAL_FORM(namespc, env);
+        namespc_str = AXIS2_URI_TO_STRING(namespc, env);
         qname = axis2_qname_create(env, name, namespc_str, NULL);
         intface = axis2_woden_interface_to_interface_element(intface, env);
         AXIS2_WODEN_INTERFACE_ELEMENT_SET_QNAME(intface, env, qname);
@@ -751,7 +751,7 @@
         for(i = 0; i < size; i++)
         {
             uri_str = AXIS2_ARRAY_LIST_GET(string_list, env, i);
-            axis2_url_t *uri = NULL;
+            axis2_uri_t *uri = NULL;
             intface = axis2_woden_interface_to_interface_element(intface, env);
             uri = get_uri(reader, env, uri_str);
             AXIS2_WODEN_INTERFACE_ELMENT_ADD_STYLE_DEFAULT_URI(intface, env, uri);
@@ -877,13 +877,13 @@
     if(NULL != name)
     {
         axis2_qname_t *qname = NULL;
-        axis2_url_t *namespc = NULL;
+        axis2_uri_t *namespc = NULL;
         axis2_char_t *namespc_str = NULL;
 
         ns = AXIS2_WODEN_DESC_ELEMENT_GET_TARGET_NAMESPACE(desc, env);
         if(!ns)
             ns_str = WODEN_VALUE_EMPTY_STRING;
-        ns_str = AXIS2_URL_TO_EXTERNAL_FORM(ns, env);
+        ns_str = AXIS2_URI_TO_STRING(ns, env);
         qname = axis2_qname_create(env, name, ns_str, NULL);
         fault = axis2_woden_interface_to_interface_fault_element(fault, env);
         AXIS2_WODEN_INTERFACE_FAULT_ELEMENT_SET_QNAME(fault, env, qname);
@@ -2357,8 +2357,8 @@
         void *desc,
         axis2_hash_t *wsdl_modules)
 {
-    axis2_url_t *context_uri = NULL;
-    axis2_url_t *location_uri = NULL;
+    axis2_uri_t *context_uri = NULL;
+    axis2_uri_t *location_uri = NULL;
     axis2_char_t *location_str = NULL;
     void *referenced_desc = NULL;
 
@@ -2372,7 +2372,7 @@
         /* Can't continue import with a bad URL.*/
         return NULL;
     }
-    location_str = AXIS2_URL_TO_EXTERNAL_FORM(location_uri, env);
+    location_str = AXIS2_URI_TO_STRING(location_uri, env);
 
     /* Check if WSDL imported or included previously from this location.*/
     referenced_desc = axis2_hash_get(wsdl_modules, location_str, AXIS2_HASH_KEY_STRING);
@@ -2512,7 +2512,7 @@
     
 }
 
-static axis2_url_t *
+static axis2_uri_t *
 get_uri(
         void *reader,
         static axis2_env_t *env,
@@ -2526,10 +2526,10 @@
 
     if(reader_impl->uri)
     {
-        AXIS2_URL_FREE(reader_impl->uri, env);
+        AXIS2_URI_FREE(reader_impl->uri, env);
         reader_impl->uri = NULL;
     }
-    reader_impl->uri = axis2_url_parse_string(env, uri_str);
+    reader_impl->uri = axis2_uri_parse_string(env, uri_str);
     
     return reader_impl->uri;
 }

Modified: webservices/axis2/trunk/c/woden/src/schema/imported_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/imported_schema.c?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/imported_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/imported_schema.c Wed Jun  7 04:22:25 2006
@@ -16,7 +16,7 @@
 
 #include <woden/schema/axis2_woden_imported_schema.h>
 #include <xml_schema/axis2_xml_schema.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 
 typedef struct axis2_woden_imported_schema_impl axis2_woden_imported_schema_impl_t;
 
@@ -30,7 +30,7 @@
     axis2_woden_schema_t *schema;
     axis2_woden_obj_types_t obj_type;
     axis2_hash_t *methods;
-    axis2_url_t *f_schema_location;
+    axis2_uri_t *f_schema_location;
 };
 
 #define INTF_TO_IMPL(schema) \
@@ -55,9 +55,9 @@
 axis2_woden_imported_schema_set_location(
         void *schema,
         const axis2_env_t *env,
-        axis2_url_t *location);
+        axis2_uri_t *location);
 
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
 axis2_woden_imported_schema_get_location(
         void *schema,
         const axis2_env_t *env);
@@ -66,9 +66,9 @@
 axis2_woden_imported_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
-        axis2_url_t *namespc);
+        axis2_uri_t *namespc);
 
-axis2_url_t *AXIS2_CALL 
+axis2_uri_t *AXIS2_CALL 
 axis2_woden_imported_schema_get_namespace(
         void *schema,
         const axis2_env_t *env);
@@ -261,7 +261,7 @@
 
     if(schema_impl->f_schema_location)
     {
-        AXIS2_URL_FREE(schema_impl->f_schema_location, env);
+        AXIS2_URI_FREE(schema_impl->f_schema_location, env);
         schema_impl->f_schema_location = NULL;
     }
  
@@ -332,7 +332,7 @@
 axis2_woden_imported_schema_set_location(
         void *schema,
         const axis2_env_t *env,
-        axis2_url_t *location)
+        axis2_uri_t *location)
 {
     axis2_woden_imported_schema_impl_t *schema_impl = NULL;
 
@@ -341,14 +341,14 @@
 
     if(schema_impl->f_schema_location)
     {
-        AXIS2_URL_FREE(schema_impl->f_schema_location, env);
+        AXIS2_URI_FREE(schema_impl->f_schema_location, env);
         schema_impl->f_schema_location = NULL;
     }
     schema_impl->f_schema_location = location;
     return AXIS2_SUCCESS;
 }
 
-axis2_url_t *AXIS2_CALL 
+axis2_uri_t *AXIS2_CALL 
 axis2_woden_imported_schema_get_location(
         void *schema,
         const axis2_env_t *env)
@@ -365,7 +365,7 @@
 axis2_woden_imported_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
-        axis2_url_t *namespc)
+        axis2_uri_t *namespc)
 {
     axis2_woden_imported_schema_impl_t *schema_impl = NULL;
 
@@ -376,7 +376,7 @@
     return AXIS2_WODEN_SCHEMA_SET_NAMESPACE(schema_impl->schema, env, namespc);
 }
 
-axis2_url_t *AXIS2_CALL 
+axis2_uri_t *AXIS2_CALL 
 axis2_woden_imported_schema_get_namespace(
         void *schema,
         const axis2_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c Wed Jun  7 04:22:25 2006
@@ -16,7 +16,7 @@
 
 #include <woden/schema/axis2_woden_inlined_schema.h>
 #include <xml_schema/axis2_xml_schema.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
 
 typedef struct axis2_woden_inlined_schema_impl axis2_woden_inlined_schema_impl_t;
 
@@ -66,9 +66,9 @@
 axis2_woden_inlined_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
-        axis2_url_t *namespc);
+        axis2_uri_t *namespc);
 
-axis2_url_t *AXIS2_CALL 
+axis2_uri_t *AXIS2_CALL 
 axis2_woden_inlined_schema_get_namespace(
         void *schema,
         const axis2_env_t *env);
@@ -366,7 +366,7 @@
 axis2_woden_inlined_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
-        axis2_url_t *namespc)
+        axis2_uri_t *namespc)
 {
     axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
 
@@ -377,7 +377,7 @@
     return AXIS2_WODEN_SCHEMA_SET_NAMESPACE(schema_impl->schema, env, namespc);
 }
 
-axis2_url_t *AXIS2_CALL 
+axis2_uri_t *AXIS2_CALL 
 axis2_woden_inlined_schema_get_namespace(
         void *schema,
         const axis2_env_t *env)

Modified: webservices/axis2/trunk/c/woden/src/schema/schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/schema.c?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/schema.c Wed Jun  7 04:22:25 2006
@@ -26,7 +26,7 @@
 struct axis2_woden_schema_impl
 {
     axis2_woden_schema_t schema;
-    axis2_url_t *f_namespc;
+    axis2_uri_t *f_namespc;
     axis2_xml_schema_t *f_schema_def;
     axis2_bool_t f_is_referenceable;
 };
@@ -42,9 +42,9 @@
 axis2_woden_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
-        axis2_url_t *namespc);
+        axis2_uri_t *namespc);
 
-axis2_url_t *AXIS2_CALL 
+axis2_uri_t *AXIS2_CALL 
 axis2_woden_schema_get_namespace(
         void *schema,
         const axis2_env_t *env);
@@ -176,7 +176,7 @@
 axis2_woden_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
-        axis2_url_t *namespc)
+        axis2_uri_t *namespc)
 {
     axis2_woden_schema_impl_t *schema_impl = NULL;
 
@@ -186,7 +186,7 @@
 
     if(schema_impl->f_namespc)
     {
-        AXIS2_URL_FREE(schema_impl->f_namespc, env);
+        AXIS2_URI_FREE(schema_impl->f_namespc, env);
         schema_impl->f_namespc = NULL;
     }
     schema_impl->f_namespc = namespc;
@@ -194,7 +194,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_url_t *AXIS2_CALL 
+axis2_uri_t *AXIS2_CALL 
 axis2_woden_schema_get_namespace(
         void *schema,
         const axis2_env_t *env)
@@ -282,6 +282,6 @@
     schema_impl = INTF_TO_IMPL(schema);
 
     return schema_impl->f_namespc != NULL ? 
-        AXIS2_URL_TO_EXTERNAL_FORM(schema_impl->f_namespc, env) : NULL;
+        AXIS2_URI_TO_STRING(schema_impl->f_namespc, env) : NULL;
 }
 



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