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 12:51:50 UTC
svn commit: r412362 - in /webservices/axis2/trunk/c/woden/src/wsdl20: ./
extensions/ extensions/soap/
Author: damitha
Date: Wed Jun 7 03:51:49 2006
New Revision: 412362
URL: http://svn.apache.org/viewvc?rev=412362&view=rev
Log:
Made changes to take axis2_uri instead of axis2_url
Modified:
webservices/axis2/trunk/c/woden/src/wsdl20/binding.c
webservices/axis2/trunk/c/woden/src/wsdl20/desc.c
webservices/axis2/trunk/c/woden/src/wsdl20/documentation.c
webservices/axis2/trunk/c/woden/src/wsdl20/element_decl.c
webservices/axis2/trunk/c/woden/src/wsdl20/endpoint.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/attr_extensible.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/component_exts.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/element_extensible.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/ext_registry.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/axis2_woden_soap_constants.h
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_binding_exts.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_binding_op_exts.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module.c
webservices/axis2/trunk/c/woden/src/wsdl20/feature.c
webservices/axis2/trunk/c/woden/src/wsdl20/import.c
webservices/axis2/trunk/c/woden/src/wsdl20/interface.c
webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault.c
webservices/axis2/trunk/c/woden/src/wsdl20/interface_op.c
webservices/axis2/trunk/c/woden/src/wsdl20/property.c
webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c
webservices/axis2/trunk/c/woden/src/wsdl20/types.c
webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_element.c
webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_obj.c
webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_ref.c
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/binding.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/binding.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/binding.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/binding.c Wed Jun 7 03:51:49 2006
@@ -39,7 +39,7 @@
axis2_qname_t *f_qname;
axis2_qname_t *f_interface_qname;
void *f_interface;
- axis2_url_t *f_type;
+ axis2_uri_t *f_type;
/*
* Binding faults and operations may be referred to specifically by the qname represented by
* their 'ref' attribute. This typically suggests a Map implementation keyed by 'ref' qname.
@@ -88,7 +88,7 @@
void *binding,
const axis2_env_t *env);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_binding_get_type(
void *binding,
const axis2_env_t *env);
@@ -137,7 +137,7 @@
axis2_woden_binding_set_type(
void *binding,
const axis2_env_t *env,
- axis2_url_t *type);
+ axis2_uri_t *type);
axis2_status_t AXIS2_CALL
axis2_woden_binding_add_binding_fault_element(
@@ -654,7 +654,7 @@
if(binding_impl->f_type)
{
- AXIS2_URL_FREE(binding_impl->f_type, env);
+ AXIS2_URI_FREE(binding_impl->f_type, env);
binding_impl->f_type = NULL;
}
@@ -855,7 +855,7 @@
return binding_impl->f_interface;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_binding_get_type(
void *binding,
const axis2_env_t *env)
@@ -1007,7 +1007,7 @@
axis2_woden_binding_set_type(
void *binding,
const axis2_env_t *env,
- axis2_url_t *type)
+ axis2_uri_t *type)
{
axis2_woden_binding_impl_t *binding_impl = NULL;
axis2_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/desc.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/desc.c Wed Jun 7 03:51:49 2006
@@ -41,9 +41,9 @@
axis2_array_list_t *f_all_element_decls;
axis2_array_list_t *f_all_type_defs;
/* WSDL Element model data */
- axis2_url_t *f_doc_base_uri;
+ axis2_uri_t *f_doc_base_uri;
/* <description> attributes */
- axis2_url_t *f_target_namespc;
+ axis2_uri_t *f_target_namespc;
axis2_hash_t *f_namespcs;
/* <description> child elements */
axis2_array_list_t *f_import_elements;
@@ -138,15 +138,15 @@
axis2_woden_desc_set_document_base_uri(
void *desc,
const axis2_env_t *env,
- axis2_url_t *doc_base_uri);
+ axis2_uri_t *doc_base_uri);
axis2_status_t AXIS2_CALL
axis2_woden_desc_set_target_namespace(
void *desc,
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_desc_get_target_namespace(
void *desc,
const axis2_env_t *env);
@@ -156,7 +156,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_status_t AXIS2_CALL
axis2_woden_desc_remove_namespace(
@@ -164,7 +164,7 @@
const axis2_env_t *env,
axis2_char_t *prefix);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_desc_get_namespace(
void *desc,
const axis2_env_t *env,
@@ -180,7 +180,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *import_el);
+ axis2_uri_t *import_el);
axis2_array_list_t *AXIS2_CALL
axis2_woden_desc_get_import_elements(
@@ -192,7 +192,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *include_el);
+ axis2_uri_t *include_el);
axis2_array_list_t *AXIS2_CALL
axis2_woden_desc_get_include_elements(
@@ -205,7 +205,7 @@
const axis2_env_t *env,
void *types_el);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_desc_get_types_element(
void *desc,
const axis2_env_t *env);
@@ -215,7 +215,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *interface_el);
+ axis2_uri_t *interface_el);
axis2_array_list_t *AXIS2_CALL
axis2_woden_desc_get_interface_elements(
@@ -227,7 +227,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *binding_el);
+ axis2_uri_t *binding_el);
axis2_array_list_t *AXIS2_CALL
axis2_woden_desc_get_binding_elements(
@@ -239,7 +239,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *svc_el);
+ axis2_uri_t *svc_el);
axis2_array_list_t *AXIS2_CALL
axis2_woden_desc_get_svc_elements(
@@ -842,7 +842,7 @@
if(desc_impl->f_ref)
{
- AXIS2_URL_FREE(desc_impl->f_ref, env);
+ AXIS2_URI_FREE(desc_impl->f_ref, env);
desc_impl->f_ref = NULL;
}
@@ -1204,7 +1204,7 @@
axis2_woden_desc_set_document_base_uri(
void *desc,
const axis2_env_t *env,
- axis2_url_t *doc_base_uri)
+ axis2_uri_t *doc_base_uri)
{
axis2_woden_desc_impl_t *desc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -1227,7 +1227,7 @@
axis2_woden_desc_set_target_namespace(
void *desc,
const axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_desc_impl_t *desc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -1246,7 +1246,7 @@
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_desc_get_target_namespace(
void *desc,
const axis2_env_t *env)
@@ -1267,7 +1267,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_desc_impl_t *desc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -1307,7 +1307,7 @@
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_desc_get_namespace(
void *desc,
const axis2_env_t *env,
@@ -1347,7 +1347,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *import_el)
+ axis2_uri_t *import_el)
{
axis2_woden_desc_impl_t *desc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -1382,7 +1382,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *include_el)
+ axis2_uri_t *include_el)
{
axis2_woden_desc_impl_t *desc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -1435,7 +1435,7 @@
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_desc_get_types_element(
void *desc,
const axis2_env_t *env)
@@ -1456,7 +1456,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *interface_el)
+ axis2_uri_t *interface_el)
{
axis2_woden_desc_impl_t *desc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -1491,7 +1491,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *binding_el)
+ axis2_uri_t *binding_el)
{
axis2_woden_desc_impl_t *desc_impl = NULL;
axis2_hash_t *super = NULL;
@@ -1526,7 +1526,7 @@
void *desc,
const axis2_env_t *env,
axis2_char_t *prefix,
- axis2_url_t *svc_el)
+ axis2_uri_t *svc_el)
{
axis2_woden_desc_impl_t *desc_impl = NULL;
axis2_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/documentation.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/documentation.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/documentation.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/documentation.c Wed Jun 7 03:51:49 2006
@@ -91,13 +91,13 @@
axis2_woden_documentation_get_ext_attrs_for_namespace(
void *documentation,
const axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_bool_t AXIS2_CALL
axis2_woden_documentation_has_ext_attrs_for_namespace(
void *documentation,
const axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_status_t AXIS2_CALL
axis2_woden_documentation_add_ext_element(
@@ -126,7 +126,7 @@
axis2_woden_documentation_has_ext_elements_for_namespace(
void *documentation,
const axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
static axis2_woden_documentation_t *
create(const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/element_decl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/element_decl.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/element_decl.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/element_decl.c Wed Jun 7 03:51:49 2006
@@ -15,7 +15,7 @@
*/
#include <woden/wsdl20/axis2_woden_element_decl.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
#include <axis2_hash.h>
typedef struct axis2_woden_element_decl_impl axis2_woden_element_decl_impl_t;
@@ -30,7 +30,7 @@
axis2_woden_obj_types_t obj_type;
axis2_hash_t *super;
axis2_qname_t *f_qname;
- axis2_url_t *f_system;
+ axis2_uri_t *f_system;
axis2_char_t *f_content_model;
axis2_generic_obj_t *f_content;
};
@@ -61,7 +61,7 @@
void *decl,
const axis2_env_t *env);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_element_decl_get_system(
void *decl,
const axis2_env_t *env);
@@ -90,7 +90,7 @@
axis2_woden_element_decl_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
axis2_woden_element_decl_set_content_model(
@@ -306,7 +306,7 @@
return decl_impl->f_qname;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_element_decl_get_system(
void *decl,
const axis2_env_t *env)
@@ -389,7 +389,7 @@
axis2_woden_element_decl_set_system(
void *decl,
const axis2_env_t *env,
- axis2_url_t *type_system_uri)
+ axis2_uri_t *type_system_uri)
{
axis2_woden_element_decl_impl_t *decl_impl = NULL;
axis2_hash_t *super = NULL;
@@ -402,7 +402,7 @@
if(decl_impl->f_system)
{
- AXIS2_URL_FREE(decl_impl->f_system, env);
+ AXIS2_URI_FREE(decl_impl->f_system, env);
}
decl_impl->f_system = type_system_uri;
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/endpoint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/endpoint.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/endpoint.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/endpoint.c Wed Jun 7 03:51:49 2006
@@ -37,7 +37,7 @@
woden_nc_name_t *f_name;
axis2_qname_t *f_binding_qname;
void *f_binding;
- axis2_url_t *f_address;
+ axis2_uri_t *f_address;
};
#define INTF_TO_IMPL(endpoint) ((axis2_woden_endpoint_impl_t *) endpoint)
@@ -76,7 +76,7 @@
void *endpoint,
const axis2_env_t *env);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_endpoint_get_address(
void *endpoint,
const axis2_env_t *env);
@@ -110,7 +110,7 @@
axis2_woden_endpoint_set_address(
void *endpoint,
const axis2_env_t *env,
- axis2_url_t *uri);
+ axis2_uri_t *uri);
/******************************************************************************
* Non-API implementation methods
@@ -552,7 +552,7 @@
if(endpoint_impl->f_address)
{
- AXIS2_URL_FREE(endpoint_impl->f_address, env);
+ AXIS2_URI_FREE(endpoint_impl->f_address, env);
endpoint_impl->f_address = NULL;
}
@@ -713,7 +713,7 @@
return endpoint_impl->f_binding;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_endpoint_get_address(
void *endpoint,
const axis2_env_t *env)
@@ -813,7 +813,7 @@
axis2_woden_endpoint_set_address(
void *endpoint,
const axis2_env_t *env,
- axis2_url_t *uri)
+ axis2_uri_t *uri)
{
axis2_woden_endpoint_impl_t *endpoint_impl = NULL;
axis2_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/attr_extensible.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/attr_extensible.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/attr_extensible.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/attr_extensible.c Wed Jun 7 03:51:49 2006
@@ -16,7 +16,7 @@
#include <woden/wsdl20/extensions/axis2_woden_attr_extensible.h>
#include <woden/xml/axis2_woden_xml_attr.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
#include <axis2_hash.h>
typedef struct axis2_woden_attr_extensible_impl axis2_woden_attr_extensible_impl_t;
@@ -74,13 +74,13 @@
axis2_woden_attr_extensible_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
axis2_woden_attr_extensible_has_ext_attrs_for_namespace(
void *extensible,
const axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
@@ -356,7 +356,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_woden_attr_extensible_get_ext_attrs_for_namespace(void *extensible,
const axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_attr_extensible_impl_t *extensible_impl = NULL;
axis2_char_t *str_namespc = NULL;
@@ -369,7 +369,7 @@
extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_ATTR_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
- str_namespc = AXIS2_URL_TO_EXTERNAL_FORM(namespc, env);
+ str_namespc = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
if(extensible_impl->temp_attrs)
{
int size = 0, i = 0;
@@ -401,7 +401,7 @@
axis2_bool_t AXIS2_CALL
axis2_woden_attr_extensible_has_ext_attrs_for_namespace(void *extensible,
const axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_attr_extensible_impl_t *extensible_impl = NULL;
axis2_bool_t result = AXIS2_FALSE;
@@ -415,7 +415,7 @@
extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_ATTR_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
- str_namespc = AXIS2_URL_TO_EXTERNAL_FORM(namespc, env);
+ str_namespc = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
for (index = axis2_hash_first (extensible_impl->f_ext_attrs, env); index;
index = axis2_hash_next (env, index))
{
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/component_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/component_exts.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/component_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/component_exts.c Wed Jun 7 03:51:49 2006
@@ -16,7 +16,7 @@
#include <woden/wsdl20/extensions/axis2_woden_component_exts.h>
#include <woden/wsdl20/xml/axis2_woden_wsdl_element.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
#include <axis2_hash.h>
typedef struct axis2_woden_component_exts_impl axis2_woden_component_exts_impl_t;
@@ -29,7 +29,7 @@
{
axis2_woden_component_exts_t component_exts;
void *f_parent_element;
- axis2_url_t *f_namespc;
+ axis2_uri_t *f_namespc;
};
#define INTF_TO_IMPL(component_exts) ((axis2_woden_component_exts_impl_t *) component_exts)
@@ -39,7 +39,7 @@
void *component_exts,
const axis2_env_t *envv);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_component_exts_get_namespace(
void *component_exts,
const axis2_env_t *env);
@@ -54,7 +54,7 @@
void *component_exts,
const axis2_env_t *env,
axis2_woden_wsdl_element_t *parent_el,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
AXIS2_EXTERN axis2_woden_component_exts_t * AXIS2_CALL
axis2_woden_component_exts_create(
@@ -102,7 +102,7 @@
if(component_exts_impl->f_namespc)
{
- AXIS2_URL_FREE(component_exts_impl->f_namespc, env);
+ AXIS2_URI_FREE(component_exts_impl->f_namespc, env);
component_exts_impl->f_namespc = NULL;
}
@@ -147,7 +147,7 @@
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_component_exts_get_namespace(
void *component_exts,
const axis2_env_t *env)
@@ -176,7 +176,7 @@
void *component_exts,
const axis2_env_t *env,
axis2_woden_wsdl_element_t *parent_el,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_component_exts_impl_t *component_exts_impl = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/element_extensible.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/element_extensible.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/element_extensible.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/element_extensible.c Wed Jun 7 03:51:49 2006
@@ -16,7 +16,7 @@
#include <woden/wsdl20/extensions/axis2_woden_element_extensible.h>
#include <woden/wsdl20/extensions/axis2_woden_ext_element.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
#include <axis2_hash.h>
typedef struct axis2_woden_element_extensible_impl axis2_woden_element_extensible_impl_t;
@@ -79,7 +79,7 @@
axis2_woden_element_extensible_has_ext_elements_for_namespace(
void *extensible,
const axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
@@ -364,7 +364,7 @@
axis2_bool_t AXIS2_CALL
axis2_woden_element_extensible_has_ext_elements_for_namespace(void *extensible,
const axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_element_extensible_impl_t *extensible_impl = NULL;
axis2_bool_t result = AXIS2_FALSE;
@@ -379,7 +379,7 @@
extensible_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_ELEMENT_EXTENSIBLE", AXIS2_HASH_KEY_STRING));
- ext_ns = AXIS2_URL_TO_EXTERNAL_FORM(namespc, env);
+ ext_ns = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
size = AXIS2_ARRAY_LIST_SIZE(extensible_impl->f_ext_elements, env);
for(i = 0; i < size; i++)
{
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/ext_registry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/ext_registry.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/ext_registry.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/ext_registry.c Wed Jun 7 03:51:49 2006
@@ -16,7 +16,7 @@
#include <woden/wsdl20/extensions/axis2_woden_ext_registry.h>
#include <woden/wsdl20/xml/axis2_woden_wsdl_element.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
#include <axis2_hash.h>
typedef struct axis2_woden_ext_registry_impl axis2_woden_ext_registry_impl_t;
@@ -131,7 +131,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);
void *AXIS2_CALL
@@ -139,7 +139,7 @@
void *registry,
const axis2_env_t *env,
axis2_char_t *parent_class,
- axis2_url_t *ext_namespc);
+ axis2_uri_t *ext_namespc);
axis2_array_list_t *AXIS2_CALL
axis2_woden_ext_registry_query_component_ext_namespaces(
@@ -559,7 +559,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)
{
axis2_woden_ext_registry_impl_t *registry_impl = NULL;
@@ -577,7 +577,7 @@
axis2_hash_set(registry_impl->comp_ext_reg, parent_class,
AXIS2_HASH_KEY_STRING, inner_comp_ext_reg);
}
- namespc = AXIS2_URL_TO_EXTERNAL_FORM(ext_namespc, env);
+ namespc = AXIS2_URI_TO_STRING(ext_namespc, env);
axis2_hash_set(inner_comp_ext_reg, namespc, AXIS2_HASH_KEY_STRING, comp_ext);
return AXIS2_SUCCESS;
}
@@ -595,7 +595,7 @@
void *registry,
const axis2_env_t *env,
axis2_char_t *parent_class,
- axis2_url_t *ext_namespc)
+ axis2_uri_t *ext_namespc)
{
axis2_woden_ext_registry_impl_t *registry_impl = NULL;
axis2_hash_t *inner_comp_ext_reg = NULL;
@@ -607,7 +607,7 @@
inner_comp_ext_reg = axis2_hash_get(registry_impl->comp_ext_reg,
parent_class, AXIS2_HASH_KEY_STRING);
- namespc = AXIS2_URL_TO_EXTERNAL_FORM(ext_namespc, env);
+ namespc = AXIS2_URI_TO_STRING(ext_namespc, env);
if(NULL != inner_comp_ext_reg)
{
comp_ext = axis2_hash_get(inner_comp_ext_reg, namespc,
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/axis2_woden_soap_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/axis2_woden_soap_constants.h?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/axis2_woden_soap_constants.h (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/axis2_woden_soap_constants.h Wed Jun 7 03:51:49 2006
@@ -23,7 +23,7 @@
* Constants for XML Soap elements, attributes and URIs.
*/
-#include <axis2_const.h>
+#include <axis2_utils.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_binding_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_binding_exts.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_binding_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_binding_exts.c Wed Jun 7 03:51:49 2006
@@ -65,12 +65,12 @@
void *binding_exts,
const axis2_env_t *env);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_soap_binding_exts_get_soap_underlying_protocol(
void *binding_exts,
const axis2_env_t *env);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_soap_binding_exts_get_soap_mep_default(
void *binding_exts,
const axis2_env_t *env);
@@ -384,7 +384,7 @@
NULL;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_soap_binding_exts_get_soap_underlying_protocol(
void *binding_exts,
const axis2_env_t *env)
@@ -407,7 +407,7 @@
return protocol != NULL ? AXIS2_WODEN_URI_ATTR_GET_URI(protocol, env) : NULL;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_soap_binding_exts_get_soap_mep_default(
void *binding_exts,
const axis2_env_t *env)
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_binding_op_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_binding_op_exts.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_binding_op_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_binding_op_exts.c Wed Jun 7 03:51:49 2006
@@ -62,12 +62,12 @@
void *binding_op_exts,
const axis2_env_t *env);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_soap_binding_op_exts_get_soap_mep(
void *binding_op_exts,
const axis2_env_t *env);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_soap_binding_op_exts_get_soap_action(
void *binding_op_exts,
const axis2_env_t *env);
@@ -325,7 +325,7 @@
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_soap_binding_op_exts_get_soap_mep(
void *binding_op_exts,
const axis2_env_t *env)
@@ -349,7 +349,7 @@
return mep != NULL ? AXIS2_WODEN_URI_ATTR_GET_URI(mep, env) : NULL;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_soap_binding_op_exts_get_soap_action(
void *binding_op_exts,
const axis2_env_t *env)
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_header_block.c Wed Jun 7 03:51:49 2006
@@ -178,7 +178,7 @@
axis2_woden_soap_header_block_get_ext_attrs_for_namespace(
void *header_block,
axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_array_list_t *AXIS2_CALL
axis2_woden_soap_header_block_get_ext_attrs(
@@ -189,7 +189,7 @@
axis2_woden_soap_header_block_has_ext_attrs_for_namespace(
void *header_block,
axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_status_t AXIS2_CALL
axis2_woden_soap_header_block_add_ext_element(
@@ -218,7 +218,7 @@
axis2_woden_soap_header_block_has_ext_elements_for_namespace(
void *header_block,
axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
/* ************************************************************
* Non-API implementation methods
@@ -1136,7 +1136,7 @@
axis2_woden_soap_header_block_get_ext_attrs_for_namespace(
void *header_block,
axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_soap_header_block_impl_t *header_block_impl = NULL;
axis2_hash_t *super = NULL;
@@ -1172,7 +1172,7 @@
axis2_woden_soap_header_block_has_ext_attrs_for_namespace(
void *header_block,
axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_soap_header_block_impl_t *header_block_impl = NULL;
axis2_hash_t *super = NULL;
@@ -1267,7 +1267,7 @@
axis2_woden_soap_header_block_has_ext_elements_for_namespace(
void *header_block,
axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_soap_header_block_impl_t *header_block_impl = NULL;
axis2_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/soap_module.c Wed Jun 7 03:51:49 2006
@@ -40,7 +40,7 @@
axis2_bool_t f_required;
void *f_attr_ext;
void *f_elem_ext;
- axis2_url_t *f_ref;
+ axis2_uri_t *f_ref;
};
#define INTF_TO_IMPL(module) ((axis2_woden_soap_module_impl_t *) module)
@@ -64,7 +64,7 @@
* Component model methods (SOAPHeaderBlock interface), some shared with Element model
* ***********************************************************************/
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_soap_module_get_ref(
void *module,
axis2_env_t *env);
@@ -92,7 +92,7 @@
axis2_woden_soap_module_set_ref(
void *module,
axis2_env_t *env,
- axis2_url_t *uri);
+ axis2_uri_t *uri);
axis2_status_t AXIS2_CALL
axis2_woden_soap_module_set_parent_element(
@@ -154,7 +154,7 @@
axis2_woden_soap_module_get_ext_attrs_for_namespace(
void *module,
axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_array_list_t *AXIS2_CALL
axis2_woden_soap_module_get_ext_attrs(
@@ -165,7 +165,7 @@
axis2_woden_soap_module_has_ext_attrs_for_namespace(
void *module,
axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_status_t AXIS2_CALL
axis2_woden_soap_module_add_ext_element(
@@ -194,7 +194,7 @@
axis2_woden_soap_module_has_ext_elements_for_namespace(
void *module,
axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
static axis2_woden_soap_module_t *
create(const axis2_env_t *env);
@@ -568,7 +568,7 @@
if(module_impl->f_ref)
{
- AXIS2_URL_FREE(module_impl->f_ref, env);
+ AXIS2_URI_FREE(module_impl->f_ref, env);
module_impl->f_ref = NULL;
}
@@ -665,7 +665,7 @@
* Component model methods (SOAPHeaderBlock interface), some shared with Element model
* ***********************************************************************/
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_soap_module_get_ref(
void *module,
axis2_env_t *env)
@@ -738,7 +738,7 @@
axis2_woden_soap_module_set_ref(
void *module,
axis2_env_t *env,
- axis2_url_t *uri)
+ axis2_uri_t *uri)
{
axis2_woden_soap_module_impl_t *module_impl = NULL;
axis2_hash_t *super = NULL;
@@ -751,11 +751,11 @@
if(module_impl->f_ref)
{
- AXIS2_URL_FREE(module_impl->f_ref, env);
+ AXIS2_URI_FREE(module_impl->f_ref, env);
module_impl->f_ref = NULL;
}
- module_impl->f_ref = AXIS2_URL_CLONE(uri, env);
+ module_impl->f_ref = AXIS2_URI_CLONE(uri, env);
return AXIS2_SUCCESS;
@@ -954,7 +954,7 @@
axis2_woden_soap_module_get_ext_attrs_for_namespace(
void *module,
axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_soap_module_impl_t *module_impl = NULL;
axis2_hash_t *super = NULL;
@@ -990,7 +990,7 @@
axis2_woden_soap_module_has_ext_attrs_for_namespace(
void *module,
axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_soap_module_impl_t *module_impl = NULL;
axis2_hash_t *super = NULL;
@@ -1085,7 +1085,7 @@
axis2_woden_soap_module_has_ext_elements_for_namespace(
void *module,
axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_soap_module_impl_t *module_impl = NULL;
axis2_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/feature.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/feature.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/feature.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/feature.c Wed Jun 7 03:51:49 2006
@@ -34,7 +34,7 @@
axis2_woden_documentable_t *documentable;
axis2_hash_t *super;
axis2_hash_t *methods;
- axis2_url_t *f_ref;
+ axis2_uri_t *f_ref;
axis2_bool_t f_required;
void *f_parent;
};
@@ -65,9 +65,9 @@
axis2_woden_feature_set_ref(
void *feature,
const axis2_env_t *env,
- axis2_url_t *ref);
+ axis2_uri_t *ref);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_feature_get_ref(
void *feature,
const axis2_env_t *env);
@@ -545,7 +545,7 @@
if(feature_impl->f_ref)
{
- AXIS2_URL_FREE(feature_impl->f_ref, env);
+ AXIS2_URI_FREE(feature_impl->f_ref, env);
feature_impl->f_ref = NULL;
}
@@ -675,7 +675,7 @@
axis2_woden_feature_set_ref(
void *feature,
const axis2_env_t *env,
- axis2_url_t *ref)
+ axis2_uri_t *ref)
{
axis2_woden_feature_impl_t *feature_impl = NULL;
axis2_hash_t *super = NULL;
@@ -687,13 +687,13 @@
if(feature_impl->f_ref)
{
- AXIS2_URL_FREE(feature_impl->f_ref, env);
+ AXIS2_URI_FREE(feature_impl->f_ref, env);
}
feature_impl->f_ref = ref;
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_feature_get_ref(
void *feature,
const axis2_env_t *env)
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/import.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/import.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/import.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/import.c Wed Jun 7 03:51:49 2006
@@ -34,7 +34,7 @@
axis2_hash_t *super;
axis2_hash_t *methods;
- axis2_url_t *f_namespc;
+ axis2_uri_t *f_namespc;
};
#define INTF_TO_IMPL(import) ((axis2_woden_import_impl_t *) import)
@@ -63,9 +63,9 @@
axis2_woden_import_set_namespace(
void *import,
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
axis2_woden_import_get_namespace(
void *import,
const axis2_env_t *env);
@@ -314,7 +314,7 @@
if(import_impl->f_namespc)
{
- AXIS2_URL_FREE(import_impl->f_namespc, env);
+ AXIS2_URI_FREE(import_impl->f_namespc, env);
import_impl->f_namespc = NULL;
}
@@ -429,7 +429,7 @@
axis2_woden_import_set_namespace(
void *import,
const axis2_env_t *env,
- axis2_url_t *ns_uri)
+ axis2_uri_t *ns_uri)
{
axis2_woden_import_impl_t *import_impl = NULL;
axis2_hash_t *super = NULL;
@@ -445,12 +445,12 @@
AXIS2_URI_FREE(import_impl->f_namespc, env);
import_impl->f_namespc = NULL;
}
- import_impl->f_namespc = AXIS2_URL_CLONE(ns_uri, env);
+ import_impl->f_namespc = AXIS2_URI_CLONE(ns_uri, env);
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_import_get_namespace(
void *import,
const axis2_env_t *env)
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/interface.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/interface.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/interface.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/interface.c Wed Jun 7 03:51:49 2006
@@ -112,7 +112,7 @@
axis2_woden_interface_add_style_default_uri(
void *interface,
const axis2_env_t *env,
- axis2_url_t *uri);
+ axis2_uri_t *uri);
void *AXIS2_CALL
axis2_woden_interface_get_style_default(
@@ -891,7 +891,7 @@
axis2_woden_interface_add_style_default_uri(
void *interface,
const axis2_env_t *env,
- axis2_url_t *uri)
+ axis2_uri_t *uri)
{
axis2_woden_interface_impl_t *interface_impl = NULL;
axis2_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/interface_fault.c Wed Jun 7 03:51:49 2006
@@ -230,7 +230,7 @@
interface_fault_impl->interface_fault.base.interface_fault_element.base.nested_element.ops =
AXIS2_MALLOC(env->allocator,
sizeof(axis2_woden_nested_element_ops_t));
- axis2_woden_interface_fault_element_resolve_methods(&(interface_fault_impl->interface_fault.base.
+ axis2_woden_nested_element_resolve_methods(&(interface_fault_impl->interface_fault.base.
interface_fault_element.base.nested_element), env, interface_fault_impl->methods);
return interface_fault;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/interface_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/interface_op.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/interface_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/interface_op.c Wed Jun 7 03:51:49 2006
@@ -36,7 +36,7 @@
axis2_hash_t *super;
axis2_hash_t *methods;
axis2_qname_t *f_qname;
- axis2_url_t *f_msg_exchange_pattern;
+ axis2_uri_t *f_msg_exchange_pattern;
axis2_array_list_t *f_style;
axis2_array_list_t *f_msg_refs;
axis2_array_list_t *f_fault_refs;
@@ -73,7 +73,7 @@
void *interface_op,
const axis2_env_t *env);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_interface_op_get_msg_exchange_pattern(
void *interface_op,
const axis2_env_t *env);
@@ -112,9 +112,9 @@
axis2_woden_interface_op_set_pattern(
void *interface_op,
const axis2_env_t *env,
- axis2_url_t *uri);
+ axis2_uri_t *uri);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_interface_op_get_pattern(
void *interface_op,
const axis2_env_t *env);
@@ -123,13 +123,13 @@
axis2_woden_interface_op_add_style_uri(
void *interface_op,
const axis2_env_t *env,
- axis2_url_t *uri);
+ axis2_uri_t *uri);
axis2_status_t AXIS2_CALL
axis2_woden_interface_op_remove_style_uri(
void *interface_op,
const axis2_env_t *env,
- axis2_url_t *uri);
+ axis2_uri_t *uri);
axis2_status_t AXIS2_CALL
axis2_woden_interface_op_add_interface_msg_ref_element(
@@ -452,7 +452,7 @@
if(interface_op_impl->f_msg_exchange_pattern)
{
- AXIS2_URL_FREE(interface_op_impl->f_msg_exchange_pattern, env);
+ AXIS2_URI_FREE(interface_op_impl->f_msg_exchange_pattern, env);
interface_op_impl->f_msg_exchange_pattern = NULL;
}
@@ -627,7 +627,7 @@
return interface_op_impl->f_qname;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_interface_op_get_msg_exchange_pattern(
void *interface_op,
const axis2_env_t *env)
@@ -740,7 +740,7 @@
axis2_woden_interface_op_set_pattern(
void *interface_op,
const axis2_env_t *env,
- axis2_url_t *uri)
+ axis2_uri_t *uri)
{
axis2_woden_interface_op_impl_t *interface_op_impl = NULL;
axis2_hash_t *super = NULL;
@@ -761,7 +761,7 @@
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_interface_op_get_pattern(
void *interface_op,
const axis2_env_t *env)
@@ -781,7 +781,7 @@
axis2_woden_interface_op_add_style_uri(
void *interface_op,
const axis2_env_t *env,
- axis2_url_t *uri)
+ axis2_uri_t *uri)
{
axis2_woden_interface_op_impl_t *interface_op_impl = NULL;
axis2_hash_t *super = NULL;
@@ -809,7 +809,7 @@
axis2_woden_interface_op_remove_style_uri(
void *interface_op,
const axis2_env_t *env,
- axis2_url_t *uri)
+ axis2_uri_t *uri)
{
axis2_woden_interface_op_impl_t *interface_op_impl = NULL;
axis2_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/property.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/property.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/property.c Wed Jun 7 03:51:49 2006
@@ -38,7 +38,7 @@
axis2_hash_t *super;
axis2_hash_t *methods;
/* WSDL Component model data */
- axis2_url_t *f_ref;
+ axis2_uri_t *f_ref;
axis2_generic_obj_t *f_value;
axis2_woden_type_def_t *f_value_constraint;
void *f_parent;
@@ -74,9 +74,9 @@
axis2_woden_property_set_ref(
void *property,
const axis2_env_t *env,
- axis2_url_t *ref);
+ axis2_uri_t *ref);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_property_get_ref(
void *property,
const axis2_env_t *env);
@@ -627,7 +627,7 @@
if(property_impl->f_ref)
{
- AXIS2_URL_FREE(property_impl->f_ref, env);
+ AXIS2_URI_FREE(property_impl->f_ref, env);
property_impl->f_ref = NULL;
}
@@ -762,7 +762,7 @@
axis2_woden_property_set_ref(
void *property,
const axis2_env_t *env,
- axis2_url_t *ref)
+ axis2_uri_t *ref)
{
axis2_woden_property_impl_t *property_impl = NULL;
axis2_hash_t *super = NULL;
@@ -774,13 +774,13 @@
if(property_impl->f_ref)
{
- AXIS2_URL_FREE(property_impl->f_ref, env);
+ AXIS2_URI_FREE(property_impl->f_ref, env);
}
property_impl->f_ref = ref;
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_property_get_ref(
void *property,
const axis2_env_t *env)
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/type_def.c Wed Jun 7 03:51:49 2006
@@ -32,7 +32,7 @@
axis2_hash_t *super;
axis2_hash_t *methods;
axis2_qname_t *f_qname;
- axis2_url_t *f_system;
+ axis2_uri_t *f_system;
axis2_char_t *f_content_model;
axis2_generic_obj_t *f_content;
};
@@ -69,9 +69,9 @@
axis2_woden_type_def_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
axis2_woden_type_def_get_system(
void *type_def,
const axis2_env_t *env);
@@ -366,7 +366,7 @@
axis2_woden_type_def_set_system(
void *type_def,
const axis2_env_t *env,
- axis2_url_t *type_system_uri)
+ axis2_uri_t *type_system_uri)
{
axis2_woden_type_def_impl_t *type_def_impl = NULL;
axis2_hash_t *super = NULL;
@@ -385,7 +385,7 @@
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_type_def_get_system(
void *type_def,
const axis2_env_t *env)
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/types.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/types.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/types.c Wed Jun 7 03:51:49 2006
@@ -93,7 +93,7 @@
axis2_woden_types_get_schemas_with_namespace(
void *types,
const axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_array_list_t *AXIS2_CALL
axis2_woden_types_get_inlined_schemas(
@@ -132,7 +132,7 @@
axis2_woden_types_is_namespace_in_scope_with_namespace_uri(
void *types,
const axis2_env_t *env,
- axis2_url_t *namespc_uri);
+ axis2_uri_t *namespc_uri);
axis2_bool_t AXIS2_CALL
axis2_woden_types_is_namespace_in_scope_with_qname(
@@ -815,7 +815,7 @@
axis2_woden_types_get_schemas_with_namespace(
void *types,
const axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_types_impl_t *types_impl = NULL;
int i = 0, size = 0;
@@ -828,7 +828,7 @@
"AXIS2_WODEN_TYPES", AXIS2_HASH_KEY_STRING));
if(namespc)
- str_namespc = AXIS2_URL_TO_EXTERNAL_FORM(namespc, env);
+ str_namespc = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
size = AXIS2_ARRAY_LIST_SIZE(types_impl->f_schemas, env);
for(i = 0; i < size; i++)
{
@@ -1076,7 +1076,7 @@
axis2_woden_types_is_namespace_in_scope_with_namespace_uri(
void *types,
const axis2_env_t *env,
- axis2_url_t *namespc_uri)
+ axis2_uri_t *namespc_uri)
{
axis2_woden_types_impl_t *types_impl = NULL;
AXIS2_PARAM_CHECK(env->error, namespc_uri, AXIS2_FAILURE);
@@ -1088,7 +1088,7 @@
types_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_TYPES", AXIS2_HASH_KEY_STRING));
- str_uri = AXIS2_URL_TO_EXTERNAL_FORM(namespc_uri, env);
+ str_uri = AXIS2_URI_TO_STRING(namespc_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
return is_namespace_in_scope_with_namespace(types, env, str_uri);
}
@@ -1100,7 +1100,7 @@
{
axis2_woden_types_impl_t *types_impl = NULL;
axis2_char_t *str_uri = NULL;
- axis2_url_t *uri = NULL;
+ axis2_uri_t *uri = NULL;
axis2_hash_t *super = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1110,7 +1110,7 @@
"AXIS2_WODEN_TYPES", AXIS2_HASH_KEY_STRING));
str_uri = AXIS2_QNAME_GET_URI(qname, env);
- uri = axis2_url_parse_string(env, str_uri);
+ uri = axis2_uri_parse_string(env, str_uri);
return is_namespace_in_scope_with_namespace_uri(types, env, uri);
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_element.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_element.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_element.c Wed Jun 7 03:51:49 2006
@@ -19,7 +19,7 @@
#include <woden/wsdl20/extensions/axis2_woden_attr_extensible.h>
#include <woden/wsdl20/extensions/axis2_woden_ext_element.h>
#include <woden/xml/axis2_woden_xml_attr.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
#include <axis2_hash.h>
typedef struct axis2_woden_wsdl_element_impl axis2_woden_wsdl_element_impl_t;
@@ -78,13 +78,13 @@
axis2_woden_wsdl_element_get_ext_attrs_for_namespace(
void *wsdl_element,
const axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_bool_t AXIS2_CALL
axis2_woden_wsdl_element_has_ext_attrs_for_namespace(
void *wsdl_element,
const axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_add_ext_element(
@@ -113,7 +113,7 @@
axis2_woden_wsdl_element_has_ext_elements_for_namespace(
void *wsdl_element,
const axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_element_add_ext_element(
@@ -142,7 +142,7 @@
axis2_woden_wsdl_element_has_ext_elements_for_namespace(
void *wsdl_element,
const axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
static axis2_woden_wsdl_element_t *
create(
@@ -498,7 +498,7 @@
axis2_woden_wsdl_element_get_ext_attrs_for_namespace(
void *wsdl_element,
const axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
axis2_hash_t *super = NULL;
@@ -517,7 +517,7 @@
axis2_woden_wsdl_element_has_ext_attrs_for_namespace(
void *wsdl_element,
const axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
axis2_hash_t *super = NULL;
@@ -611,7 +611,7 @@
axis2_woden_wsdl_element_has_ext_elements_for_namespace(
void *wsdl_element,
const axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_wsdl_element_impl_t *wsdl_element_impl = NULL;
axis2_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_obj.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_obj.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_obj.c Wed Jun 7 03:51:49 2006
@@ -53,13 +53,13 @@
axis2_woden_wsdl_obj_get_component_exts_for_namespace(
void *wsdl_obj,
const axis2_env_t *env,
- axis2_url_t *namespc);
+ axis2_uri_t *namespc);
axis2_status_t AXIS2_CALL
axis2_woden_wsdl_obj_set_component_exts(
void *wsdl_obj,
const axis2_env_t *env,
- axis2_url_t *namespc,
+ axis2_uri_t *namespc,
axis2_woden_component_exts_t *exts);
static axis2_woden_wsdl_obj_t *
@@ -219,7 +219,7 @@
axis2_woden_wsdl_obj_get_component_exts_for_namespace(
void *wsdl_obj,
const axis2_env_t *env,
- axis2_url_t *namespc)
+ axis2_uri_t *namespc)
{
axis2_woden_wsdl_obj_impl_t *wsdl_obj_impl = NULL;
axis2_char_t *str_namespc = NULL;
@@ -230,7 +230,7 @@
wsdl_obj_impl = INTF_TO_IMPL(axis2_hash_get(super,
"AXIS2_WODEN_WSDL_OBJ", AXIS2_HASH_KEY_STRING));
- str_namespc = AXIS2_URL_TO_EXTERNAL_FORM(namespc, env);
+ str_namespc = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
return (axis2_woden_component_exts_t *)axis2_hash_get(wsdl_obj_impl->
f_comp_exts, str_namespc, AXIS2_HASH_KEY_STRING);
}
@@ -239,7 +239,7 @@
axis2_woden_wsdl_obj_set_component_exts(
void *wsdl_obj,
const axis2_env_t *env,
- axis2_url_t *namespc,
+ axis2_uri_t *namespc,
axis2_woden_component_exts_t *exts)
{
axis2_woden_wsdl_obj_impl_t *wsdl_obj_impl = NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_ref.c?rev=412362&r1=412361&r2=412362&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/wsdl_ref.c Wed Jun 7 03:51:49 2006
@@ -31,7 +31,7 @@
axis2_hash_t *super;
axis2_woden_obj_types_t obj_type;
axis2_array_list_t *f_documentation_elements;
- axis2_url_t *f_location;
+ axis2_uri_t *f_location;
axis2_woden_desc_element_t *f_desc_element;
};
@@ -52,7 +52,7 @@
void *wsdl_ref,
const axis2_env_t *env);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_wsdl_ref_get_location(
void *wsdl_ref,
const axis2_env_t *env);
@@ -61,7 +61,7 @@
axis2_woden_wsdl_ref_set_location(
void *wsdl_ref,
const axis2_env_t *env,
- axis2_url_t *loc_uri);
+ axis2_uri_t *loc_uri);
void *AXIS2_CALL
axis2_woden_wsdl_ref_get_desc_element(
@@ -269,7 +269,7 @@
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_wsdl_ref_get_location(
void *wsdl_ref,
const axis2_env_t *env)
@@ -289,7 +289,7 @@
axis2_woden_wsdl_ref_set_location(
void *wsdl_ref,
const axis2_env_t *env,
- axis2_url_t *loc_uri)
+ axis2_uri_t *loc_uri)
{
axis2_woden_wsdl_ref_impl_t *wsdl_ref_impl = NULL;
axis2_hash_t *super = NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org