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 na...@apache.org on 2006/06/07 14:03:30 UTC
svn commit: r412382 [3/3] - in /webservices/axis2/trunk/c/xml_schema:
include/xml_schema/ samples/ src/ test/
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?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- 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 Jun 7 05:03:26 2006
@@ -60,7 +60,7 @@
const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_list_type(void *simple_type_list,
+axis2_xml_schema_simple_type_list_get_type(void *simple_type_list,
const axis2_env_t *env);
axis2_xml_schema_simple_type_t* AXIS2_CALL
@@ -122,8 +122,8 @@
simple_type_list_impl->simple_type_list.ops->free =
axis2_xml_schema_simple_type_list_free;
- simple_type_list_impl->simple_type_list.ops->type =
- axis2_xml_schema_simple_type_list_type;
+ simple_type_list_impl->simple_type_list.ops->get_type =
+ axis2_xml_schema_simple_type_list_get_type;
simple_type_list_impl->simple_type_list.ops->super_objs =
axis2_xml_schema_simple_type_list_super_objs;
simple_type_list_impl->simple_type_list.ops->get_base_impl =
@@ -156,8 +156,8 @@
AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_list_get_item_type_name);
axis2_hash_set(simple_type_list_impl->methods, "set_base_type_name",
AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_list_set_item_type_name);
- axis2_hash_set(simple_type_list_impl->methods, "type",
- AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_list_type);
+ axis2_hash_set(simple_type_list_impl->methods, "get_type",
+ AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_list_get_type);
axis2_hash_set(simple_type_list_impl->methods, "super_objs",
AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_list_super_objs);
@@ -365,7 +365,7 @@
}
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_list_type(void *simple_type_list,
+axis2_xml_schema_simple_type_list_get_type(void *simple_type_list,
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(simple_type_list)->obj_type;
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?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- 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 Jun 7 05:03:26 2006
@@ -63,7 +63,7 @@
const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_type(void *simple_type_restriction,
+axis2_xml_schema_simple_type_restriction_get_type(void *simple_type_restriction,
const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
@@ -133,8 +133,8 @@
axis2_xml_schema_simple_type_restriction_free;
simple_type_restriction_impl->simple_type_restriction.ops->get_base_impl =
axis2_xml_schema_simple_type_restriction_get_base_impl;
- simple_type_restriction_impl->simple_type_restriction.ops->type =
- axis2_xml_schema_simple_type_restriction_type;
+ simple_type_restriction_impl->simple_type_restriction.ops->get_type =
+ axis2_xml_schema_simple_type_restriction_get_type;
simple_type_restriction_impl->simple_type_restriction.ops->super_objs =
axis2_xml_schema_simple_type_restriction_super_objs;
simple_type_restriction_impl->simple_type_restriction.ops->get_base_type =
@@ -161,8 +161,8 @@
axis2_xml_schema_simple_type_restriction_free);
axis2_hash_set(simple_type_restriction_impl->methods, "get_base_type",
AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_restriction_get_base_type);
- axis2_hash_set(simple_type_restriction_impl->methods, "type",
- AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_restriction_type);
+ axis2_hash_set(simple_type_restriction_impl->methods, "get_type",
+ AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_restriction_get_type);
axis2_hash_set(simple_type_restriction_impl->methods, "super_objs",
AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_restriction_super_objs); axis2_hash_set(simple_type_restriction_impl->methods, "set_base_type",
AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_restriction_set_base_type);
@@ -386,7 +386,7 @@
}
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_type(void *simple_type_restriction,
+axis2_xml_schema_simple_type_restriction_get_type(void *simple_type_restriction,
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(simple_type_restriction)->obj_type;
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?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- 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 Jun 7 05:03:26 2006
@@ -53,7 +53,7 @@
const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_union_type(void *simple_type_union,
+axis2_xml_schema_simple_type_union_get_type(void *simple_type_union,
const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
@@ -135,8 +135,8 @@
axis2_xml_schema_simple_type_union_free;
simple_type_union_impl->simple_type_union.ops->get_base_impl =
axis2_xml_schema_simple_type_union_get_base_impl;
- simple_type_union_impl->simple_type_union.ops->type =
- axis2_xml_schema_simple_type_union_type;
+ simple_type_union_impl->simple_type_union.ops->get_type =
+ axis2_xml_schema_simple_type_union_get_type;
simple_type_union_impl->simple_type_union.ops->super_objs =
axis2_xml_schema_simple_type_union_super_objs;
simple_type_union_impl->simple_type_union.ops->get_base_types =
@@ -165,8 +165,8 @@
axis2_xml_schema_simple_type_union_free);
axis2_hash_set(simple_type_union_impl->methods, "get_base_types",
AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_union_get_base_types);
- axis2_hash_set(simple_type_union_impl->methods, "type",
- AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_union_type);
+ axis2_hash_set(simple_type_union_impl->methods, "get_type",
+ AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_union_get_type);
axis2_hash_set(simple_type_union_impl->methods, "super_objs",
AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_union_super_objs); axis2_hash_set(simple_type_union_impl->methods, "set_member_types_source",
AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_union_set_member_types_source);
@@ -377,7 +377,7 @@
}
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_union_type(void *simple_type_union,
+axis2_xml_schema_simple_type_union_get_type(void *simple_type_union,
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(simple_type_union)->obj_type;
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?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c Wed Jun 7 05:03:26 2006
@@ -75,7 +75,7 @@
const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_type_type(void *type,
+axis2_xml_schema_type_get_type(void *type,
const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
@@ -178,8 +178,8 @@
axis2_xml_schema_type_free;
type_impl->type.ops->get_base_impl =
axis2_xml_schema_type_get_base_impl;
- type_impl->type.ops->type =
- axis2_xml_schema_type_type;
+ type_impl->type.ops->get_type =
+ axis2_xml_schema_type_get_type;
type_impl->type.ops->super_objs =
axis2_xml_schema_type_super_objs;
type_impl->type.ops->get_base_schema_type =
@@ -225,8 +225,8 @@
axis2_xml_schema_type_free);
axis2_hash_set(type_impl->methods, "get_base_schema_type",
AXIS2_HASH_KEY_STRING, axis2_xml_schema_type_get_base_schema_type);
- axis2_hash_set(type_impl->methods, "type",
- AXIS2_HASH_KEY_STRING, axis2_xml_schema_type_type);
+ axis2_hash_set(type_impl->methods, "get_type",
+ AXIS2_HASH_KEY_STRING, axis2_xml_schema_type_get_type);
axis2_hash_set(type_impl->methods, "super_objs",
AXIS2_HASH_KEY_STRING, axis2_xml_schema_type_super_objs);
axis2_hash_set(type_impl->methods, "get_data_type",
@@ -351,7 +351,7 @@
type->ops->free = axis2_hash_get(methods, "free",
AXIS2_HASH_KEY_STRING);
- type->ops->type = axis2_hash_get(methods, "type",
+ type->ops->get_type = axis2_hash_get(methods, "get_type",
AXIS2_HASH_KEY_STRING);
type->ops->super_objs = axis2_hash_get(methods, "super_objs",
AXIS2_HASH_KEY_STRING);
@@ -666,7 +666,7 @@
}
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_type_type(void *type,
+axis2_xml_schema_type_get_type(void *type,
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(type)->obj_type;
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?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c Wed Jun 7 05:03:26 2006
@@ -20,8 +20,7 @@
typedef struct axis2_xml_schema_use_impl axis2_xml_schema_use_impl_t;
/**
- * @brief Other Extension Struct Impl
- * Axis2 Other Extension
+ * @brief axis2_xml_schema_use_impl
*/
struct axis2_xml_schema_use_impl
{
@@ -50,7 +49,7 @@
const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_use_type(
+axis2_xml_schema_use_get_type(
void *use,
const axis2_env_t *env);
@@ -102,7 +101,7 @@
}
use_impl->use.ops->free = axis2_xml_schema_use_free;
use_impl->use.ops->super_objs = axis2_xml_schema_use_super_objs;
- use_impl->use.ops->type = axis2_xml_schema_use_type;
+ use_impl->use.ops->get_type = axis2_xml_schema_use_get_type;
use_impl->use.ops->get_base_impl = axis2_xml_schema_use_get_base_impl;
use_impl->use.ops->get_values =
axis2_xml_schema_use_get_values;
@@ -131,8 +130,8 @@
axis2_hash_set(use_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
axis2_xml_schema_use_super_objs);
- axis2_hash_set(use_impl->methods, "type", AXIS2_HASH_KEY_STRING,
- axis2_xml_schema_use_type);
+ axis2_hash_set(use_impl->methods, "get_type", AXIS2_HASH_KEY_STRING,
+ axis2_xml_schema_use_get_type);
axis2_hash_set(use_impl->methods, "get_values", AXIS2_HASH_KEY_STRING,
axis2_xml_schema_use_get_values);
@@ -231,7 +230,7 @@
}
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_use_type(
+axis2_xml_schema_use_get_type(
void *use,
const axis2_env_t *env)
{
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?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c Wed Jun 7 05:03:26 2006
@@ -45,7 +45,7 @@
const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_xpath_type(void *xpath,
+axis2_xml_schema_xpath_get_type(void *xpath,
const axis2_env_t *env);
axis2_hash_t *AXIS2_CALL
@@ -85,8 +85,8 @@
axis2_xml_schema_xpath_get_xpath;
xpath_impl->xpath.ops->set_xpath =
axis2_xml_schema_xpath_set_xpath;
- xpath_impl->xpath.ops->type =
- axis2_xml_schema_xpath_type;
+ xpath_impl->xpath.ops->get_type =
+ axis2_xml_schema_xpath_get_type;
xpath_impl->xpath.ops->super_objs =
axis2_xml_schema_xpath_super_objs;
@@ -250,7 +250,7 @@
return AXIS2_SUCCESS;
}
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_xpath_type(void *xpath,
+axis2_xml_schema_xpath_get_type(void *xpath,
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(xpath)->obj_type;
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?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c Wed Jun 7 05:03:26 2006
@@ -59,7 +59,7 @@
const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_severity_type_type(void *severity_type,
+axis2_xml_severity_type_get_type(void *severity_type,
const axis2_env_t *env);
AXIS2_EXTERN axis2_xml_severity_type_t * AXIS2_CALL
@@ -99,8 +99,8 @@
axis2_xml_severity_type_get_base_impl;
severity_type_impl->severity_type.ops->get_values =
axis2_xml_severity_type_get_values;
- severity_type_impl->severity_type.ops->type =
- axis2_xml_severity_type_type;
+ severity_type_impl->severity_type.ops->get_type =
+ axis2_xml_severity_type_get_type;
severity_type_impl->severity_type.ops->super_objs =
axis2_xml_severity_type_super_objs;
@@ -129,8 +129,9 @@
axis2_xml_severity_type_get_values);
axis2_hash_set(severity_type_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
axis2_xml_severity_type_super_objs);
- axis2_hash_set(severity_type_impl->methods, "type", AXIS2_HASH_KEY_STRING,
- axis2_xml_severity_type_type);
+ axis2_hash_set(severity_type_impl->methods, "get_type",
+ AXIS2_HASH_KEY_STRING,
+ axis2_xml_severity_type_get_type);
severity_type_impl->schema_enum = axis2_xml_schema_enum_create(env, value);
if(!severity_type_impl->schema_enum)
@@ -251,7 +252,7 @@
}
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_severity_type_type(void *severity_type,
+axis2_xml_severity_type_get_type(void *severity_type,
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(severity_type)->type;
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?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c Wed Jun 7 05:03:26 2006
@@ -56,7 +56,7 @@
const axis2_env_t *env);
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_tokenized_type_type(void *tokenized_type,
+axis2_xml_tokenized_type_get_type(void *tokenized_type,
const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
@@ -105,8 +105,8 @@
tokenized_type_impl->tokenized_type.ops->get_values =
axis2_xml_tokenized_type_get_values;
- tokenized_type_impl->tokenized_type.ops->type =
- axis2_xml_tokenized_type_type;
+ tokenized_type_impl->tokenized_type.ops->get_type =
+ axis2_xml_tokenized_type_get_type;
tokenized_type_impl->tokenized_type.ops->super_objs =
axis2_xml_tokenized_type_super_objs;
@@ -158,8 +158,8 @@
axis2_hash_set(tokenized_type_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
axis2_xml_tokenized_type_super_objs);
- axis2_hash_set(tokenized_type_impl->methods, "type", AXIS2_HASH_KEY_STRING,
- axis2_xml_tokenized_type_type);
+ axis2_hash_set(tokenized_type_impl->methods, "get_type", AXIS2_HASH_KEY_STRING,
+ axis2_xml_tokenized_type_get_type);
tokenized_type_impl->schema_enum = axis2_xml_schema_enum_create(env, value);
@@ -262,7 +262,7 @@
}
axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_tokenized_type_type(void *tokenized_type,
+axis2_xml_tokenized_type_get_type(void *tokenized_type,
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(tokenized_type)->obj_type;
Modified: webservices/axis2/trunk/c/xml_schema/test/main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/test/main.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/test/main.c (original)
+++ webservices/axis2/trunk/c/xml_schema/test/main.c Wed Jun 7 05:03:26 2006
@@ -27,5 +27,6 @@
int main(void) {
RunAllTests();
+ getchar();
return 0;
}
Modified: webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c (original)
+++ webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Wed Jun 7 05:03:26 2006
@@ -470,7 +470,7 @@
CuAssertPtrNotNull(tc, sch_type);
- type = AXIS2_XML_SCHEMA_TYPE_TYPE(sch_type, env);
+ type = AXIS2_XML_SCHEMA_TYPE_GET_TYPE(sch_type, env);
CuAssertIntEquals(tc, AXIS2_XML_SCHEMA_COMPLEX_TYPE, type);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org