Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 21817 invoked from network); 9 May 2006 06:47:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 May 2006 06:47:44 -0000 Received: (qmail 81298 invoked by uid 500); 9 May 2006 06:47:43 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 81210 invoked by uid 500); 9 May 2006 06:47:42 -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 81199 invoked by uid 500); 9 May 2006 06:47:42 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 81196 invoked by uid 99); 9 May 2006 06:47:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 May 2006 23:47:42 -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: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 08 May 2006 23:47:40 -0700 Received: (qmail 21703 invoked by uid 65534); 9 May 2006 06:47:19 -0000 Message-ID: <20060509064719.21702.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r405319 - in /webservices/axis2/trunk/c/modules/xml/xml_schema: ./ include/xml_schema/ Date: Tue, 09 May 2006 06:47:13 -0000 To: axis2-cvs@ws.apache.org From: nandika@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: nandika Date: Mon May 8 23:47:10 2006 New Revision: 405319 URL: http://svn.apache.org/viewcvs?rev=405319&view=rev Log: xml_schema_header files updated Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_annotated.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_any_attribute.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_extension.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_restriction.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_content_type.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_import.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_redefine.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_extension.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_restriction.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_content.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_list.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_restriction.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_union.h webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_severity_type.h webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_annotated.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_any.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_any_attribute.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_extension.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_restriction.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_content_type.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_element.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_import.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_redefine.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_extension.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_restriction.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_content.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_list.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_restriction.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_union.c webservices/axis2/trunk/c/modules/xml/xml_schema/xml_severity_type.c Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_annotated.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_annotated.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_annotated.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_annotated.h Mon May 8 23:47:10 2006 @@ -28,8 +28,6 @@ * @ingroup axis2_xml_schema * @{ */ - - #ifdef __cplusplus extern "C" @@ -67,10 +65,6 @@ free)(void *annotated, axis2_env_t **env); - axis2_status_t (AXIS2_CALL * - to_annotated_free)(void *annotated, - axis2_env_t **env); - axis2_xml_schema_obj_t *(AXIS2_CALL * get_base_impl) (void *annotated, axis2_env_t **env); @@ -114,25 +108,17 @@ AXIS2_DECLARE(axis2_xml_schema_annotated_t *) axis2_xml_schema_annotated_create(axis2_env_t **env); -/************************Xml Schema Internal Methods***************************/ -AXIS2_DECLARE(axis2_xml_schema_annotated_t *) -axis2_xml_schema_annotated_to_annotated( - void *annotated, - axis2_env_t **env); - +/** + * This method is internal to Axis2 C. It is called from Child Constructor + */ AXIS2_DECLARE(axis2_status_t) axis2_xml_schema_annotated_resolve_methods( axis2_xml_schema_annotated_t *annotated, axis2_env_t **env, axis2_xml_schema_annotated_t *annotated_impl, axis2_hash_t *methods); -/************************End of Xml Schema Internal Methods********************/ #define AXIS2_XML_SCHEMA_ANNOTATED_FREE(annotated, env) \ - (((axis2_xml_schema_annotated_t *) annotated)->ops->free(\ - annotated, env)) - -#define AXIS2_XML_SCHEMA_ANNOTATED_TO_ANNOTATED_FREE(annotated, env) \ (((axis2_xml_schema_annotated_t *) annotated)->ops->free(\ annotated, env)) Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_any_attribute.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_any_attribute.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_any_attribute.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_any_attribute.h Mon May 8 23:47:10 2006 @@ -26,8 +26,8 @@ * */ -#include -#include +#include +#include /** @defgroup axis2_xml_schema_any Xml Schema Any * @ingroup axis2_xml_schema Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content.h Mon May 8 23:47:10 2006 @@ -26,7 +26,7 @@ * Represents the World Wide Web Consortium (W3C) complex_content element. */ -#include +#include #include /** @defgroup axis2_xml_schema_complex_content Xml Schema Group Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_extension.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_extension.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_extension.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_extension.h Mon May 8 23:47:10 2006 @@ -21,10 +21,10 @@ * @file axis2_xml_schema_complex_content_extension.h */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include /** @defgroup axis2_xml_schema_complex_content_extension Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_restriction.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_restriction.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_restriction.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_restriction.h Mon May 8 23:47:10 2006 @@ -21,10 +21,10 @@ * @file axis2_xml_schema_complex_content_restriction.h */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_content_type.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_content_type.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_content_type.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_content_type.h Mon May 8 23:47:10 2006 @@ -25,7 +25,7 @@ * */ -#include +#include /** @defgroup axis2_xml_schema_content_type Xml Schema Form * @ingroup axis2_xml_schema Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_import.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_import.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_import.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_import.h Mon May 8 23:47:10 2006 @@ -23,7 +23,7 @@ * Base class for all import types. */ -#include +#include #include /** @defgroup axis2_xml_schema_include Xml Schema Particle Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_redefine.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_redefine.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_redefine.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_redefine.h Mon May 8 23:47:10 2006 @@ -23,10 +23,10 @@ * Base class for all redefine types. */ -#include +#include #include -#include -#include +#include +#include /** @defgroup axis2_xml_schema_include Xml Schema Particle * @ingroup axis2_xml_schema Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content.h Mon May 8 23:47:10 2006 @@ -26,7 +26,7 @@ * Represents the World Wide Web Consortium (W3C) sim_content element. */ -#include +#include #include /** @defgroup axis2_xml_schema_simple_content Xml Schema Group Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_extension.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_extension.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_extension.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_extension.h Mon May 8 23:47:10 2006 @@ -26,9 +26,9 @@ * Represents the World Wide Web Consortium (W3C) sim_content_ext element. */ -#include -#include -#include +#include +#include +#include #include #include /** @defgroup axis2_xml_schema_simple_content_extension Xml Schema Group Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_restriction.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_restriction.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_restriction.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_restriction.h Mon May 8 23:47:10 2006 @@ -26,10 +26,10 @@ * Represents the World Wide Web Consortium (W3C) sim_content_res element. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type.h Mon May 8 23:47:10 2006 @@ -23,11 +23,11 @@ * The base class for all simple types and complex types. */ -#include -#include +#include +#include #include #include -#include +#include /** @defgroup axis2_xml_schema_simple_type Xml Schema Type * @ingroup axis2_xml_schema * @{ Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_content.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_content.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_content.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_content.h Mon May 8 23:47:10 2006 @@ -23,7 +23,7 @@ * Base class for all sim_type_cont types. */ -#include +#include #include /** @defgroup axis2_xml_schema_simple_type_content Xml Schema Particle Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_list.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_list.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_list.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_list.h Mon May 8 23:47:10 2006 @@ -24,9 +24,9 @@ */ -#include -#include -#include +#include +#include +#include #include /** @defgroup axis2_xml_schema_simple_type_list * @ingroup axis2_xml_schema Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_restriction.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_restriction.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_restriction.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_restriction.h Mon May 8 23:47:10 2006 @@ -24,9 +24,9 @@ */ -#include -#include -#include +#include +#include +#include #include /** @defgroup axis2_xml_schema_simple_type_restriction * @ingroup axis2_xml_schema Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_union.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_union.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_union.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_union.h Mon May 8 23:47:10 2006 @@ -24,9 +24,9 @@ */ -#include -#include -#include +#include +#include +#include #include #include /** @defgroup axis2_xml_schema_simple_type_union Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_severity_type.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_severity_type.h?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_severity_type.h (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/include/xml_schema/axis2_xml_severity_type.h Mon May 8 23:47:10 2006 @@ -25,7 +25,7 @@ * */ -#include +#include /** @defgroup axis2_xml_severity_type Xml Schema Form * @ingroup axis2_xml_schema Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_annotated.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_annotated.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_annotated.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_annotated.c Mon May 8 23:47:10 2006 @@ -80,50 +80,6 @@ axis2_env_t **env, axis2_array_list_t * unhandled_attrs); -/************************Xml Schema Internal Methods***************************/ -AXIS2_DECLARE(axis2_xml_schema_annotated_t *) -axis2_xml_schema_annotated_to_annotated( - void *annotated, - axis2_env_t **env) -{ - axis2_xml_schema_annotated_impl_t *annotated_impl = NULL; - - AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - - if(!annotated) - { - annotated_impl = (axis2_xml_schema_annotated_impl_t *) create(env); - } - else - annotated_impl = (axis2_xml_schema_annotated_impl_t *) annotated; - annotated_impl->annotated.base.ops = - AXIS2_MALLOC((*env)->allocator, - sizeof(axis2_xml_schema_obj_ops_t)); - axis2_xml_schema_obj_resolve_methods(&(annotated_impl-> - annotated.base), NULL, env, annotated_impl->methods); - return annotated; - -} - -axis2_status_t AXIS2_CALL -axis2_xml_schema_annotated_to_annotated_free( - void *annotated, - axis2_env_t **env) -{ - axis2_xml_schema_annotated_impl_t *annotated_impl = NULL; - - AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - annotated_impl = INTF_TO_IMPL(annotated); - - if(annotated_impl->annotated.base.ops) - { - AXIS2_FREE((*env)->allocator, annotated_impl->annotated.base. - ops); - annotated_impl->annotated.base.ops = NULL; - } - return AXIS2_SUCCESS; -} -/************************End of Xml Schema Internal Methods********************/ AXIS2_DECLARE(axis2_xml_schema_annotated_t *) axis2_xml_schema_annotated_create(axis2_env_t **env) @@ -159,8 +115,6 @@ annotated_impl->annotated.ops->free = axis2_xml_schema_annotated_free; - annotated_impl->annotated.ops->to_annotated_free = - axis2_xml_schema_annotated_to_annotated_free; annotated_impl->annotated.ops->get_base_impl = axis2_xml_schema_annotated_get_base_impl; annotated_impl->annotated.ops->get_id = @@ -249,18 +203,16 @@ AXIS2_XML_SCHEMA_OBJ_FREE(annotated_impl->schema_obj, env); annotated_impl->schema_obj = NULL; } - - if(annotated_impl->annotated.base.ops) - { - AXIS2_FREE((*env)->allocator, annotated_impl->annotated.base. - ops); - annotated_impl->annotated.base.ops = NULL; - } if(NULL != annotated_impl->annotated.ops) { AXIS2_FREE((*env)->allocator, annotated_impl->annotated.ops); annotated_impl->annotated.ops = NULL; + } + if(NULL != annotated_impl->annotated.base.ops) + { + AXIS2_FREE((*env)->allocator, annotated_impl->annotated.base.ops); + annotated_impl->annotated.base.ops = NULL; } AXIS2_FREE((*env)->allocator, annotated_impl); Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_any.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_any.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_any.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_any.c Mon May 8 23:47:10 2006 @@ -278,8 +278,8 @@ axis2_status_t AXIS2_CALL axis2_xml_schema_any_set_process_content(void *any, - axis2_env_t **env, - axis2_xml_schema_content_processing_t * + axis2_env_t **env, + axis2_xml_schema_content_processing_t * process_content) { axis2_xml_schema_any_impl_t *any_impl = NULL; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_any_attribute.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_any_attribute.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_any_attribute.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_any_attribute.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_schema_any_attribute_impl axis2_xml_schema_any_attribute_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_schema_complex_content_impl axis2_xml_schema_complex_content_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_extension.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_extension.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_extension.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_extension.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_schema_complex_content_extension_impl axis2_xml_schema_complex_content_extension_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_restriction.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_restriction.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_restriction.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_restriction.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_schema_complex_content_restriction_impl axis2_xml_schema_complex_content_restriction_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_content_type.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_content_type.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_content_type.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_content_type.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_schema_content_type_impl axis2_xml_schema_content_type_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_element.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_element.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_element.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_element.c Mon May 8 23:47:10 2006 @@ -32,8 +32,11 @@ struct axis2_xml_schema_element_impl { axis2_xml_schema_element_t element; + axis2_xml_schema_type_receiver_t *type_recv; + axis2_xml_schema_particle_t *particle; + axis2_hash_t *methods; /** * Attribute used to block a type derivation. @@ -46,6 +49,7 @@ * type, taken from the schema element. */ axis2_xml_schema_derivation_method_t *block_resolved; + axis2_xml_schema_obj_collection_t *constraints; /** @@ -53,6 +57,7 @@ * is a simple type or the element's content is textOnly. */ axis2_char_t *default_value; + axis2_char_t *fixed_value; /** @@ -62,6 +67,7 @@ void *element_type; axis2_xml_schema_derivation_method_t *final_derivation; + axis2_xml_schema_derivation_method_t *final_derivation_resolved; /** @@ -69,10 +75,15 @@ * the schema element containing the attribute. The default is Unqualified. */ axis2_xml_schema_form_t *form; + axis2_bool_t is_abstract; + axis2_bool_t is_nillable; + axis2_char_t *name; + axis2_qname_t *qualified_qname; + axis2_qname_t *ref_qname; /** @@ -257,6 +268,30 @@ element_impl->type_recv = NULL; element_impl->methods = NULL; + element_impl->block = NULL; + element_impl->block_resolved = NULL; + element_impl->constraints = NULL; + element_impl->default_value = NULL; + element_impl->element_type = NULL; + element_impl->final_derivation = NULL; + element_impl->final_derivation_resolved = NULL; + element_impl->fixed_value = NULL; + element_impl->form = NULL; + element_impl->is_abstract = AXIS2_FALSE; + element_impl->is_nillable = AXIS2_FALSE; + element_impl->methods = NULL; + element_impl->schema_type = NULL; + element_impl->schema_type_qname = NULL; + element_impl->element.ops = NULL; + element_impl->element.base.ops = NULL; + element_impl->name = NULL; + element_impl->particle = NULL; + element_impl->ref_qname = NULL; + element_impl->substitution_group = NULL; + element_impl->type_recv = NULL; + element_impl->schema_type_qname = NULL; + element_impl->substitution_group = NULL; + element_impl->element.ops = AXIS2_MALLOC((*env)->allocator, sizeof(axis2_xml_schema_element_ops_t)); @@ -557,14 +592,14 @@ axis2_xml_schema_element_get_constraints(void *element, axis2_env_t **env) { - return NULL; + return AXIS2_INTF_TO_IMPL(element)->constraints; } axis2_char_t *AXIS2_CALL axis2_xml_schema_element_get_default_value(void *element, axis2_env_t **env) { - return NULL; + return AXIS2_INTF_TO_IMPL(element)->default_value; } axis2_status_t AXIS2_CALL @@ -572,14 +607,24 @@ axis2_env_t **env, axis2_char_t *default_value) { - return AXIS2_SUCCESS; + axis2_xml_schema_element_impl_t *element_impl = NULL; + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, default_value, AXIS2_FAILURE); + element_impl = AXIS2_INTF_TO_IMPL(element); + if(NULL != element_impl->default_value) + { + AXIS2_FREE((*env)->allocator, element_impl->default_value); + element_impl->default_value = NULL; + } + element_impl->default_value = default_value; + return AXIS2_SUCCESS; } axis2_xml_schema_derivation_method_t *AXIS2_CALL axis2_xml_schema_element_get_block(void *element, axis2_env_t **env) { - return NULL; + return AXIS2_INTF_TO_IMPL(element)->block; } axis2_status_t AXIS2_CALL @@ -587,6 +632,17 @@ axis2_env_t **env, axis2_xml_schema_derivation_method_t * block) { + axis2_xml_schema_element_impl_t *element_impl = NULL; + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + AXIS2_PARAM_CHECK((*env)->error, block, AXIS2_FAILURE); + + element_impl = AXIS2_INTF_TO_IMPL(element); + if(NULL != element_impl->block) + { + /** TODO Free block */ + + } + element_impl->block = block; return AXIS2_SUCCESS; } @@ -594,14 +650,24 @@ axis2_xml_schema_element_get_final(void *element, axis2_env_t **env) { - return NULL; + return AXIS2_INTF_TO_IMPL(element)->final_derivation; } axis2_status_t AXIS2_CALL -axis2_xml_schema_element_set_final(void *element, - axis2_env_t **env, - axis2_xml_schema_derivation_method_t *final_derivation) +axis2_xml_schema_element_set_final( + void *element, + axis2_env_t **env, + axis2_xml_schema_derivation_method_t *final_derivation) { + axis2_xml_schema_element_impl_t *element_impl = NULL; + AXIS2_ENV_CHECK(env, AXIS2_FAILURE); + element_impl = AXIS2_INTF_TO_IMPL(element); + if(NULL != element_impl->final_derivation) + { + /** TODO Free */ + + } + element_impl->final_derivation = final_derivation; return AXIS2_SUCCESS; } @@ -609,7 +675,7 @@ axis2_xml_schema_element_get_block_resolved(void *element, axis2_env_t **env) { - return NULL; + return AXIS2_INTF_TO_IMPL(element)->final_derivation_resolved; } axis2_char_t *AXIS2_CALL Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_import.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_import.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_import.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_import.c Mon May 8 23:47:10 2006 @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include +#include /** * @brief Other Extension Struct Impl Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_redefine.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_redefine.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_redefine.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_redefine.c Mon May 8 23:47:10 2006 @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include +#include /** * @brief Other Extension Struct Impl Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_schema_simple_content_impl axis2_xml_schema_simple_content_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_extension.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_extension.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_extension.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_extension.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_schema_simple_content_extension_impl axis2_xml_schema_simple_content_extension_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_restriction.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_restriction.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_restriction.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_restriction.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_schema_simple_content_restriction_impl axis2_xml_schema_simple_content_restriction_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include #include Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_content.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_content.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_content.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_content.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_schema_simple_type_content_impl axis2_xml_schema_simple_type_content_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_list.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_list.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_list.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_list.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_schema_simple_type_list_impl axis2_xml_schema_simple_type_list_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_restriction.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_restriction.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_restriction.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_restriction.c Mon May 8 23:47:10 2006 @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include +#include typedef struct axis2_xml_schema_simple_type_restriction_impl axis2_xml_schema_simple_type_restriction_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_union.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_union.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_union.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_type_union.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_schema_simple_type_union_impl axis2_xml_schema_simple_type_union_impl_t; Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_severity_type.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_severity_type.c?rev=405319&r1=405318&r2=405319&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_severity_type.c (original) +++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_severity_type.c Mon May 8 23:47:10 2006 @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include typedef struct axis2_xml_severity_type_impl axis2_xml_severity_type_impl_t;