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 [2/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...
Modified: webservices/axis2/trunk/c/woden/src/util/component_model_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/component_model_builder.c?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/component_model_builder.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/component_model_builder.c Wed Jun 7 04:22:25 2006
@@ -44,7 +44,7 @@
void *builder,
const axis2_env_t *env,
void *schema_def,
- axis2_url_t *type_system_uri);
+ axis2_uri_t *type_system_uri);
/*
* Extract the type definitions from the given schema.
@@ -54,7 +54,7 @@
void *builder,
const axis2_env_t *env,
void *schema_def,
- axis2_url_t *type_system_uri);
+ axis2_uri_t *type_system_uri);
/* *******************************************************************************
* INTERFACE
@@ -172,7 +172,7 @@
const axis2_env_t *env,
axis2_char_t *parent_class,
void *parent_elem,
- axis2_url_t *ext_ns);
+ axis2_uri_t *ext_ns);
/* *******************************************************************************
* SERVICE
@@ -328,7 +328,7 @@
{
axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
void *types = NULL;
- axis2_url_t *type_system_uri = NULL;
+ axis2_uri_t *type_system_uri = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, desc, AXIS2_FAILURE);
@@ -336,7 +336,7 @@
types = AXIS2_WODEN_DESC_GET_TYPES_ELEMENT(desc, env);
- type_system_uri = axis2_url_parse_string(env, WODEN_TYPE_XSD_2001);
+ type_system_uri = axis2_uri_parse_string(env, WODEN_TYPE_XSD_2001);
if(NULL != types)
{
@@ -395,7 +395,7 @@
void *builder,
const axis2_env_t *env,
void *schema_def,
- axis2_url_t *type_system_uri)
+ axis2_uri_t *type_system_uri)
{
axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
axis2_char_t *schema_tns = NULL;
@@ -451,7 +451,7 @@
void *builder,
const axis2_env_t *env,
void *schema_def,
- axis2_url_t *type_system_uri)
+ axis2_uri_t *type_system_uri)
{
axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
axis2_char_t *schema_tns = NULL;
@@ -923,7 +923,7 @@
axis2_array_list_t *ext_namespcs = NULL;
int i = 0, size = 0;
void *parent_element = NULL;
- axis2_url_t *binding_type = NULL;
+ axis2_uri_t *binding_type = NULL;
axis2_char_t *binding_type_str = NULL;
er = AXIS2_WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
@@ -937,7 +937,7 @@
size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
for(i = 0; i < size; i++)
{
- axis2_url_t *ext_ns = NULL;
+ axis2_uri_t *ext_ns = NULL;
axis2_bool_t temp1 = AXIS2_FALSE;
axis2_bool_t temp2 = AXIS2_FALSE;
@@ -970,7 +970,7 @@
* extensions can be registered in some way and interpreted here at run time.
*/
binding_type = AXIS2_WODEN_BINDING_GET_TYPE(binding, env);
- binding_type_str = AXIS2_URL_TO_EXTERNAL_FORM(binding_type, env);
+ binding_type_str = AXIS2_URI_TO_STRING(binding_type, env);
if(0 == AXIS2_STRCMP(AXIS2_WODEN_URI_NS_SOAP, binding_type_str))
{
void *sbe = NULL;
@@ -1009,7 +1009,7 @@
axis2_array_list_t *ext_namespcs = NULL;
int i = 0, size = 0;
void *parent_element = NULL;
- axis2_url_t *binding_type = NULL;
+ axis2_uri_t *binding_type = NULL;
axis2_char_t *binding_type_str = NULL;
er = AXIS2_WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
@@ -1023,7 +1023,7 @@
size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
for(i = 0; i < size; i++)
{
- axis2_url_t *ext_ns = NULL;
+ axis2_uri_t *ext_ns = NULL;
axis2_bool_t temp1 = AXIS2_FALSE;
axis2_bool_t temp2 = AXIS2_FALSE;
@@ -1059,7 +1059,7 @@
parent_element = AXIS2_WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(bind_fault, env);
parent_element = axis2_woden_binding_to_binding_element(parent_element, env);
binding_type = AXIS2_WODEN_BINDING_ELEMENT_GET_TYPE(parent_element, env);
- binding_type_str = AXIS2_URL_TO_EXTERNAL_FORM(binding_type, env);
+ binding_type_str = AXIS2_URI_TO_STRING(binding_type, env);
if(0 == AXIS2_STRCMP(AXIS2_WODEN_URI_NS_SOAP, binding_type_str))
{
/* If the binding type is SOAP, the {soap fault code} and {soap fault subcodes} properties
@@ -1100,7 +1100,7 @@
*/
for(i = 0; i < size; i++)
{
- axis2_url_t *ext_ns = NULL;
+ axis2_uri_t *ext_ns = NULL;
axis2_bool_t temp1 = AXIS2_FALSE;
axis2_bool_t temp2 = AXIS2_FALSE;
@@ -1136,7 +1136,7 @@
parent_element = AXIS2_WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(bind_op, env);
parent_element = axis2_woden_binding_to_binding_element(parent_element, env);
binding_type = AXIS2_WODEN_BINDING_ELEMENT_GET_TYPE(parent_element, env);
- binding_type_str = AXIS2_URL_TO_EXTERNAL_FORM(binding_type, env);
+ binding_type_str = AXIS2_URI_TO_STRING(binding_type, env);
if(0 == AXIS2_STRCMP(AXIS2_WODEN_URI_NS_SOAP, binding_type_str))
{
/*
@@ -1178,7 +1178,7 @@
size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
for(i = 0; i < size; i++)
{
- axis2_url_t *ext_ns = NULL;
+ axis2_uri_t *ext_ns = NULL;
axis2_bool_t temp1 = AXIS2_FALSE;
axis2_bool_t temp2 = AXIS2_FALSE;
@@ -1219,7 +1219,7 @@
size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
for(i = 0; i < size; i++)
{
- axis2_url_t *ext_ns = NULL;
+ axis2_uri_t *ext_ns = NULL;
axis2_bool_t temp1 = AXIS2_FALSE;
axis2_bool_t temp2 = AXIS2_FALSE;
@@ -1256,7 +1256,7 @@
const axis2_env_t *env,
axis2_char_t *parent_class,
void *parent_elem,
- axis2_url_t *ext_ns)
+ axis2_uri_t *ext_ns)
{
axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
axis2_woden_ext_registry_t *er = NULL;
Modified: webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_om_util.c?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_om_util.c Wed Jun 7 04:22:25 2006
@@ -53,14 +53,14 @@
axis2_char_t *namespc_uri_str,
void *desc)
{
- axis2_url_t *ns_uri = NULL;
- axis2_url_t *uri = NULL;
+ axis2_uri_t *ns_uri = NULL;
+ axis2_uri_t *uri = NULL;
axis2_char_t *ns_uri_str = NULL;
axis2_char_t *tmp_prefix = NULL;
desc = axis2_woden_desc_to_desc_element(desc, env);
ns_uri = AXIS2_WODEN_DESC_ELEMENT_GET_NAMESPACE(desc, env, prefix);
- ns_uri_str = AXIS2_URL_TO_EXTERNAL_FORM(ns_uri, env);
+ ns_uri_str = AXIS2_URI_TO_STRING(ns_uri, env);
if(NULL != ns_uri_str && 0 == AXIS2_STRCMP(ns_uri_str, namespc_uri_str))
{
return;
@@ -72,12 +72,12 @@
temp = AXIS2_STRACAT(tmp_prefix, "_", env);
ns_uri = AXIS2_WODEN_DESC_ELEMENT_GET_NAMESPACE(desc, env, temp);
- ns_uri_str = AXIS2_URL_TO_EXTERNAL_FORM(ns_uri, env);
+ ns_uri_str = AXIS2_URI_TO_STRING(ns_uri, env);
AXIS2_FREE(env->allocator, tmp_prefix);
tmp_prefix = AXIS2_STRDUP(temp, env);
AXIS2_FREE(env->allocator, temp);
}
- uri = axis2_url_parse_string(env, namespc_uri_str);
+ uri = axis2_uri_parse_string(env, namespc_uri_str);
return AXIS2_WODEN_DESC_ELEMENT_ADD_NAMESPACE(desc, env, namespc_uri_str);
}
Modified: webservices/axis2/trunk/c/woden/src/xml/string_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/string_attr.c?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/string_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/string_attr.c Wed Jun 7 04:22:25 2006
@@ -15,7 +15,7 @@
*/
#include <woden/xml/axis2_woden_string_attr.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
#include <axis2_om_element.h>
#include <axis2_om_node.h>
Modified: webservices/axis2/trunk/c/woden/src/xml/uri_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/uri_attr.c?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/uri_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/uri_attr.c Wed Jun 7 04:22:25 2006
@@ -15,7 +15,7 @@
*/
#include <woden/xml/axis2_woden_uri_attr.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
#include <axis2_om_element.h>
#include <axis2_om_node.h>
@@ -51,7 +51,7 @@
void *uri_attr,
const axis2_env_t *env);
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_uri_attr_get_uri(
void *uri_attr,
const axis2_env_t *env);
@@ -207,7 +207,7 @@
return AXIS2_SUCCESS;
}
-axis2_url_t *AXIS2_CALL
+axis2_uri_t *AXIS2_CALL
axis2_woden_uri_attr_get_uri(
void *uri_attr,
const axis2_env_t *env)
@@ -216,7 +216,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
uri_attr_impl = INTF_TO_IMPL(uri_attr);
- return (axis2_url_t *) AXIS2_WODEN_XML_ATTR_GET_CONTENT(
+ return (axis2_uri_t *) AXIS2_WODEN_XML_ATTR_GET_CONTENT(
uri_attr_impl->xml_attr, env);
}
@@ -229,14 +229,14 @@
axis2_char_t *attr_value)
{
axis2_woden_uri_attr_impl_t *uri_attr_impl = NULL;
- axis2_url_t *url = NULL;
+ axis2_uri_t *url = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
uri_attr_impl = INTF_TO_IMPL(uri_attr);
if(attr_value)
{
- /* TODO url = axis2_url_create(env, attr_value);*/
+ /* TODO url = axis2_uri_create(env, attr_value);*/
}
if(!url)
Modified: webservices/axis2/trunk/c/woden/src/xml/xml_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/xml_attr.c?rev=412366&r1=412365&r2=412366&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/xml_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/xml_attr.c Wed Jun 7 04:22:25 2006
@@ -15,7 +15,7 @@
*/
#include <woden/xml/axis2_woden_xml_attr.h>
-#include <axis2_url.h>
+#include <axis2_uri.h>
#include <axis2_hash.h>
#include <axis2_om_element.h>
#include <axis2_om_node.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org