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 du...@apache.org on 2007/03/28 13:21:17 UTC
svn commit: r523280 [4/4] - in /webservices/axis2/trunk/c:
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
guththila/src/ modules/core/addr/ modules/core/clientapi/
modules/core/context/ modules/core/deployment/ modules/core/description/...
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c Wed Mar 28 04:21:09 2007
@@ -115,15 +115,15 @@
}
axis2_hash_set(sim_type_cont_impl->ht_super,
- axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
+ axis2_strdup(env,"XML_SCHEMA_SIMPLE_TYPE_CONTENT"),
AXIS2_HASH_KEY_STRING, &(sim_type_cont_impl->sim_type_cont));
axis2_hash_set(sim_type_cont_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, sim_type_cont_impl->annotated);
axis2_hash_set(sim_type_cont_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_type_cont_impl->annotated, env));
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c Wed Mar 28 04:21:09 2007
@@ -155,11 +155,11 @@
}
axis2_hash_set(simple_type_list_impl->ht_super,
- axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_LIST", env),
+ axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_LIST"),
AXIS2_HASH_KEY_STRING, &(simple_type_list_impl->simple_type_list));
axis2_hash_set(simple_type_list_impl->ht_super,
- axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
+ axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_CONTENT"),
AXIS2_HASH_KEY_STRING, &(simple_type_list_impl->sim_type_content));
annotated = XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(
@@ -167,11 +167,11 @@
if (annotated)
{
axis2_hash_set(simple_type_list_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, annotated);
axis2_hash_set(simple_type_list_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c Wed Mar 28 04:21:09 2007
@@ -168,12 +168,12 @@
}
axis2_hash_set(simple_type_restriction_impl->ht_super,
- axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_RESTRICTION", env),
+ axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_RESTRICTION"),
AXIS2_HASH_KEY_STRING, &(simple_type_restriction_impl->simple_type_restriction));
axis2_hash_set(simple_type_restriction_impl->ht_super,
- axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
+ axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_CONTENT"),
AXIS2_HASH_KEY_STRING, simple_type_restriction_impl->sim_type_content);
annotated = XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(
@@ -182,11 +182,11 @@
if (annotated)
{
axis2_hash_set(simple_type_restriction_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, annotated);
axis2_hash_set(simple_type_restriction_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c Wed Mar 28 04:21:09 2007
@@ -180,11 +180,11 @@
axis2_hash_set(simple_type_union_impl->ht_super,
- axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_UNION", env),
+ axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_UNION"),
AXIS2_HASH_KEY_STRING, &(simple_type_union_impl->simple_type_union));
axis2_hash_set(simple_type_union_impl->ht_super,
- axis2_strdup("XML_SCHEMA_SIMPLE_TYPE_CONTENT", env),
+ axis2_strdup(env, "XML_SCHEMA_SIMPLE_TYPE_CONTENT"),
AXIS2_HASH_KEY_STRING,
simple_type_union_impl->sim_type_content);
@@ -194,11 +194,11 @@
if (annotated)
{
axis2_hash_set(simple_type_union_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, annotated);
axis2_hash_set(simple_type_union_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
}
@@ -338,7 +338,7 @@
sim_type_res_impl->member_types_source = NULL;
}
- sim_type_res_impl->member_types_source = axis2_strdup(member_types_source, env);
+ sim_type_res_impl->member_types_source = axis2_strdup(env, member_types_source);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c Wed Mar 28 04:21:09 2007
@@ -227,15 +227,15 @@
return NULL;
}
axis2_hash_set(type_impl->ht_super,
- axis2_strdup("XML_SCHEMA_TYPE", env),
+ axis2_strdup(env, "XML_SCHEMA_TYPE"),
AXIS2_HASH_KEY_STRING, &(type_impl->type));
axis2_hash_set(type_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING, type_impl->annotated);
axis2_hash_set(type_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(type_impl->annotated, env));
@@ -552,7 +552,7 @@
AXIS2_FREE(env->allocator, type_impl->name);
type_impl->name = NULL;
}
- type_impl->name = axis2_strdup(name, env);
+ type_impl->name = axis2_strdup(env, name);
if (!type_impl->name)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c Wed Mar 28 04:21:09 2007
@@ -88,15 +88,15 @@
axis2_char_t *final_path = NULL;
if (!path)
return NULL;
- modified_path = axis2_strdup(path, env);
+ modified_path = axis2_strdup(env, path);
axis2_replace(env, modified_path, '\\', '/');
if (strncmp(modified_path, "/", 1) == 0)
{
- final_path = axis2_stracat("file://", modified_path, env);
+ final_path = axis2_stracat(env, "file://", modified_path);
}
else
{
- final_path = axis2_stracat("file:///", modified_path, env);
+ final_path = axis2_stracat(env, "file:///", modified_path);
}
if (modified_path)
{
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c Wed Mar 28 04:21:09 2007
@@ -109,13 +109,13 @@
if (!use_impl->members)
return NULL;
axis2_array_list_add(use_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_NONE, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_NONE));
axis2_array_list_add(use_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_OPTIONAL, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_OPTIONAL));
axis2_array_list_add(use_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_PROHIBITED, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_PROHIBITED));
axis2_array_list_add(use_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_REQUIRED, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_REQUIRED));
use_impl->schema_enum = xml_schema_enum_create(env, value);
@@ -126,12 +126,12 @@
return NULL;
}
axis2_hash_set(use_impl->ht_super,
- axis2_strdup("XML_SCHEMA_USE", env),
+ axis2_strdup(env, "XML_SCHEMA_USE"),
AXIS2_HASH_KEY_STRING,
&(use_impl->use));
axis2_hash_set(use_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ENUM", env),
+ axis2_strdup(env, "XML_SCHEMA_ENUM"),
AXIS2_HASH_KEY_STRING,
use_impl->schema_enum);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c Wed Mar 28 04:21:09 2007
@@ -101,16 +101,16 @@
}
axis2_hash_set(xpath_impl->ht_super,
- axis2_strdup("XML_SCHEMA_XPATH", env),
+ axis2_strdup(env, "XML_SCHEMA_XPATH"),
AXIS2_HASH_KEY_STRING,
&(xpath_impl->xpath));
axis2_hash_set(xpath_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ANNOTATED", env),
+ axis2_strdup(env, "XML_SCHEMA_ANNOTATED"),
AXIS2_HASH_KEY_STRING,
xpath_impl->annotated);
axis2_hash_set(xpath_impl->ht_super,
- axis2_strdup("XML_SCHEMA_OBJ", env),
+ axis2_strdup(env, "XML_SCHEMA_OBJ"),
AXIS2_HASH_KEY_STRING,
XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(xpath_impl->annotated, env));
@@ -231,7 +231,7 @@
AXIS2_FREE(env->allocator, xpath_impl->x_path);
xpath_impl->x_path = NULL;
}
- xpath_impl->x_path = axis2_strdup(x_path, env);
+ xpath_impl->x_path = axis2_strdup(env, x_path);
if (!xpath_impl->x_path)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c Wed Mar 28 04:21:09 2007
@@ -109,9 +109,9 @@
return NULL;
}
axis2_array_list_add(severity_type_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_ERROR, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_ERROR));
axis2_array_list_add(severity_type_impl->members, env,
- axis2_strdup(XML_SCHEMA_CONST_WARNING, env));
+ axis2_strdup(env, XML_SCHEMA_CONST_WARNING));
severity_type_impl->schema_enum = xml_schema_enum_create(env, value);
if (!severity_type_impl->schema_enum)
@@ -130,11 +130,11 @@
}
axis2_hash_set(severity_type_impl->ht_super,
- axis2_strdup("XML_SCHEMA_SEVERITY_TYPE", env),
+ axis2_strdup(env, "XML_SCHEMA_SEVERITY_TYPE"),
AXIS2_HASH_KEY_STRING, &(severity_type_impl->severity_type));
axis2_hash_set(severity_type_impl->ht_super,
- axis2_strdup("XML_SCHEMA_ENUM", env),
+ axis2_strdup(env, "XML_SCHEMA_ENUM"),
AXIS2_HASH_KEY_STRING, severity_type_impl->schema_enum);
status = xml_schema_enum_resolve_methods(
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c?view=diff&rev=523280&r1=523279&r2=523280
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c Wed Mar 28 04:21:09 2007
@@ -115,29 +115,29 @@
return NULL;
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("CDATA", env));
+ axis2_strdup(env, "CDATA"));
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("IDREF", env));
+ axis2_strdup(env, "IDREF"));
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("IDREFS", env));
+ axis2_strdup(env, "IDREFS"));
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("ENTITY", env));
+ axis2_strdup(env, "ENTITY"));
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("ENTITIES", env));
+ axis2_strdup(env, "ENTITIES"));
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("NMTOKEN", env));
+ axis2_strdup(env, "NMTOKEN"));
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("NMTOKENS", env));
+ axis2_strdup(env, "NMTOKENS"));
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("NOTATION", env));
+ axis2_strdup(env, "NOTATION"));
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("ENUMERATION", env));
+ axis2_strdup(env, "ENUMERATION"));
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("QName", env));
+ axis2_strdup(env, "QName"));
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("NCName", env));
+ axis2_strdup(env, "NCName"));
axis2_array_list_add(tokenized_type_impl->members, env,
- axis2_strdup("None", env));
+ axis2_strdup(env, "None"));
tokenized_type_impl->schema_enum = xml_schema_enum_create(env, value);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org