Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 64060 invoked from network); 12 Jun 2006 10:30:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Jun 2006 10:30:52 -0000 Received: (qmail 18057 invoked by uid 500); 12 Jun 2006 10:30:45 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 16958 invoked by uid 500); 12 Jun 2006 10:30:39 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 16616 invoked by uid 500); 12 Jun 2006 10:30:37 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 16595 invoked by uid 99); 12 Jun 2006 10:30:36 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jun 2006 03:30:36 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jun 2006 03:30:31 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B18521A984E; Mon, 12 Jun 2006 03:30:10 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413626 [5/18] - in /webservices/axis2/trunk/c/xml_schema: include/ samples/ src/ test/ Date: Mon, 12 Jun 2006 10:29:46 -0000 To: axis2-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060612103010.B18521A984E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_list.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_list.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_list.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_list.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_list.h&r1=413615&r2=413626&rev=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_list.h (original) +++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_list.h Mon Jun 12 03:29:40 2006 @@ -14,22 +14,22 @@ * limitations under the License. */ -#ifndef AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_H -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_H +#ifndef XML_SCHEMA_SIMPLE_TYPE_LIST_H +#define XML_SCHEMA_SIMPLE_TYPE_LIST_H /** - * @file axis2_xml_schema_simple_type_list.h + * @file xml_schema_simple_type_list.h * @brief Axis2 Xml Schema Particle Interface * Base class for all simple_type_list types. */ -#include -#include -#include +#include +#include +#include #include -/** @defgroup axis2_xml_schema_simple_type_list - * @ingroup axis2_xml_schema +/** @defgroup xml_schema_simple_type_list + * @ingroup xml_schema * @{ */ #ifdef __cplusplus @@ -37,12 +37,12 @@ { #endif -typedef struct axis2_xml_schema_simple_type_list - axis2_xml_schema_simple_type_list_t; -typedef struct axis2_xml_schema_simple_type_list_ops - axis2_xml_schema_simple_type_list_ops_t; +typedef struct xml_schema_simple_type_list + xml_schema_simple_type_list_t; +typedef struct xml_schema_simple_type_list_ops + xml_schema_simple_type_list_ops_t; -struct axis2_xml_schema_simple_type_list_ops +struct xml_schema_simple_type_list_ops { /** * Deallocate memory @@ -52,11 +52,11 @@ free) (void *simple_type_list, const axis2_env_t *env); - axis2_xml_schema_simple_type_content_t *(AXIS2_CALL * + xml_schema_simple_type_content_t *(AXIS2_CALL * get_base_impl) (void *simple_type_list, const axis2_env_t *env); - axis2_xml_schema_types_t (AXIS2_CALL * + xml_schema_types_t (AXIS2_CALL * get_type)(void *simple_type_list, const axis2_env_t *env); @@ -65,7 +65,7 @@ const axis2_env_t *env); - axis2_xml_schema_simple_type_t *(AXIS2_CALL * + xml_schema_simple_type_t *(AXIS2_CALL * get_item_type)(void *simple_type_list, const axis2_env_t *env); @@ -73,7 +73,7 @@ axis2_status_t (AXIS2_CALL * set_item_type)(void *simple_type_list, const axis2_env_t *env, - axis2_xml_schema_simple_type_t *base_type); + xml_schema_simple_type_t *base_type); axis2_qname_t* (AXIS2_CALL * get_item_type_name)(void *simple_type_list, @@ -85,10 +85,10 @@ axis2_qname_t *qname); }; -struct axis2_xml_schema_simple_type_list +struct xml_schema_simple_type_list { - axis2_xml_schema_simple_type_content_t base; - axis2_xml_schema_simple_type_list_ops_t *ops; + xml_schema_simple_type_content_t base; + xml_schema_simple_type_list_ops_t *ops; }; /** @@ -99,43 +99,43 @@ * a reference to a named content model group (group), or an element wildcard * (any). */ -AXIS2_EXTERN axis2_xml_schema_simple_type_list_t * AXIS2_CALL -axis2_xml_schema_simple_type_list_create(const axis2_env_t *env); +AXIS2_EXTERN xml_schema_simple_type_list_t * AXIS2_CALL +xml_schema_simple_type_list_create(const axis2_env_t *env); /********************** Macros ***********************************************/ -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_FREE(simple_type_list, env) \ - (((axis2_xml_schema_simple_type_list_t *) simple_type_list)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_LIST_FREE(simple_type_list, env) \ + (((xml_schema_simple_type_list_t *) simple_type_list)->ops->\ free(simple_type_list, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_GET_BASE_IMPL(simple_type_list, env) \ - (((axis2_xml_schema_simple_type_list_t *) simple_type_list)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_LIST_GET_BASE_IMPL(simple_type_list, env) \ + (((xml_schema_simple_type_list_t *) simple_type_list)->ops->\ get_base_impl(simple_type_list, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_TYPE(simple_type_list, env) \ - (((axis2_xml_schema_simple_type_list_t *) simple_type_list)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_LIST_TYPE(simple_type_list, env) \ + (((xml_schema_simple_type_list_t *) simple_type_list)->ops->\ get_type(simple_type_list, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_SUPER_OBJS(simple_type_list, env) \ - (((axis2_xml_schema_simple_type_list_t *) simple_type_list)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_LIST_SUPER_OBJS(simple_type_list, env) \ + (((xml_schema_simple_type_list_t *) simple_type_list)->ops->\ super_objs(simple_type_list, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_GET_ITEM_TYPE(simple_type_list, env) \ - (((axis2_xml_schema_simple_type_list_t *) simple_type_list)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_LIST_GET_ITEM_TYPE(simple_type_list, env) \ + (((xml_schema_simple_type_list_t *) simple_type_list)->ops->\ get_item_type(simple_type_list, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_SET_ITEM_TYPE(simple_type_list,\ +#define XML_SCHEMA_SIMPLE_TYPE_LIST_SET_ITEM_TYPE(simple_type_list,\ env, base_type) \ - (((axis2_xml_schema_simple_type_list_t *) simple_type_list)->ops->\ + (((xml_schema_simple_type_list_t *) simple_type_list)->ops->\ set_item_type(simple_type_list, env, base_type)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_GET_ITEM_TYPE_NAME(simple_type_list, env) \ - (((axis2_xml_schema_simple_type_list_t *) simple_type_list)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_LIST_GET_ITEM_TYPE_NAME(simple_type_list, env) \ + (((xml_schema_simple_type_list_t *) simple_type_list)->ops->\ get_item_type_name(simple_type_list, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_SET_ITEM_TYPE_NAME(simple_type_list, \ +#define XML_SCHEMA_SIMPLE_TYPE_LIST_SET_ITEM_TYPE_NAME(simple_type_list, \ env, base_type_name) \ - (((axis2_xml_schema_simple_type_list_t *) simple_type_list)->ops->\ + (((xml_schema_simple_type_list_t *) simple_type_list)->ops->\ set_item_type_name(simple_type_list, env, base_type_name)) /************************ end macros **********************************************/ @@ -143,4 +143,4 @@ #ifdef __cplusplus } #endif -#endif /* AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_H */ +#endif /* XML_SCHEMA_SIMPLE_TYPE_LIST_H */ Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_restriction.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_restriction.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_restriction.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_restriction.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_restriction.h&r1=413615&r2=413626&rev=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_restriction.h (original) +++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_restriction.h Mon Jun 12 03:29:40 2006 @@ -14,22 +14,22 @@ * limitations under the License. */ -#ifndef AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_H -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_H +#ifndef XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_H +#define XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_H /** - * @file axis2_xml_schema_simple_type_restriction.h + * @file xml_schema_simple_type_restriction.h * @brief Axis2 Xml Schema Particle Interface * Base class for all simple_type_restriction types. */ -#include -#include -#include +#include +#include +#include #include -/** @defgroup axis2_xml_schema_simple_type_restriction - * @ingroup axis2_xml_schema +/** @defgroup xml_schema_simple_type_restriction + * @ingroup xml_schema * @{ */ #ifdef __cplusplus @@ -37,22 +37,22 @@ { #endif -typedef struct axis2_xml_schema_simple_type_restriction - axis2_xml_schema_simple_type_restriction_t; -typedef struct axis2_xml_schema_simple_type_restriction_ops - axis2_xml_schema_simple_type_restriction_ops_t; +typedef struct xml_schema_simple_type_restriction + xml_schema_simple_type_restriction_t; +typedef struct xml_schema_simple_type_restriction_ops + xml_schema_simple_type_restriction_ops_t; -struct axis2_xml_schema_simple_type_restriction_ops +struct xml_schema_simple_type_restriction_ops { axis2_status_t (AXIS2_CALL * free) (void *simple_type_restriction, const axis2_env_t *env); - axis2_xml_schema_simple_type_content_t *(AXIS2_CALL * + xml_schema_simple_type_content_t *(AXIS2_CALL * get_base_impl) (void *simple_type_restriction, const axis2_env_t *env); - axis2_xml_schema_types_t (AXIS2_CALL * + xml_schema_types_t (AXIS2_CALL * get_type)(void *simple_type_restriction, const axis2_env_t *env); @@ -60,14 +60,14 @@ super_objs)(void *simple_type_restriction, const axis2_env_t *env); - axis2_xml_schema_simple_type_t *(AXIS2_CALL * + xml_schema_simple_type_t *(AXIS2_CALL * get_base_type)(void *simple_type_restriction, const axis2_env_t *env); axis2_status_t (AXIS2_CALL * set_base_type)(void *simple_type_restriction, const axis2_env_t *env, - axis2_xml_schema_simple_type_t *base_type); + xml_schema_simple_type_t *base_type); axis2_qname_t* (AXIS2_CALL * get_base_type_name)(void *simple_type_restriction, @@ -78,7 +78,7 @@ const axis2_env_t *env, axis2_qname_t *qname); - axis2_xml_schema_obj_collection_t* (AXIS2_CALL * + xml_schema_obj_collection_t* (AXIS2_CALL * get_facets)(void *simple_type_restriction, const axis2_env_t *env); @@ -91,10 +91,10 @@ }; -struct axis2_xml_schema_simple_type_restriction +struct xml_schema_simple_type_restriction { - axis2_xml_schema_simple_type_content_t base; - axis2_xml_schema_simple_type_restriction_ops_t *ops; + xml_schema_simple_type_content_t base; + xml_schema_simple_type_restriction_ops_t *ops; }; /** @@ -105,45 +105,45 @@ * a reference to a named content model group (group), or an element wildcard * (any). */ -AXIS2_EXTERN axis2_xml_schema_simple_type_restriction_t * AXIS2_CALL -axis2_xml_schema_simple_type_restriction_create(const axis2_env_t *env); +AXIS2_EXTERN xml_schema_simple_type_restriction_t * AXIS2_CALL +xml_schema_simple_type_restriction_create(const axis2_env_t *env); -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_FREE(simple_type_restriction, env) \ - (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_FREE(simple_type_restriction, env) \ + (((xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ free(simple_type_restriction, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_BASE_IMPL(simple_type_restriction, env) \ - (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_BASE_IMPL(simple_type_restriction, env) \ + (((xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ get_base_impl(simple_type_restriction, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_TYPE(simple_type_restriction, env) \ - (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_TYPE(simple_type_restriction, env) \ + (((xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ get_type(simple_type_restriction, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_SUPER_OBJS(simple_type_restriction, env) \ - (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_SUPER_OBJS(simple_type_restriction, env) \ + (((xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ super_objs(simple_type_restriction, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_BASE_TYPE(simple_type_restriction, env) \ - (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_BASE_TYPE(simple_type_restriction, env) \ + (((xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ get_max_occurs(simple_type_restriction, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_SET_BASE_TYPE(simple_type_restriction,\ +#define XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_SET_BASE_TYPE(simple_type_restriction,\ env, base_type) \ - (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ + (((xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ set_base_type(simple_type_restriction, env, base_type)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_BASE_TYPE_NAME(simple_type_restriction, env) \ - (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_BASE_TYPE_NAME(simple_type_restriction, env) \ + (((xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ get_base_type_name(simple_type_restriction, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_SET_BASE_TYPE_NAME(simple_type_restriction, \ +#define XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_SET_BASE_TYPE_NAME(simple_type_restriction, \ env, base_type_name) \ - (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ + (((xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ set_base_type_name(simple_type_restriction, env, base_type_name)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_FACETS(simple_type_restriction, env) \ - (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_FACETS(simple_type_restriction, env) \ + (((xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\ get_facets(simple_type_restriction, env)) @@ -151,4 +151,4 @@ #ifdef __cplusplus } #endif -#endif /* AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_H */ +#endif /* XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_H */ Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_union.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_union.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_union.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_union.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_union.h&r1=413615&r2=413626&rev=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_union.h (original) +++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_union.h Mon Jun 12 03:29:40 2006 @@ -14,23 +14,23 @@ * limitations under the License. */ -#ifndef AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_H -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_H +#ifndef XML_SCHEMA_SIMPLE_TYPE_UNION_H +#define XML_SCHEMA_SIMPLE_TYPE_UNION_H /** - * @file axis2_xml_schema_simple_type_union.h + * @file xml_schema_simple_type_union.h * @brief Axis2 Xml Schema Particle Interface * Base class for all simple_type_union types. */ -#include -#include -#include +#include +#include +#include #include #include -/** @defgroup axis2_xml_schema_simple_type_union - * @ingroup axis2_xml_schema +/** @defgroup xml_schema_simple_type_union + * @ingroup xml_schema * @{ */ #ifdef __cplusplus @@ -38,17 +38,17 @@ { #endif -typedef struct axis2_xml_schema_simple_type_union - axis2_xml_schema_simple_type_union_t; -typedef struct axis2_xml_schema_simple_type_union_ops - axis2_xml_schema_simple_type_union_ops_t; +typedef struct xml_schema_simple_type_union + xml_schema_simple_type_union_t; +typedef struct xml_schema_simple_type_union_ops + xml_schema_simple_type_union_ops_t; -struct axis2_xml_schema_simple_type_union_ops +struct xml_schema_simple_type_union_ops { axis2_status_t (AXIS2_CALL * free)(void *sim_type_union, const axis2_env_t *env); - axis2_xml_schema_simple_type_content_t *(AXIS2_CALL * + xml_schema_simple_type_content_t *(AXIS2_CALL * get_base_impl)( void *sim_type_union, const axis2_env_t *env); @@ -58,12 +58,12 @@ void *sim_type_union, const axis2_env_t *env); - axis2_xml_schema_types_t (AXIS2_CALL * + xml_schema_types_t (AXIS2_CALL * get_type)( void *sim_type_union, const axis2_env_t *env); - axis2_xml_schema_obj_collection_t*(AXIS2_CALL * + xml_schema_obj_collection_t*(AXIS2_CALL * get_base_types)( void *sim_type_union, const axis2_env_t *env); @@ -92,10 +92,10 @@ }; -struct axis2_xml_schema_simple_type_union +struct xml_schema_simple_type_union { - axis2_xml_schema_simple_type_content_t base; - axis2_xml_schema_simple_type_union_ops_t *ops; + xml_schema_simple_type_content_t base; + xml_schema_simple_type_union_ops_t *ops; }; /** @@ -106,44 +106,44 @@ * a reference to a named content model group (group), or an element wildcard * (any). */ -AXIS2_EXTERN axis2_xml_schema_simple_type_union_t * AXIS2_CALL -axis2_xml_schema_simple_type_union_create(const axis2_env_t *env); +AXIS2_EXTERN xml_schema_simple_type_union_t * AXIS2_CALL +xml_schema_simple_type_union_create(const axis2_env_t *env); -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_FREE(sim_type_union, env) \ - (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_UNION_FREE(sim_type_union, env) \ + (((xml_schema_simple_type_union_t *) sim_type_union)->ops->\ free(sim_type_union, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_GET_BASE_IMPL(sim_type_union, env) \ - (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_UNION_GET_BASE_IMPL(sim_type_union, env) \ + (((xml_schema_simple_type_union_t *) sim_type_union)->ops->\ get_base_impl(sim_type_union, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_SUPER_OBJS(sim_type_union, env) \ - (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_UNION_SUPER_OBJS(sim_type_union, env) \ + (((xml_schema_simple_type_union_t *) sim_type_union)->ops->\ super_objs(sim_type_union, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_GET_TYPE(sim_type_union, env) \ - (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_UNION_GET_TYPE(sim_type_union, env) \ + (((xml_schema_simple_type_union_t *) sim_type_union)->ops->\ get_type(sim_type_union, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_GET_BASE_TYPES(sim_type_union, env) \ - (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_UNION_GET_BASE_TYPES(sim_type_union, env) \ + (((xml_schema_simple_type_union_t *) sim_type_union)->ops->\ get_base_types(sim_type_union, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_SET_MEMBER_TYPES_SOURCE(sim_type_union,\ +#define XML_SCHEMA_SIMPLE_TYPE_UNION_SET_MEMBER_TYPES_SOURCE(sim_type_union,\ env, member_types_sources) \ - (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\ + (((xml_schema_simple_type_union_t *) sim_type_union)->ops->\ set_member_types_source(sim_type_union, env, member_types_sources)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_GET_MEMBER_TYPES_SOURCE(sim_type_union, env) \ - (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_UNION_GET_MEMBER_TYPES_SOURCE(sim_type_union, env) \ + (((xml_schema_simple_type_union_t *) sim_type_union)->ops->\ get_member_types_source(sim_type_union, env)) -#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_SET_MEMBER_TYPES_QNAMES(sim_type_union, env, qns) \ - (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\ +#define XML_SCHEMA_SIMPLE_TYPE_UNION_SET_MEMBER_TYPES_QNAMES(sim_type_union, env, qns) \ + (((xml_schema_simple_type_union_t *) sim_type_union)->ops->\ set_member_types_qnames(sim_type_union, env, qns)) /** @} */ #ifdef __cplusplus } #endif -#endif /* AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_H */ +#endif /* XML_SCHEMA_SIMPLE_TYPE_UNION_H */ Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_tokenized_type.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_tokenized_type.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_tokenized_type.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_tokenized_type.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_tokenized_type.h&r1=413615&r2=413626&rev=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_tokenized_type.h (original) +++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_tokenized_type.h Mon Jun 12 03:29:40 2006 @@ -14,33 +14,33 @@ * limitations under the License. */ -#ifndef AXIS2_XML_TOKENIZED_TYPE_H -#define AXIS2_XML_TOKENIZED_TYPE_H +#ifndef XML_SCHEMA_TOKENIZED_TYPE_H +#define XML_SCHEMA_TOKENIZED_TYPE_H /** - * @file axis2_xml_tokenized_type.h + * @file xml_schema_tokenized_type.h * @brief Axis2 Xml Tokenized Type Interface * Indicator of how the attribute is used. * */ -#include +#include -/** @defgroup axis2_xml_tokenized_type Xml Tokenized Type - * @ingroup axis2_xml_schema +/** @defgroup xml_schema_tokenized_type Xml Tokenized Type + * @ingroup xml_schema * @{ */ -typedef struct axis2_xml_tokenized_type axis2_xml_tokenized_type_t; -typedef struct axis2_xml_tokenized_type_ops - axis2_xml_tokenized_type_ops_t; +typedef struct xml_schema_tokenized_type xml_schema_tokenized_type_t; +typedef struct xml_schema_tokenized_type_ops + xml_schema_tokenized_type_ops_t; #ifdef __cplusplus extern "C" { #endif -struct axis2_xml_tokenized_type_ops +struct xml_schema_tokenized_type_ops { /** * Deallocate memory @@ -50,7 +50,7 @@ free) (void *tokenized_type, const axis2_env_t *env); - axis2_xml_schema_enum_t *(AXIS2_CALL * + xml_schema_enum_t *(AXIS2_CALL * get_base_impl) (void *tokenized_type, const axis2_env_t *env); @@ -62,41 +62,41 @@ super_objs)(void *tokenized_type, const axis2_env_t *env); - axis2_xml_schema_types_t (AXIS2_CALL * + xml_schema_types_t (AXIS2_CALL * get_type)(void *tokenized_type, const axis2_env_t *env); }; -struct axis2_xml_tokenized_type +struct xml_schema_tokenized_type { - axis2_xml_schema_enum_t base; - axis2_xml_tokenized_type_ops_t *ops; + xml_schema_enum_t base; + xml_schema_tokenized_type_ops_t *ops; }; -AXIS2_EXTERN axis2_xml_tokenized_type_t * AXIS2_CALL -axis2_xml_tokenized_type_create(const axis2_env_t *env, +AXIS2_EXTERN xml_schema_tokenized_type_t * AXIS2_CALL +xml_schema_tokenized_type_create(const axis2_env_t *env, axis2_char_t* value); /********************** Macros **************************************************************/ -#define AXIS2_XML_TOKENIZED_TYPE_FREE(tokenized_type, env) \ - (((axis2_xml_tokenized_type_t *) tokenized_type)->ops->free(tokenized_type, env)) +#define XML_SCHEMA_TOKENIZED_TYPE_FREE(tokenized_type, env) \ + (((xml_schema_tokenized_type_t *) tokenized_type)->ops->free(tokenized_type, env)) -#define AXIS2_XML_TOKENIZED_TYPE_GET_BASE_IMPL(tokenized_type, env) \ - (((axis2_xml_tokenized_type_t *) tokenized_type)->ops->get_base_impl(tokenized_type, env)) +#define XML_SCHEMA_TOKENIZED_TYPE_GET_BASE_IMPL(tokenized_type, env) \ + (((xml_schema_tokenized_type_t *) tokenized_type)->ops->get_base_impl(tokenized_type, env)) -#define AXIS2_XML_TOKENIZED_TYPE_GET_VALUES(tokenized_type, env) \ - (((axis2_xml_tokenized_type_t *) tokenized_type)->ops->values(tokenized_type, env)) +#define XML_SCHEMA_TOKENIZED_TYPE_GET_VALUES(tokenized_type, env) \ + (((xml_schema_tokenized_type_t *) tokenized_type)->ops->values(tokenized_type, env)) -#define AXIS2_XML_TOKENIZED_TYPE_SUPER_OBJS(tokenized_type, env) \ - (((axis2_xml_tokenized_type_t *) tokenized_type)->ops->super_objs(tokenized_type, env)) +#define XML_SCHEMA_TOKENIZED_TYPE_SUPER_OBJS(tokenized_type, env) \ + (((xml_schema_tokenized_type_t *) tokenized_type)->ops->super_objs(tokenized_type, env)) -#define AXIS2_XML_TOKENIZED_TYPE_GET_TYPE(tokenized_type, env) \ - (((axis2_xml_tokenized_type_t *) tokenized_type)->ops->\ +#define XML_SCHEMA_TOKENIZED_TYPE_GET_TYPE(tokenized_type, env) \ + (((xml_schema_tokenized_type_t *) tokenized_type)->ops->\ get_type(tokenized_type, env)) /** @} */ #ifdef __cplusplus } #endif -#endif /* AXIS2_XML_TOKENIZED_TYPE_H */ +#endif /* XML_SCHEMA_TOKENIZED_TYPE_H */ Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_type.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_type.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_type.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_type.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_type.h&r1=413615&r2=413626&rev=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_type.h (original) +++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_type.h Mon Jun 12 03:29:40 2006 @@ -14,42 +14,42 @@ * limitations under the License. */ -#ifndef AXIS2_XML_SCHEMA_TYPE_H -#define AXIS2_XML_SCHEMA_TYPE_H +#ifndef XML_SCHEMA_TYPE_H +#define XML_SCHEMA_TYPE_H /** - * @file axis2_xml_schema_type.h + * @file xml_schema_type.h * @brief Axis2 Xml Schema Type Interface * The base class for all simple types and complex types. */ -#include +#include #include #include -/** @defgroup axis2_xml_schema_type Xml Schema Type - * @ingroup axis2_xml_schema +/** @defgroup xml_schema_type Xml Schema Type + * @ingroup xml_schema * @{ */ -typedef struct axis2_xml_schema_type axis2_xml_schema_type_t; -typedef struct axis2_xml_schema_type_ops axis2_xml_schema_type_ops_t; -struct axis2_xml_schema_data_type; -struct axis2_xml_schema_derivation_method; -struct axis2_xml_schema; +typedef struct xml_schema_type xml_schema_type_t; +typedef struct xml_schema_type_ops xml_schema_type_ops_t; +struct xml_schema_data_type; +struct xml_schema_derivation_method; +struct xml_schema; #ifdef __cplusplus extern "C" { #endif -struct axis2_xml_schema_type_ops +struct xml_schema_type_ops { axis2_status_t (AXIS2_CALL * free) (void *type, const axis2_env_t *env); - axis2_xml_schema_annotated_t *(AXIS2_CALL * + xml_schema_annotated_t *(AXIS2_CALL * get_base_impl) (void *type, const axis2_env_t *env); @@ -57,7 +57,7 @@ super_objs)(void *type, const axis2_env_t *env); - axis2_xml_schema_types_t (AXIS2_CALL * + xml_schema_types_t (AXIS2_CALL * get_type)(void *type, const axis2_env_t *env); @@ -65,24 +65,24 @@ get_base_schema_type) (void *type, const axis2_env_t *env); - struct axis2_xml_schema_data_type *(AXIS2_CALL * + struct xml_schema_data_type *(AXIS2_CALL * get_data_type) (void *type, const axis2_env_t *env); - struct axis2_xml_schema_derivation_method *(AXIS2_CALL * + struct xml_schema_derivation_method *(AXIS2_CALL * get_derive_by) (void *type, const axis2_env_t *env); - struct axis2_xml_schema_derivation_method *(AXIS2_CALL * + struct xml_schema_derivation_method *(AXIS2_CALL * get_final) (void *type, const axis2_env_t *env); axis2_status_t (AXIS2_CALL * set_final) (void *type, const axis2_env_t *env, - struct axis2_xml_schema_derivation_method *final_derivation); + struct xml_schema_derivation_method *final_derivation); - struct axis2_xml_schema_derivation_method *(AXIS2_CALL * + struct xml_schema_derivation_method *(AXIS2_CALL * get_final_resolved) (void *type, const axis2_env_t *env); @@ -110,10 +110,10 @@ }; -struct axis2_xml_schema_type +struct xml_schema_type { - axis2_xml_schema_annotated_t base; - axis2_xml_schema_type_ops_t *ops; + xml_schema_annotated_t base; + xml_schema_type_ops_t *ops; }; /** @@ -124,83 +124,83 @@ * a reference to a named content model group (group), or an element wildcard * (any). */ -AXIS2_EXTERN axis2_xml_schema_type_t * AXIS2_CALL -axis2_xml_schema_type_create(const axis2_env_t *env, - struct axis2_xml_schema *schema); +AXIS2_EXTERN xml_schema_type_t * AXIS2_CALL +xml_schema_type_create(const axis2_env_t *env, + struct xml_schema *schema); /** * This method is internal to Axis2 C. It is called from Child Constructor */ AXIS2_EXTERN axis2_status_t AXIS2_CALL -axis2_xml_schema_type_resolve_methods( - axis2_xml_schema_type_t *type, +xml_schema_type_resolve_methods( + xml_schema_type_t *type, const axis2_env_t *env, - axis2_xml_schema_type_t *type_impl, + xml_schema_type_t *type_impl, axis2_hash_t *methods); -#define AXIS2_XML_SCHEMA_TYPE_FREE(type, env) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_FREE(type, env) \ + (((xml_schema_type_t *) type)->ops->\ free(type, env)) -#define AXIS2_XML_SCHEMA_TYPE_GET_BASE_IMPL(type, env) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_GET_BASE_IMPL(type, env) \ + (((xml_schema_type_t *) type)->ops->\ get_base_impl(type, env)) -#define AXIS2_XML_SCHEMA_TYPE_GET_TYPE(sch_type, env) \ - (((axis2_xml_schema_type_t *) sch_type)->ops->\ +#define XML_SCHEMA_TYPE_GET_TYPE(sch_type, env) \ + (((xml_schema_type_t *) sch_type)->ops->\ get_type(sch_type, env)) -#define AXIS2_XML_SCHEMA_TYPE_SUPER_OBJS(type, env) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_SUPER_OBJS(type, env) \ + (((xml_schema_type_t *) type)->ops->\ super_objs(type, env)) -#define AXIS2_XML_SCHEMA_TYPE_GET_BASE_SCHEMA_TYPE(type, env) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_GET_BASE_SCHEMA_TYPE(type, env) \ + (((xml_schema_type_t *) type)->ops->\ get_base_schema_type(type, env)) -#define AXIS2_XML_SCHEMA_TYPE_GET_DATA_TYPE(type, env, max_occurs) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_GET_DATA_TYPE(type, env, max_occurs) \ + (((xml_schema_type_t *) type)->ops->\ get_data_type(type, env, max_occurs)) -#define AXIS2_XML_SCHEMA_TYPE_DERIVE_BY(type, env) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_DERIVE_BY(type, env) \ + (((xml_schema_type_t *) type)->ops->\ get_derive_by(type, env)) -#define AXIS2_XML_SCHEMA_TYPE_GET_FINAL(type, env) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_GET_FINAL(type, env) \ + (((xml_schema_type_t *) type)->ops->\ get_final(type, env)) -#define AXIS2_XML_SCHEMA_TYPE_SET_FINAL(type, env, final_derivation) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_SET_FINAL(type, env, final_derivation) \ + (((xml_schema_type_t *) type)->ops->\ set_final(type, env, final_derivation)) -#define AXIS2_XML_SCHEMA_TYPE_GET_FINAL_RESOLVED(type, env) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_GET_FINAL_RESOLVED(type, env) \ + (((xml_schema_type_t *) type)->ops->\ get_final_resolved(type, env)) -#define AXIS2_XML_SCHEMA_TYPE_IS_MIXED(type, env) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_IS_MIXED(type, env) \ + (((xml_schema_type_t *) type)->ops->\ get_is_mixed(type, env)) -#define AXIS2_XML_SCHEMA_TYPE_SET_MIXED(type, env) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_SET_MIXED(type, env) \ + (((xml_schema_type_t *) type)->ops->\ get_set_mixed(type, env)) -#define AXIS2_XML_SCHEMA_TYPE_GET_NAME(type, env) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_GET_NAME(type, env) \ + (((xml_schema_type_t *) type)->ops->\ get_name(type, env)) -#define AXIS2_XML_SCHEMA_TYPE_SET_NAME(type, env, name) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_SET_NAME(type, env, name) \ + (((xml_schema_type_t *) type)->ops->\ set_name(type, env, name)) -#define AXIS2_XML_SCHEMA_TYPE_GET_QNAME(type, env) \ - (((axis2_xml_schema_type_t *) type)->ops->\ +#define XML_SCHEMA_TYPE_GET_QNAME(type, env) \ + (((xml_schema_type_t *) type)->ops->\ get_qname(type, env)) /** @} */ #ifdef __cplusplus } #endif -#endif /* AXIS2_XML_SCHEMA_TYPE_H */ +#endif /* XML_SCHEMA_TYPE_H */ Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_url_resolver.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_url_resolver.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_url_resolver.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_url_resolver.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_url_resolver.h&r1=413615&r2=413626&rev=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_url_resolver.h (original) +++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_url_resolver.h Mon Jun 12 03:29:40 2006 @@ -14,11 +14,11 @@ * limitations under the License. */ -#ifndef AXIS2_XML_SCHEMA_URL_RESOLVER_H -#define AXIS2_XML_SCHEMA_URL_RESOLVER_H +#ifndef XML_SCHEMA_URL_RESOLVER_H +#define XML_SCHEMA_URL_RESOLVER_H /** - * @file axis2_xml_schema_url_resolver.h + * @file xml_schema_url_resolver.h */ #include #include @@ -29,7 +29,7 @@ #endif AXIS2_EXTERN xml_schema_input_source_t* AXIS2_CALL -axis2_xml_schema_url_resolver_resolve_entity( +xml_schema_url_resolver_resolve_entity( const axis2_env_t *env, axis2_char_t *ns, axis2_char_t *schema_location, @@ -44,4 +44,4 @@ #ifdef __cplusplus } #endif -#endif /* AXIS2_XML_SCHEMA_IMPORT_H */ +#endif /* XML_SCHEMA_IMPORT_H */ Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_use.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_use.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_use.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_use.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_use.h&r1=413615&r2=413626&rev=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_use.h (original) +++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_use.h Mon Jun 12 03:29:40 2006 @@ -14,33 +14,33 @@ * limitations under the License. */ -#ifndef AXIS2_XML_SCHEMA_USE_H -#define AXIS2_XML_SCHEMA_USE_H +#ifndef XML_SCHEMA_USE_H +#define XML_SCHEMA_USE_H /** - * @file axis2_xml_schema_use.h + * @file xml_schema_use.h * @brief Axis2 Xml Schema Use Interface * Indicator of how the attribute is used. * */ -#include -#include +#include +#include -/** @defgroup axis2_xml_schema_use Xml Schema Use - * @ingroup axis2_xml_schema +/** @defgroup xml_schema_use Xml Schema Use + * @ingroup xml_schema * @{ */ -typedef struct axis2_xml_schema_use axis2_xml_schema_use_t; -typedef struct axis2_xml_schema_use_ops axis2_xml_schema_use_ops_t; +typedef struct xml_schema_use xml_schema_use_t; +typedef struct xml_schema_use_ops xml_schema_use_ops_t; #ifdef __cplusplus extern "C" { #endif -struct axis2_xml_schema_use_ops +struct xml_schema_use_ops { /** * Deallocate memory @@ -55,12 +55,12 @@ void *use, const axis2_env_t *env); - axis2_xml_schema_types_t (AXIS2_CALL * + xml_schema_types_t (AXIS2_CALL * get_type) ( void *use, const axis2_env_t *env); - axis2_xml_schema_enum_t *(AXIS2_CALL * + xml_schema_enum_t *(AXIS2_CALL * get_base_impl) (void *use, const axis2_env_t *env); @@ -70,35 +70,35 @@ }; -struct axis2_xml_schema_use +struct xml_schema_use { - axis2_xml_schema_enum_t base; - axis2_xml_schema_use_ops_t *ops; + xml_schema_enum_t base; + xml_schema_use_ops_t *ops; }; -AXIS2_EXTERN axis2_xml_schema_use_t * AXIS2_CALL -axis2_xml_schema_use_create(const axis2_env_t *env, +AXIS2_EXTERN xml_schema_use_t * AXIS2_CALL +xml_schema_use_create(const axis2_env_t *env, axis2_char_t* value); /******************* macros ***************************************/ -#define AXIS2_XML_SCHEMA_USE_FREE(use, env) \ - (((axis2_xml_schema_use_t *) use)->ops->free(use, env)) +#define XML_SCHEMA_USE_FREE(use, env) \ + (((xml_schema_use_t *) use)->ops->free(use, env)) -#define AXIS2_XML_SCHEMA_USE_SUPER_OBJS(use, env) \ - (((axis2_xml_schema_use_t *) use)->ops->super_objs(use, env)) +#define XML_SCHEMA_USE_SUPER_OBJS(use, env) \ + (((xml_schema_use_t *) use)->ops->super_objs(use, env)) -#define AXIS2_XML_SCHEMA_USE_GET_TYPE(use, env) \ - (((axis2_xml_schema_use_t *) use)->ops->get_type(use, env)) +#define XML_SCHEMA_USE_GET_TYPE(use, env) \ + (((xml_schema_use_t *) use)->ops->get_type(use, env)) -#define AXIS2_XML_SCHEMA_USE_GET_BASE_IMPL(use, env) \ - (((axis2_xml_schema_use_t *) use)->ops->get_base_impl(use, env)) +#define XML_SCHEMA_USE_GET_BASE_IMPL(use, env) \ + (((xml_schema_use_t *) use)->ops->get_base_impl(use, env)) -#define AXIS2_XML_SCHEMA_USE_GET_VALUES(use, env) \ - (((axis2_xml_schema_use_t *) use)->ops->values(use, env)) +#define XML_SCHEMA_USE_GET_VALUES(use, env) \ + (((xml_schema_use_t *) use)->ops->values(use, env)) /** @} */ #ifdef __cplusplus } #endif -#endif /* AXIS2_XML_SCHEMA_USE_H */ +#endif /* XML_SCHEMA_USE_H */ Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_xpath.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_xpath.h) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_xpath.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_xpath.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_xpath.h&r1=413615&r2=413626&rev=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_xpath.h (original) +++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_xpath.h Mon Jun 12 03:29:40 2006 @@ -14,11 +14,11 @@ * limitations under the License. */ -#ifndef AXIS2_XML_SCHEMA_XPATH_H -#define AXIS2_XML_SCHEMA_XPATH_H +#ifndef XML_SCHEMA_XPATH_H +#define XML_SCHEMA_XPATH_H /** - * @file axis2_xml_schema_xpath.h + * @file xml_schema_xpath.h * @brief Axis2 Xml Schema Xpath Interface * Class for XML Path Language (XPath) expressions. Represents the * World Wide Web Consortium (W3C) selector element. The World Wide @@ -26,25 +26,25 @@ * Xml Schema XPath classes. */ -#include +#include #include #include #include -/** @defgroup axis2_xml_schema_xpath Xml Schema Xpath - * @ingroup axis2_xml_schema +/** @defgroup xml_schema_xpath Xml Schema Xpath + * @ingroup xml_schema * @{ */ -typedef struct axis2_xml_schema_xpath axis2_xml_schema_xpath_t; -typedef struct axis2_xml_schema_xpath_ops axis2_xml_schema_xpath_ops_t; +typedef struct xml_schema_xpath xml_schema_xpath_t; +typedef struct xml_schema_xpath_ops xml_schema_xpath_ops_t; #ifdef __cplusplus extern "C" { #endif -struct axis2_xml_schema_xpath_ops +struct xml_schema_xpath_ops { /** * Deallocate memory @@ -54,11 +54,11 @@ free) (void *xpath, const axis2_env_t *env); - axis2_xml_schema_annotated_t *(AXIS2_CALL * + xml_schema_annotated_t *(AXIS2_CALL * get_base_impl) (void *xpath, const axis2_env_t *env); - axis2_xml_schema_types_t (AXIS2_CALL * + xml_schema_types_t (AXIS2_CALL * get_type)(void *xpath, const axis2_env_t *env); @@ -77,45 +77,45 @@ }; -struct axis2_xml_schema_xpath +struct xml_schema_xpath { - axis2_xml_schema_annotated_t base; - axis2_xml_schema_xpath_ops_t *ops; + xml_schema_annotated_t base; + xml_schema_xpath_ops_t *ops; }; /** * Creates new Xml Schema Xpath */ -AXIS2_EXTERN axis2_xml_schema_xpath_t * AXIS2_CALL -axis2_xml_schema_xpath_create(const axis2_env_t *env); +AXIS2_EXTERN xml_schema_xpath_t * AXIS2_CALL +xml_schema_xpath_create(const axis2_env_t *env); -#define AXIS2_XML_SCHEMA_XPATH_FREE(xpath, env) \ - (((axis2_xml_schema_xpath_t *) xpath)->ops->\ +#define XML_SCHEMA_XPATH_FREE(xpath, env) \ + (((xml_schema_xpath_t *) xpath)->ops->\ free(xpath, env)) -#define AXIS2_XML_SCHEMA_XPATH_GET_BASE_IMPL(xpath, env) \ - (((axis2_xml_schema_xpath_t *) xpath)->ops->\ +#define XML_SCHEMA_XPATH_GET_BASE_IMPL(xpath, env) \ + (((xml_schema_xpath_t *) xpath)->ops->\ get_base_impl(xpath, env)) -#define AXIS2_XML_SCHEMA_XPATH_GET_TYPE(xpath, env) \ - (((axis2_xml_schema_xpath_t *) xpath)->ops->\ +#define XML_SCHEMA_XPATH_GET_TYPE(xpath, env) \ + (((xml_schema_xpath_t *) xpath)->ops->\ get_type(xpath, env)) -#define AXIS2_XML_SCHEMA_XPATH_SUPER_OBJS(xpath, env) \ - (((axis2_xml_schema_xpath_t *) xpath)->ops->\ +#define XML_SCHEMA_XPATH_SUPER_OBJS(xpath, env) \ + (((xml_schema_xpath_t *) xpath)->ops->\ super_objs(xpath, env)) -#define AXIS2_XML_SCHEMA_XPATH_GET_XPATH(xpath, env) \ - (((axis2_xml_schema_xpath_t *) xpath)->ops->\ +#define XML_SCHEMA_XPATH_GET_XPATH(xpath, env) \ + (((xml_schema_xpath_t *) xpath)->ops->\ get_xpath(xpath, env)) -#define AXIS2_XML_SCHEMA_XPATH_SET_XPATH(xpath, env, x_path) \ - (((axis2_xml_schema_xpath_t *) xpath)->ops->\ +#define XML_SCHEMA_XPATH_SET_XPATH(xpath, env, x_path) \ + (((xml_schema_xpath_t *) xpath)->ops->\ set_xpath(xpath, env, x_path)) /** @} */ #ifdef __cplusplus } #endif -#endif /* AXIS2_XML_SCHEMA_XPATH_H */ +#endif /* XML_SCHEMA_XPATH_H */ Modified: webservices/axis2/trunk/c/xml_schema/samples/test_schema.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/samples/test_schema.c?rev=413626&r1=413625&r2=413626&view=diff ============================================================================== --- webservices/axis2/trunk/c/xml_schema/samples/test_schema.c (original) +++ webservices/axis2/trunk/c/xml_schema/samples/test_schema.c Mon Jun 12 03:29:40 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include #include @@ -27,8 +27,8 @@ axis2_xml_reader_t *xml_reader = NULL; axiom_stax_builder_t *om_builder = NULL; axiom_document_t *om_doc = NULL; - axis2_xml_schema_collection_t *schema_collection = NULL; - axis2_xml_schema_t *schema = NULL; + xml_schema_collection_t *schema_collection = NULL; + xml_schema_t *schema = NULL; xml_reader = axis2_xml_reader_create_for_file(env, filename, NULL); @@ -41,9 +41,9 @@ AXIOM_DOCUMENT_BUILD_ALL(om_doc, env); - schema_collection = axis2_xml_schema_collection_create(env); + schema_collection = xml_schema_collection_create(env); - schema = AXIS2_XML_SCHEMA_COLLECTION_READ_DOCUMENT( + schema = XML_SCHEMA_COLLECTION_READ_DOCUMENT( schema_collection, env, om_doc); if(NULL != schema) --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org