You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2006/05/08 12:20:19 UTC
svn commit: r405000 - in /webservices/axis2/trunk/c: include/xml_schema/
modules/xml/xml_schema/
Author: damitha
Date: Mon May 8 03:20:08 2006
New Revision: 405000
URL: http://svn.apache.org/viewcvs?rev=405000&view=rev
Log:
Moved xml_schema include files into moudles/xml/xml_schema
Added:
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_om_util.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_om_util.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_validation_event_handler.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_validation_event_handler.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_all.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_all.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_annotated.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_annotated.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_annotation.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_annotation.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_any.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_any.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_any_attribute.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_any_attribute.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_app_info.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_app_info.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_choice.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_choice.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_collection.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_collection.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_complex_content.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_complex_content_extension.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_extension.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_complex_content_restriction.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_restriction.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_constants.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_constants.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_content_processing.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_content_processing.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_content_type.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_content_type.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_data_type.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_data_type.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_derivation_method.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_derivation_method.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_element.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_element.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_enum.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_enum.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_external.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_external.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_facet.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_facet.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_form.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_form.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group_base.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group_base.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group_ref.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group_ref.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_identity_constraint.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_identity_constraint.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_import.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_import.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_obj.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_obj_collection.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj_collection.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_obj_table.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj_table.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_particle.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_particle.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_redefine.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_redefine.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_sequence.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_sequence.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_simple_content.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_simple_content_extension.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_extension.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_simple_content_restriction.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_restriction.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_simple_type.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_type.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_simple_type_content.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_type_content.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_simple_type_list.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_type_list.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_simple_type_restriction.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_type_restriction.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_simple_type_union.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_type_union.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_type.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_type.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_type_receiver.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_type_receiver.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_use.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_use.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_xpath.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_xpath.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_severity_type.h
- copied unchanged from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_severity_type.h
webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_tokenized_type.h
- copied, changed from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_tokenized_type.h
Removed:
webservices/axis2/trunk/c/include/xml_schema/axis2_om_util.h
webservices/axis2/trunk/c/include/xml_schema/axis2_validation_event_handler.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_all.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_annotated.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_annotation.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_any.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_any_attribute.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_app_info.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_choice.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_collection.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_extension.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_restriction.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_constants.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_content_processing.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_content_type.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_data_type.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_derivation_method.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_element.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_enum.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_external.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_facet.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_form.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group_base.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group_ref.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_identity_constraint.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_import.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj_collection.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj_table.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_particle.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_redefine.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_sequence.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_extension.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_restriction.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_type.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_type_content.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_type_list.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_type_restriction.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_type_union.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_type.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_type_receiver.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_use.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_xpath.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_severity_type.h
webservices/axis2/trunk/c/include/xml_schema/axis2_xml_tokenized_type.h
Modified:
webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_annotated.c
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema.h Mon May 8 03:20:08 2006
@@ -25,11 +25,11 @@
* Represents the World Wide Web Consortium (W3C) schema element
*/
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema/axis2_xml_schema_annotated.h>
#include <axis2_om_element.h>
#include <axis2_om_node.h>
#include <axis2_hash.h>
-#include <axis2_validation_event_handler.h>
+#include <xml_schema/axis2_validation_event_handler.h>
/** @defgroup axis2_xml_schema Xml Schema
* @ingroup axis2_xml_schema
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_all.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_all.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_all.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_all.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_all.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_all.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_all.h Mon May 8 03:20:08 2006
@@ -25,7 +25,7 @@
* Wide Web Consortium (W3C) all element (compositor).
*/
-#include <axis2_xml_schema_group_base.h>
+#include <xml_schema/axis2_xml_schema_group_base.h>
#include <axis2_hash.h>
/** @defall axis2_xml_schema_all Xml Schema All
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_annotated.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_annotated.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_annotated.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_annotated.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_annotated.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_annotated.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_annotated.h Mon May 8 03:20:08 2006
@@ -22,7 +22,7 @@
* @brief Axis2 Xml Schema Annotated Interface
*/
-#include <axis2_xml_schema_obj.h>
+#include <xml_schema/axis2_xml_schema_obj.h>
/** @defgroup axis2_xml_schema_annotated Xml Schema Annotated
* @ingroup axis2_xml_schema
@@ -67,6 +67,10 @@
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);
@@ -110,17 +114,30 @@
AXIS2_DECLARE(axis2_xml_schema_annotated_t *)
axis2_xml_schema_annotated_create(axis2_env_t **env);
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
- */
+/************************Xml Schema Internal Methods***************************/
+AXIS2_DECLARE(axis2_xml_schema_annotated_t *)
+axis2_xml_schema_annotated_to_annotated(
+ void *annotated,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_xml_schema_annotated_to_annotated_free(
+ void *annotated,
+ axis2_env_t **env);
+
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))
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_any.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_any.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_any.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_any.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_any.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_any.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_any.h Mon May 8 03:20:08 2006
@@ -26,8 +26,8 @@
*
*/
-#include <axis2_xml_schema_particle.h>
-#include <axis2_xml_schema_content_processing.h>
+#include <xml_schema/axis2_xml_schema_particle.h>
+#include <xml_schema/axis2_xml_schema_content_processing.h>
/** @defgroup axis2_xml_schema_any Xml Schema Any
* @ingroup axis2_xml_schema
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_app_info.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_app_info.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_app_info.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_app_info.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_app_info.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_app_info.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_app_info.h Mon May 8 03:20:08 2006
@@ -25,7 +25,7 @@
*
*/
-#include <axis2_xml_schema_obj.h>
+#include <xml_schema/axis2_xml_schema_obj.h>
#include <axis2_hash.h>
/** @defgroup axis2_xml_schema_app_info Xml Schema App Info
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_choice.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_choice.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_choice.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_choice.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_choice.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_choice.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_choice.h Mon May 8 03:20:08 2006
@@ -24,7 +24,7 @@
* the World Wide Web Consortium (W3C) choice (compositor) element.
*/
-#include <axis2_xml_schema_group_base.h>
+#include <xml_schema/axis2_xml_schema_group_base.h>
#include <axis2_hash.h>
/** @defchoice axis2_xml_schema_choice Xml Schema Choice
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_collection.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_collection.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_collection.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_collection.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_collection.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_collection.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_collection.h Mon May 8 03:20:08 2006
@@ -31,8 +31,8 @@
#include <axis2_array_list.h>
#include <axis2_hash.h>
#include <axis2_qname.h>
-#include <axis2_xml_schema_obj.h>
-#include <axis2_validation_event_handler.h>
+#include <xml_schema/axis2_xml_schema_obj.h>
+#include <xml_schema/axis2_validation_event_handler.h>
#ifdef __cplusplus
extern "C"
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_content_processing.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_content_processing.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_content_processing.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_content_processing.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_content_processing.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_content_processing.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_content_processing.h Mon May 8 03:20:08 2006
@@ -24,7 +24,7 @@
*
*/
-#include <axis2_xml_schema_enum.h>
+#include <xml_schema/axis2_xml_schema_enum.h>
/** @defgroup axis2_xml_schema_content_processing Xml Schema Content Processing
* @ingroup axis2_xml_schema
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_derivation_method.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_derivation_method.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_derivation_method.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_derivation_method.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_derivation_method.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_derivation_method.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_derivation_method.h Mon May 8 03:20:08 2006
@@ -24,7 +24,7 @@
*
*/
-#include <axis2_xml_schema_enum.h>
+#include <xml_schema/axis2_xml_schema_enum.h>
/** @defgroup axis2_xml_schema_derivation_method Xml Schema Derivation Method
* @ingroup axis2_xml_schema
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_element.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_element.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_element.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_element.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_element.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_element.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_element.h Mon May 8 03:20:08 2006
@@ -24,7 +24,7 @@
* element element.
*/
-#include <axis2_xml_schema_type_receiver.h>
+#include <xml_schema/axis2_xml_schema_type_receiver.h>
#include <axis2_qname.h>
/** @defgroup axis2_xml_schema_element Xml Schema Element
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_external.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_external.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_external.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_external.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_external.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_external.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_external.h Mon May 8 03:20:08 2006
@@ -23,7 +23,7 @@
* Base class for all external types.
*/
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema/axis2_xml_schema_annotated.h>
#include <axis2_hash.h>
/** @defgroup axis2_xml_schema_external Xml Schema Particle
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_facet.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_facet.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_facet.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_facet.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_facet.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_facet.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_facet.h Mon May 8 03:20:08 2006
@@ -24,7 +24,7 @@
* derived by restriction.
*/
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema/axis2_xml_schema_annotated.h>
#include <axis2_om_element.h>
#include <axis2_om_node.h>
#include <axis2_hash.h>
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_form.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_form.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_form.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_form.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_form.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_form.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_form.h Mon May 8 03:20:08 2006
@@ -25,7 +25,7 @@
*
*/
-#include <axis2_xml_schema_enum.h>
+#include <xml_schema/axis2_xml_schema_enum.h>
/** @defgroup axis2_xml_schema_form Xml Schema Form
* @ingroup axis2_xml_schema
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group.h Mon May 8 03:20:08 2006
@@ -26,7 +26,7 @@
* Represents the World Wide Web Consortium (W3C) group element.
*/
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema/axis2_xml_schema_annotated.h>
#include <axis2_hash.h>
/** @defgroup axis2_xml_schema_group Xml Schema Group
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group_base.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group_base.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group_base.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group_base.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group_base.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group_base.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group_base.h Mon May 8 03:20:08 2006
@@ -25,8 +25,8 @@
*
*/
-#include <axis2_xml_schema_particle.h>
-#include <axis2_xml_schema_obj_collection.h>
+#include <xml_schema/axis2_xml_schema_particle.h>
+#include <xml_schema/axis2_xml_schema_obj_collection.h>
/** @defgroup axis2_xml_schema_group_base Xml Schema Group Base
* @ingroup axis2_xml_schema
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group_ref.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group_ref.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group_ref.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group_ref.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group_ref.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_group_ref.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_group_ref.h Mon May 8 03:20:08 2006
@@ -25,7 +25,7 @@
* Web Consortium (W3C) group element with ref attribute.
*/
-#include <axis2_xml_schema_particle.h>
+#include <xml_schema/axis2_xml_schema_particle.h>
#include <axis2_hash.h>
#include <axis2_qname.h>
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_identity_constraint.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_identity_constraint.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_identity_constraint.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_identity_constraint.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_identity_constraint.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_identity_constraint.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_identity_constraint.h Mon May 8 03:20:08 2006
@@ -23,7 +23,7 @@
* Class for the identity constraints: key, keyref, and unique elements.
*/
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema/axis2_xml_schema_annotated.h>
#include <axis2_hash.h>
/** @defidentity_constraint axis2_xml_schema_identity_constraint Xml Schema
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_obj_collection.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj_collection.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_obj_collection.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_obj_collection.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj_collection.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj_collection.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_obj_collection.h Mon May 8 03:20:08 2006
@@ -31,7 +31,7 @@
#include <axis2_const.h>
#include <axis2_array_list.h>
#include <axis2_hash.h>
-#include <axis2_xml_schema_obj.h>
+#include <xml_schema/axis2_xml_schema_obj.h>
#ifdef __cplusplus
extern "C"
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_obj_table.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj_table.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_obj_table.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_obj_table.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj_table.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_obj_table.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_obj_table.h Mon May 8 03:20:08 2006
@@ -35,7 +35,7 @@
#include <axis2_array_list.h>
#include <axis2_hash.h>
#include <axis2_qname.h>
-#include <axis2_xml_schema_obj.h>
+#include <xml_schema/axis2_xml_schema_obj.h>
#ifdef __cplusplus
extern "C"
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_particle.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_particle.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_particle.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_particle.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_particle.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_particle.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_particle.h Mon May 8 03:20:08 2006
@@ -23,7 +23,7 @@
* Base class for all particle types.
*/
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema/axis2_xml_schema_annotated.h>
#include <axis2_hash.h>
/** @defgroup axis2_xml_schema_particle Xml Schema Particle
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_sequence.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_sequence.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_sequence.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_sequence.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_sequence.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_sequence.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_sequence.h Mon May 8 03:20:08 2006
@@ -25,7 +25,7 @@
* (W3C) sequence (compositor) element.
*/
-#include <axis2_xml_schema_group_base.h>
+#include <xml_schema/axis2_xml_schema_group_base.h>
#include <axis2_hash.h>
/** @defsequence axis2_xml_schema_sequence Xml Schema Sequence
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_type.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_type.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_type.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_type.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_type.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_type.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_type.h Mon May 8 03:20:08 2006
@@ -23,7 +23,7 @@
* The base class for all simple types and complex types.
*/
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema/axis2_xml_schema_annotated.h>
#include <axis2_hash.h>
#include <axis2_qname.h>
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_use.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_use.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_use.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_use.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_use.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_use.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_use.h Mon May 8 03:20:08 2006
@@ -24,7 +24,7 @@
*
*/
-#include <axis2_xml_schema_enum.h>
+#include <xml_schema/axis2_xml_schema_enum.h>
/** @defgroup axis2_xml_schema_use Xml Schema Use
* @ingroup axis2_xml_schema
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_xpath.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_xpath.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_xpath.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_xpath.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_xpath.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_xpath.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_schema_xpath.h Mon May 8 03:20:08 2006
@@ -26,7 +26,7 @@
* Xml Schema XPath classes.
*/
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema/axis2_xml_schema_annotated.h>
#include <axis2_om_element.h>
#include <axis2_om_node.h>
#include <axis2_hash.h>
Copied: webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_tokenized_type.h (from r404992, webservices/axis2/trunk/c/include/xml_schema/axis2_xml_tokenized_type.h)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_tokenized_type.h?p2=webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_tokenized_type.h&p1=webservices/axis2/trunk/c/include/xml_schema/axis2_xml_tokenized_type.h&r1=404992&r2=405000&rev=405000&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_tokenized_type.h (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/axis2_xml_tokenized_type.h Mon May 8 03:20:08 2006
@@ -24,7 +24,7 @@
*
*/
-#include <axis2_xml_schema_enum.h>
+#include <xml_schema/axis2_xml_schema_enum.h>
/** @defgroup axis2_xml_tokenized_type Xml Tokenized Type
* @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=405000&r1=404999&r2=405000&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 03:20:08 2006
@@ -80,6 +80,50 @@
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), 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)
@@ -115,6 +159,8 @@
annotated_impl->annotated.ops->free =
axis2_xml_schema_annotated_free;
+ annotated_impl->annotated.ops->to_xml_schema_annoteted_free =
+ axis2_xml_schema_annotated_to_xml_schema_annotated_free;
annotated_impl->annotated.ops->get_base_impl =
axis2_xml_schema_annotated_get_base_impl;
annotated_impl->annotated.ops->get_id =
@@ -203,16 +249,18 @@
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);