axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r413626 [1/18] - in /webservices/axis2/trunk/c/xml_schema: include/ samples/ src/ test/
Date Mon, 12 Jun 2006 10:29:46 GMT
Author: damitha
Date: Mon Jun 12 03:29:40 2006
New Revision: 413626

URL: http://svn.apache.org/viewvc?rev=413626&view=rev
Log:
Renamed axis2_xml_schema prefixes to xml_schema

Added:
    webservices/axis2/trunk/c/xml_schema/include/xml_schema.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_annotated.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_annotated.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_annotation.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_annotation.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_any.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_any.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_any_attribute.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_any_attribute.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_app_info.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_app_info.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute_group.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute_group.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute_group_ref.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute_group_ref.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_builder.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_builder.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_collection.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_complex_content.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_complex_content.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_complex_content_extension.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_complex_content_extension.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_complex_content_restriction.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_complex_content_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_complex_type.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_complex_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_constants.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_constants.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_content_processing.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_content_processing.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_content_type.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_content_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_data_type.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_data_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_defines.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_defines.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_derivation_method.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_derivation_method.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_documentation.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_documentation.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_element.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_element.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_enum.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_external.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_external.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_facet.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_facet.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_form.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_form.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_group.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_group_base.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group_base.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_group_ref.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group_ref.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_identity_constraint.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_identity_constraint.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_import.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_import.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_includes.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_includes.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_collection.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj_collection.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj_table.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_particle.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_particle.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_redefine.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_redefine.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_severity_type.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_severity_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_extension.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content_extension.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_restriction.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_content.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_content.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_list.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_list.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_restriction.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_union.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_union.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_tokenized_type.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_tokenized_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_type.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_url_resolver.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_url_resolver.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_use.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_use.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_xpath.h
      - copied, changed from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_xpath.h
Removed:
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_annotated.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_annotation.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_any.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_any_attribute.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_app_info.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute_group.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute_group_ref.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_builder.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_collection.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_complex_content.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_complex_content_extension.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_complex_content_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_complex_type.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_constants.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_content_processing.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_content_type.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_data_type.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_defines.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_derivation_method.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_documentation.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_element.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_enum.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_external.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_facet.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_form.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group_base.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group_ref.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_identity_constraint.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_import.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_includes.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj_collection.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj_table.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_particle.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_redefine.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content_extension.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_content.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_list.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_union.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_type.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_url_resolver.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_use.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_xpath.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_severity_type.h
    webservices/axis2/trunk/c/xml_schema/include/axis2_xml_tokenized_type.h
Modified:
    webservices/axis2/trunk/c/xml_schema/include/xml_schema_input_source.h
    webservices/axis2/trunk/c/xml_schema/samples/test_schema.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_input_source.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_url_resolver.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c
    webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c
    webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema.h Mon Jun 12 03:29:40 2006
@@ -14,46 +14,46 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_H
-#define AXIS2_XML_SCHEMA_H
+#ifndef XML_SCHEMA_H
+#define XML_SCHEMA_H
 
 /**
- * @file axis2_xml_schema.h
+ * @file xml_schema.h
  * @brief Axis2 Xml Schema Interface
  *          Contains the definition of a schema. All XML Schema definition 
  *          language (XSD) elements are children of the schema element. 
  *          Represents the World Wide Web Consortium (W3C) schema element
  */
 
-#include <axis2_xml_schema_defines.h>
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema_defines.h>
+#include <xml_schema_annotated.h>
 #include <axiom_element.h>
 #include <axiom_node.h>
 #include <axis2_hash.h>
 
-/** @defgroup axis2_xml_schema Xml Schema
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema Xml Schema
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema axis2_xml_schema_t;
-typedef struct axis2_xml_schema_ops axis2_xml_schema_ops_t;
-struct axis2_xml_schema_form;
-struct axis2_xml_schema_obj_table;
-struct axis2_xml_schema_derivation_method;
-struct axis2_xml_schema_element;
-struct axis2_xml_schema_type;
-struct axis2_xml_schema_obj_collection;
-struct axis2_xml_schema_collection;
+typedef struct xml_schema xml_schema_t;
+typedef struct xml_schema_ops xml_schema_ops_t;
+struct xml_schema_form;
+struct xml_schema_obj_table;
+struct xml_schema_derivation_method;
+struct xml_schema_element;
+struct xml_schema_type;
+struct xml_schema_obj_collection;
+struct xml_schema_collection;
 
-#define AXIS2_XML_SCHEMA_NS "http://www.w3.org/2001/XMLSchema"
+#define XML_SCHEMA_NS "http://www.w3.org/2001/XMLSchema"
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_ops
+struct xml_schema_ops
 {
    /** 
      * Deallocate memory
@@ -69,11 +69,11 @@
             void *schema,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(  void *schema,
             const axis2_env_t *env);
     
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl)(
             void *schema,
             const axis2_env_t *env);
@@ -84,7 +84,7 @@
             const axis2_env_t *env,
             axis2_char_t *prefix);
 
-    struct axis2_xml_schema_form *(AXIS2_CALL *
+    struct xml_schema_form *(AXIS2_CALL *
     get_attr_form_default)(
             void *schema,
             const axis2_env_t *env);
@@ -93,19 +93,19 @@
     set_attr_form_default)(
             void *schema,
             const axis2_env_t *env,
-            struct axis2_xml_schema_form *value);
+            struct xml_schema_form *value);
 
-    struct axis2_xml_schema_obj_table *(AXIS2_CALL *
+    struct xml_schema_obj_table *(AXIS2_CALL *
     get_attr_groups)(
             void *schema,
             const axis2_env_t *env);
 
-    struct axis2_xml_schema_obj_table *(AXIS2_CALL *
+    struct xml_schema_obj_table *(AXIS2_CALL *
     get_attrs)(
             void *schema,
             const axis2_env_t *env);
 
-    struct axis2_xml_schema_derivation_method *(AXIS2_CALL *
+    struct xml_schema_derivation_method *(AXIS2_CALL *
     get_block_default)(
             void *schema,
             const axis2_env_t *env); 
@@ -114,9 +114,9 @@
     set_block_default)(
             void *schema,
             const axis2_env_t *env,
-            struct axis2_xml_schema_derivation_method *block_default); 
+            struct xml_schema_derivation_method *block_default); 
 
-    struct axis2_xml_schema_form *(AXIS2_CALL *
+    struct xml_schema_form *(AXIS2_CALL *
     get_element_form_default)(
             void *schema,
             const axis2_env_t *env); 
@@ -125,26 +125,26 @@
     set_element_form_default)(
             void *schema,
             const axis2_env_t *env,
-            struct axis2_xml_schema_form *element_form_default); 
+            struct xml_schema_form *element_form_default); 
 
-    struct axis2_xml_schema_obj_table *(AXIS2_CALL *
+    struct xml_schema_obj_table *(AXIS2_CALL *
     get_elements)(
             void *schema,
             const axis2_env_t *env); 
 
-    struct axis2_xml_schema_element *(AXIS2_CALL *
+    struct xml_schema_element *(AXIS2_CALL *
     get_element_by_qname)(
             void *schema,
             const axis2_env_t *env,
             axis2_qname_t *qname); 
 
-    struct axis2_xml_schema_type *(AXIS2_CALL *
+    struct xml_schema_type *(AXIS2_CALL *
     get_type_by_qname)(
             void *schema,
             const axis2_env_t *env,
             axis2_qname_t *qname); 
 
-    struct axis2_xml_schema_derivation_method *(AXIS2_CALL *
+    struct xml_schema_derivation_method *(AXIS2_CALL *
     get_final_default)(
             void *schema,
             const axis2_env_t *env); 
@@ -153,14 +153,14 @@
     set_final_default)(
             void *schema,
             const axis2_env_t *env,
-            struct axis2_xml_schema_derivation_method *final_default); 
+            struct xml_schema_derivation_method *final_default); 
 
-    struct axis2_xml_schema_obj_table *(AXIS2_CALL *
+    struct xml_schema_obj_table *(AXIS2_CALL *
     get_groups)(
             void *schema,
             const axis2_env_t *env); 
 
-    struct axis2_xml_schema_obj_collection *(AXIS2_CALL *
+    struct xml_schema_obj_collection *(AXIS2_CALL *
     get_includes)(
             void *schema,
             const axis2_env_t *env); 
@@ -170,17 +170,17 @@
             void *schema,
             const axis2_env_t *env); 
 
-    struct axis2_xml_schema_obj_collection *(AXIS2_CALL *
+    struct xml_schema_obj_collection *(AXIS2_CALL *
     get_items)(
             void *schema,
             const axis2_env_t *env); 
 
-    struct axis2_xml_schema_obj_table *(AXIS2_CALL *
+    struct xml_schema_obj_table *(AXIS2_CALL *
     get_notations)(
             void *schema,
             const axis2_env_t *env); 
 
-    struct axis2_xml_schema_obj_table *(AXIS2_CALL *
+    struct xml_schema_obj_table *(AXIS2_CALL *
     get_schema_types)(
             void *schema,
             const axis2_env_t *env); 
@@ -231,7 +231,7 @@
     add_type)(
             void *schema,
             const axis2_env_t *env,
-            struct axis2_xml_schema_type *type);
+            struct xml_schema_type *type);
             
     axis2_status_t (AXIS2_CALL *
     set_schema_ns_prefix)(
@@ -241,156 +241,156 @@
 
 };
 
-struct axis2_xml_schema
+struct xml_schema
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_ops_t *ops;
 };
 
 /**
  * Creates new Xml Schema
  */
-AXIS2_EXTERN axis2_xml_schema_t * AXIS2_CALL
-axis2_xml_schema_create(const axis2_env_t *env,
+AXIS2_EXTERN xml_schema_t * AXIS2_CALL
+xml_schema_create(const axis2_env_t *env,
                                 axis2_char_t *namespc,
-                                struct axis2_xml_schema_collection *parent);
+                                struct xml_schema_collection *parent);
 
-#define AXIS2_XML_SCHEMA_FREE(schema, env) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_FREE(schema, env) \
+      (((xml_schema_t *) schema)->ops->\
             free(schema, env))
 
-#define AXIS2_XML_SCHEMA_SUPER_OBJS(schema, env) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_SUPER_OBJS(schema, env) \
+      (((xml_schema_t *) schema)->ops->\
             super_objs(schema, env))
 
-#define AXIS2_XML_SCHEMA_GET_TYPE(schema, env) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_TYPE(schema, env) \
+      (((xml_schema_t *) schema)->ops->\
             get_type(schema, env))
 
-#define AXIS2_XML_SCHEMA_GET_BASE_IMPL(schema, env) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_BASE_IMPL(schema, env) \
+      (((xml_schema_t *) schema)->ops->\
             get_base_impl(schema, env))
             
-#define AXIS2_XML_SCHEMA_GET_NAMESPACE(schema, env, prefix) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_NAMESPACE(schema, env, prefix) \
+        (((xml_schema_t *) schema)->ops->\
             get_namespace(schema, env, prefix))            
 
-#define AXIS2_XML_SCHEMA_GET_ATTR_FORM_DEFAULT(schema, env) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_ATTR_FORM_DEFAULT(schema, env) \
+      (((xml_schema_t *) schema)->ops->\
             get_attr_form_default(schema, env))
 
-#define AXIS2_XML_SCHEMA_SET_ATTR_FORM_DEFAULT(schema, env, attr_form) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_SET_ATTR_FORM_DEFAULT(schema, env, attr_form) \
+      (((xml_schema_t *) schema)->ops->\
             set_attr_form_default(schema, env, attr_form))
 
-#define AXIS2_XML_SCHEMA_GET_ATTR_GROUPS(schema, env) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_ATTR_GROUPS(schema, env) \
+      (((xml_schema_t *) schema)->ops->\
            get_attr_groups(schema, env))
            
-#define AXIS2_XML_SCHEMA_GET_ATTRS(schema, env) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_ATTRS(schema, env) \
+      (((xml_schema_t *) schema)->ops->\
            get_attrs(schema, env))           
 
-#define AXIS2_XML_SCHEMA_GET_BLOCK_DEFAULT(schema, env) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_BLOCK_DEFAULT(schema, env) \
+      (((xml_schema_t *) schema)->ops->\
            get_block_default(schema, env))
            
 
-#define AXIS2_XML_SCHEMA_SET_BLOCK_DEFAULT(schema, env, block_default) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_SET_BLOCK_DEFAULT(schema, env, block_default) \
+      (((xml_schema_t *) schema)->ops->\
            set_block_default(schema, env, block_default))
            
-#define AXIS2_XML_SCHEMA_GET_ELEMENT_FORM_DEFAULT(schema, env) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_ELEMENT_FORM_DEFAULT(schema, env) \
+      (((xml_schema_t *) schema)->ops->\
            get_element_form_default(schema, env))
 
-#define AXIS2_XML_SCHEMA_SET_ELEMENT_FORM_DEFAULT(schema, env, ele_form_default) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_SET_ELEMENT_FORM_DEFAULT(schema, env, ele_form_default) \
+      (((xml_schema_t *) schema)->ops->\
            set_element_form_default(schema, env, ele_form_default))
            
-#define AXIS2_XML_SCHEMA_GET_ELEMENTS(schema, env) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_ELEMENTS(schema, env) \
+        (((xml_schema_t *) schema)->ops->\
            get_elements(schema, env))                         
 
-#define AXIS2_XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, qname) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env, qname) \
+        (((xml_schema_t *) schema)->ops->\
            get_element_by_qname(schema, env, qname))  
            
-#define AXIS2_XML_SCHEMA_GET_TYPE_BY_QNAME(schema, env, qname) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_TYPE_BY_QNAME(schema, env, qname) \
+        (((xml_schema_t *) schema)->ops->\
            get_type_by_qname(schema, env, qname))                  
 
-#define AXIS2_XML_SCHEMA_SET_FINAL_DEFAULT(schema, env, final_default) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_SET_FINAL_DEFAULT(schema, env, final_default) \
+      (((xml_schema_t *) schema)->ops->\
            set_final_default(schema, env, final_default))
 
-#define AXIS2_XML_SCHEMA_GET_FINAL_DEFAULT(schema, env) \
-      (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_FINAL_DEFAULT(schema, env) \
+      (((xml_schema_t *) schema)->ops->\
            get_final_default(schema, env))
            
-#define AXIS2_XML_SCHEMA_GET_GROUPS(schema, env) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_GROUPS(schema, env) \
+        (((xml_schema_t *) schema)->ops->\
            get_groups(schema, env))      
            
            
-#define AXIS2_XML_SCHEMA_GET_INCLUDES(schema, env) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_INCLUDES(schema, env) \
+        (((xml_schema_t *) schema)->ops->\
            get_includes(schema, env))                  
 
-#define AXIS2_XML_SCHEMA_IS_COMPILED(schema, env) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_IS_COMPILED(schema, env) \
+        (((xml_schema_t *) schema)->ops->\
            is_compiled(schema, env)) 
 
-#define AXIS2_XML_SCHEMA_GET_ITEMS(schema, env) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_ITEMS(schema, env) \
+        (((xml_schema_t *) schema)->ops->\
            get_items(schema, env)) 
            
-#define AXIS2_XML_SCHEMA_GET_NOTATIONS(schema, env) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_NOTATIONS(schema, env) \
+        (((xml_schema_t *) schema)->ops->\
            get_items(schema, env))  
            
-#define AXIS2_XML_SCHEMA_GET_SCHEMA_TYPES(schema, env) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_SCHEMA_TYPES(schema, env) \
+        (((xml_schema_t *) schema)->ops->\
            get_schema_types(schema, env))            
                                
-#define AXIS2_XML_SCHEMA_GET_TARGET_NAMESPACE(schema, env) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_TARGET_NAMESPACE(schema, env) \
+        (((xml_schema_t *) schema)->ops->\
            get_target_namespace(schema, env))    
            
-#define AXIS2_XML_SCHEMA_SET_TARGET_NAMESPACE(schema, env, target_ns) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_SET_TARGET_NAMESPACE(schema, env, target_ns) \
+        (((xml_schema_t *) schema)->ops->\
            set_target_namespace(schema, env, target_ns))                    
            
-#define AXIS2_XML_SCHEMA_GET_VERSION(schema, env) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_VERSION(schema, env) \
+        (((xml_schema_t *) schema)->ops->\
            get_version(schema, env)) 
 
-#define AXIS2_XML_SCHEMA_COMPILE(schema, env) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_COMPILE(schema, env) \
+        (((xml_schema_t *) schema)->ops->\
            compile(schema, env))   
            
-#define AXIS2_XML_SCHEMA_WRITE_WITH_OUT(schema, env, out) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_WRITE_WITH_OUT(schema, env, out) \
+        (((xml_schema_t *) schema)->ops->\
             write_with_out(schema, env, out))
             
-#define AXIS2_XML_SCHEMA_WRITE_WITH_WRITER(schema, env, writer) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_WRITE_WITH_WRITER(schema, env, writer) \
+        (((xml_schema_t *) schema)->ops->\
             write_with_writer(schema, env, writer))     
             
-#define AXIS2_XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(schema, env)\
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(schema, env)\
+        (((xml_schema_t *) schema)->ops->\
             get_prefix_to_namespace_map(schema, env))    
             
-#define AXIS2_XML_SCHEMA_SET_PREFIX_TO_NAMESPACE_MAP(schema, env, map)\
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_SET_PREFIX_TO_NAMESPACE_MAP(schema, env, map)\
+        (((xml_schema_t *) schema)->ops->\
             set_prefix_to_namespace_map(schema, env, map))         
             
-#define AXIS2_XML_SCHEMA_ADD_TYPE(schema, env, type)\
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_ADD_TYPE(schema, env, type)\
+        (((xml_schema_t *) schema)->ops->\
             add_type(schema, env, type)) 
             
-#define AXIS2_XML_SCHEMA_SET_SCHEMA_NS_PREFIX(schema, env, ns_prefix) \
-        (((axis2_xml_schema_t *) schema)->ops->\
+#define XML_SCHEMA_SET_SCHEMA_NS_PREFIX(schema, env, ns_prefix) \
+        (((xml_schema_t *) schema)->ops->\
             set_schema_ns_prefix(schema, env, ns_prefix))
             
                                         
@@ -400,4 +400,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_H */
+#endif /* XML_SCHEMA_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_annotated.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_annotated.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_annotated.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_annotated.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_annotated.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_annotated.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_annotated.h Mon Jun 12 03:29:40 2006
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_ANNOTATED_H
-#define AXIS2_XML_SCHEMA_ANNOTATED_H
+#ifndef XML_SCHEMA_ANNOTATED_H
+#define XML_SCHEMA_ANNOTATED_H
 
 /**
- * @file axis2_xml_schema_annotated.h
+ * @file xml_schema_annotated.h
  * @brief Axis2 Xml Schema Annotated Interface
  */
 
-#include <axis2_xml_schema_defines.h>
-#include <axis2_xml_schema_obj.h>
+#include <xml_schema_defines.h>
+#include <xml_schema_obj.h>
 
-/** @defgroup axis2_xml_schema_annotated Xml Schema Annotated
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_annotated Xml Schema Annotated
+  * @ingroup xml_schema
   * @{
   */
                     
@@ -35,12 +35,12 @@
 {
 #endif
 
-typedef struct axis2_xml_schema_annotated 
-                    axis2_xml_schema_annotated_t;
-typedef struct axis2_xml_schema_annotated_ops 
-                    axis2_xml_schema_annotated_ops_t;
+typedef struct xml_schema_annotated 
+                    xml_schema_annotated_t;
+typedef struct xml_schema_annotated_ops 
+                    xml_schema_annotated_ops_t;
                     
-struct axis2_xml_schema_annotated_ops
+struct xml_schema_annotated_ops
 {
     axis2_status_t (AXIS2_CALL *
     free)(void *annotated,
@@ -51,12 +51,12 @@
             void *annotated,
             const axis2_env_t *env);
     
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(
             void *annotated,
             const axis2_env_t *env);
 
-    axis2_xml_schema_obj_t *(AXIS2_CALL *
+    xml_schema_obj_t *(AXIS2_CALL *
     get_base_impl)(
             void *annotated,
             const axis2_env_t *env);
@@ -71,7 +71,7 @@
             const axis2_env_t *env,
             axis2_char_t *id);
 
-    struct axis2_xml_schema_annotation *(AXIS2_CALL *
+    struct xml_schema_annotation *(AXIS2_CALL *
     get_annotation) (
             void *annotated,
             const axis2_env_t *env);
@@ -80,7 +80,7 @@
     set_annotation)(
             void *annotated,
             const axis2_env_t *env,
-            struct axis2_xml_schema_annotation *annotation);
+            struct xml_schema_annotation *annotation);
 
     axis2_array_list_t *(AXIS2_CALL *
     get_unhandled_attrs) (
@@ -94,67 +94,67 @@
             axis2_array_list_t *unhandled_attrs);
 };
 
-struct axis2_xml_schema_annotated
+struct xml_schema_annotated
 {
-    axis2_xml_schema_obj_t base;
-    axis2_xml_schema_annotated_ops_t *ops;
+    xml_schema_obj_t base;
+    xml_schema_annotated_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_annotated_t * AXIS2_CALL
-axis2_xml_schema_annotated_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_annotated_t * AXIS2_CALL
+xml_schema_annotated_create(const axis2_env_t *env);
 
 /**
  * This method is internal to Axis2 C. It is called from Child Constructor
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_annotated_resolve_methods(
-                                axis2_xml_schema_annotated_t *annotated,
+xml_schema_annotated_resolve_methods(
+                                xml_schema_annotated_t *annotated,
                                 const axis2_env_t *env,
-                                axis2_xml_schema_annotated_t *annotated_impl,
+                                xml_schema_annotated_t *annotated_impl,
                                 axis2_hash_t *methods);
                                 
 /*************** Macros *******************************************************/                                
 
-#define AXIS2_XML_SCHEMA_ANNOTATED_FREE(annotated, env) \
-      (((axis2_xml_schema_annotated_t *) annotated)->ops->free(\
+#define XML_SCHEMA_ANNOTATED_FREE(annotated, env) \
+      (((xml_schema_annotated_t *) annotated)->ops->free(\
             annotated, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATED_SUPER_OBJS(annotated, env) \
-      (((axis2_xml_schema_annotated_t *) annotated)->ops->super_objs(\
+#define XML_SCHEMA_ANNOTATED_SUPER_OBJS(annotated, env) \
+      (((xml_schema_annotated_t *) annotated)->ops->super_objs(\
             annotated, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATED_GET_TYPE(annotated, env) \
-      (((axis2_xml_schema_annotated_t *) annotated)->ops->get_type(\
+#define XML_SCHEMA_ANNOTATED_GET_TYPE(annotated, env) \
+      (((xml_schema_annotated_t *) annotated)->ops->get_type(\
             annotated, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env) \
-      (((axis2_xml_schema_annotated_t *) annotated)->ops->get_base_impl(\
+#define XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env) \
+      (((xml_schema_annotated_t *) annotated)->ops->get_base_impl(\
             annotated, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATED_GET_ID(annotated, env) \
-      (((axis2_xml_schema_annotated_t *) annotated)->ops->get_id(\
+#define XML_SCHEMA_ANNOTATED_GET_ID(annotated, env) \
+      (((xml_schema_annotated_t *) annotated)->ops->get_id(\
             annotated, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATED_SET_ID(annotated, env, id) \
-      (((axis2_xml_schema_annotated_t *) annotated)->ops->set_id(\
+#define XML_SCHEMA_ANNOTATED_SET_ID(annotated, env, id) \
+      (((xml_schema_annotated_t *) annotated)->ops->set_id(\
             annotated, env, id))
 
-#define AXIS2_XML_SCHEMA_ANNOTATED_GET_ANNOTATION(annotated, env) \
-      (((axis2_xml_schema_annotated_t *) annotated)->ops->get_annotation(\
+#define XML_SCHEMA_ANNOTATED_GET_ANNOTATION(annotated, env) \
+      (((xml_schema_annotated_t *) annotated)->ops->get_annotation(\
             annotated, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATED_SET_ANNOTATION(annotated, env, \
+#define XML_SCHEMA_ANNOTATED_SET_ANNOTATION(annotated, env, \
         annotation) \
-      (((axis2_xml_schema_annotated_t *) annotated)->ops->set_annotation(\
+      (((xml_schema_annotated_t *) annotated)->ops->set_annotation(\
             annotated, env, annotation))
 
-#define AXIS2_XML_SCHEMA_ANNOTATED_GET_UNHANDLED_ATTRS(annotated, env) \
-      (((axis2_xml_schema_annotated_t *) annotated)->ops->get_unhandled_attrs(\
+#define XML_SCHEMA_ANNOTATED_GET_UNHANDLED_ATTRS(annotated, env) \
+      (((xml_schema_annotated_t *) annotated)->ops->get_unhandled_attrs(\
             annotated, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATED_SET_UNHANDLED_ATTRS(annotated, \
+#define XML_SCHEMA_ANNOTATED_SET_UNHANDLED_ATTRS(annotated, \
         env, unhandled_attrs) \
-      (((axis2_xml_schema_annotated_t *) annotated)->ops->set_unhandled_attrs(\
+      (((xml_schema_annotated_t *) annotated)->ops->set_unhandled_attrs(\
             annotated, env, unhandled_attrs))
 
 /**************************** end macros ***************************************/
@@ -162,4 +162,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_ANNOTATED_H */
+#endif /* XML_SCHEMA_ANNOTATED_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_annotation.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_annotation.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_annotation.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_annotation.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_annotation.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_annotation.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_annotation.h Mon Jun 12 03:29:40 2006
@@ -14,33 +14,33 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_ANNOTATION_H
-#define AXIS2_XML_SCHEMA_ANNOTATION_H
+#ifndef XML_SCHEMA_ANNOTATION_H
+#define XML_SCHEMA_ANNOTATION_H
 
 /**
- * @file axis2_xml_schema_annotation.h
+ * @file xml_schema_annotation.h
  * @brief Axis2 Xml Schema Annotation Interface
  */
 
-#include <axis2_xml_schema_defines.h>
-#include <axis2_xml_schema_obj.h>
-#include <axis2_xml_schema_obj_collection.h>
+#include <xml_schema_defines.h>
+#include <xml_schema_obj.h>
+#include <xml_schema_obj_collection.h>
 #include <axis2_hash.h>
 
-/** @defgroup axis2_xml_schema_annotation Xml Schema Annotation
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_annotation Xml Schema Annotation
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_annotation axis2_xml_schema_annotation_t;
-typedef struct axis2_xml_schema_annotation_ops axis2_xml_schema_annotation_ops_t;
+typedef struct xml_schema_annotation xml_schema_annotation_t;
+typedef struct xml_schema_annotation_ops xml_schema_annotation_ops_t;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_annotation_ops
+struct xml_schema_annotation_ops
 {
    /** 
      * Deallocate memory
@@ -55,50 +55,50 @@
             void *annotation,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (
             void *annotation,
             const axis2_env_t *env);
 
-    axis2_xml_schema_obj_t *(AXIS2_CALL *
+    xml_schema_obj_t *(AXIS2_CALL *
     get_base_impl) (void *annotation,
                         const axis2_env_t *env);
     
-    axis2_xml_schema_obj_collection_t *(AXIS2_CALL *
+    xml_schema_obj_collection_t *(AXIS2_CALL *
     get_items)(void *annotation,
                 const axis2_env_t *env);
     
 };
 
-struct axis2_xml_schema_annotation
+struct xml_schema_annotation
 {
-    axis2_xml_schema_obj_t base;
-    axis2_xml_schema_annotation_ops_t *ops;
+    xml_schema_obj_t base;
+    xml_schema_annotation_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_annotation_t * AXIS2_CALL
-axis2_xml_schema_annotation_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_annotation_t * AXIS2_CALL
+xml_schema_annotation_create(const axis2_env_t *env);
 
 /***************** Macros *****************************************/
 
-#define AXIS2_XML_SCHEMA_ANNOTATION_FREE(annotation, env) \
-      (((axis2_xml_schema_annotation_t *) annotation)->ops->\
+#define XML_SCHEMA_ANNOTATION_FREE(annotation, env) \
+      (((xml_schema_annotation_t *) annotation)->ops->\
             free(annotation, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATION_SUPER_OBJS(annotation, env) \
-      (((axis2_xml_schema_annotation_t *) annotation)->ops->\
+#define XML_SCHEMA_ANNOTATION_SUPER_OBJS(annotation, env) \
+      (((xml_schema_annotation_t *) annotation)->ops->\
             super_objs(annotation, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATION_GET_TYPE(annotation, env) \
-      (((axis2_xml_schema_annotation_t *) annotation)->ops->\
+#define XML_SCHEMA_ANNOTATION_GET_TYPE(annotation, env) \
+      (((xml_schema_annotation_t *) annotation)->ops->\
             get_type(annotation, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATION_GET_ITEMS(annotation, env) \
-      (((axis2_xml_schema_annotation_t *) annotation)->ops->\
+#define XML_SCHEMA_ANNOTATION_GET_ITEMS(annotation, env) \
+      (((xml_schema_annotation_t *) annotation)->ops->\
             get_items(annotation, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATION_GET_BASE_IMPL(annotation, env) \
-      (((axis2_xml_schema_annotation_t *) annotation)->ops->\
+#define XML_SCHEMA_ANNOTATION_GET_BASE_IMPL(annotation, env) \
+      (((xml_schema_annotation_t *) annotation)->ops->\
             get_base_impl(annotation, env))
 
 /************************ end macros *******************************/
@@ -106,4 +106,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_ANNOTATION_H */
+#endif /* XML_SCHEMA_ANNOTATION_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_any.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_any.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_any.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_any.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_any.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_any.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_any.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_ANY_H
-#define AXIS2_XML_SCHEMA_ANY_H
+#ifndef XML_SCHEMA_ANY_H
+#define XML_SCHEMA_ANY_H
 
 /**
- * @file axis2_xml_schema_any.h
+ * @file xml_schema_any.h
  * @brief Axis2 Xml Schema Any Interface
  *          Enables any element from the specified namespace or namespaces
  *          to appear in the containing complexType element. Represents the
@@ -26,25 +26,25 @@
  *
  */
 
-#include <axis2_xml_schema_defines.h>
-#include <axis2_xml_schema_particle.h>
-#include <axis2_xml_schema_content_processing.h>
+#include <xml_schema_defines.h>
+#include <xml_schema_particle.h>
+#include <xml_schema_content_processing.h>
 
-/** @defgroup axis2_xml_schema_any Xml Schema Any
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_any Xml Schema Any
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_any axis2_xml_schema_any_t;
-typedef struct axis2_xml_schema_any_ops axis2_xml_schema_any_ops_t;
-struct axis2_xml_schema_content_processing_t;
+typedef struct xml_schema_any xml_schema_any_t;
+typedef struct xml_schema_any_ops xml_schema_any_ops_t;
+struct xml_schema_content_processing_t;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_any_ops
+struct xml_schema_any_ops
 {
    /** 
      * Deallocate memory
@@ -60,12 +60,12 @@
             void *any,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (
             void *any,
             const axis2_env_t *env);
 
-    axis2_xml_schema_particle_t *(AXIS2_CALL *
+    xml_schema_particle_t *(AXIS2_CALL *
     get_base_impl) (void *any,
                     const axis2_env_t *env);
     
@@ -78,7 +78,7 @@
                     const axis2_env_t *env,
                     axis2_char_t *ns);
 
-    axis2_xml_schema_content_processing_t *(AXIS2_CALL *
+    xml_schema_content_processing_t *(AXIS2_CALL *
     get_process_content) (void *any,
                           const axis2_env_t *env);
 
@@ -86,57 +86,57 @@
     set_process_content)(
         void *any,
         const axis2_env_t *env,
-        axis2_xml_schema_content_processing_t *process_content);
+        xml_schema_content_processing_t *process_content);
 };
 
-struct axis2_xml_schema_any
+struct xml_schema_any
 {
-    axis2_xml_schema_particle_t base;
-    axis2_xml_schema_any_ops_t *ops;
+    xml_schema_particle_t base;
+    xml_schema_any_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_any_t * AXIS2_CALL
-axis2_xml_schema_any_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_any_t * AXIS2_CALL
+xml_schema_any_create(const axis2_env_t *env);
 
 /**
  * This method is internal to Axis2 C. It is called from Child Constructor
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_any_resolve_methods(
-           axis2_xml_schema_any_t *any,
+xml_schema_any_resolve_methods(
+           xml_schema_any_t *any,
            const axis2_env_t *env,
-           axis2_xml_schema_any_t *any_impl,
+           xml_schema_any_t *any_impl,
            axis2_hash_t *methods);
  */
  /************************ Macros *******************************************/
  
-#define AXIS2_XML_SCHEMA_ANY_FREE(any, env) \
-      (((axis2_xml_schema_any_t *) any)->ops->free(any, env))
+#define XML_SCHEMA_ANY_FREE(any, env) \
+      (((xml_schema_any_t *) any)->ops->free(any, env))
 
-#define AXIS2_XML_SCHEMA_ANY_SUPER_OBJS(any, env) \
-      (((axis2_xml_schema_any_t *) any)->ops->super_objs(any, env))
+#define XML_SCHEMA_ANY_SUPER_OBJS(any, env) \
+      (((xml_schema_any_t *) any)->ops->super_objs(any, env))
 
-#define AXIS2_XML_SCHEMA_ANY_GET_TYPE(any, env) \
-      (((axis2_xml_schema_any_t *) any)->ops->get_type(any, env))
+#define XML_SCHEMA_ANY_GET_TYPE(any, env) \
+      (((xml_schema_any_t *) any)->ops->get_type(any, env))
 
-#define AXIS2_XML_SCHEMA_ANY_GET_BASE_IMPL(any, env) \
-      (((axis2_xml_schema_any_t *) any)->ops->get_base_impl(any, env))
+#define XML_SCHEMA_ANY_GET_BASE_IMPL(any, env) \
+      (((xml_schema_any_t *) any)->ops->get_base_impl(any, env))
 
-#define AXIS2_XML_SCHEMA_ANY_GET_NAMESPACE(any, env) \
-      (((axis2_xml_schema_any_t *) any)->ops->get_namespace(any, env))
+#define XML_SCHEMA_ANY_GET_NAMESPACE(any, env) \
+      (((xml_schema_any_t *) any)->ops->get_namespace(any, env))
 
-#define AXIS2_XML_SCHEMA_ANY_SET_NAMESPACE(any, env, namespc) \
-      (((axis2_xml_schema_any_t *) any)->ops->set_namespace(any, env, namespc))
+#define XML_SCHEMA_ANY_SET_NAMESPACE(any, env, namespc) \
+      (((xml_schema_any_t *) any)->ops->set_namespace(any, env, namespc))
 
-#define AXIS2_XML_SCHEMA_ANY_GET_PROCESS_CONTENT(any, env) \
-      (((axis2_xml_schema_any_t *) any)->ops->get_process_content(any, env))
+#define XML_SCHEMA_ANY_GET_PROCESS_CONTENT(any, env) \
+      (((xml_schema_any_t *) any)->ops->get_process_content(any, env))
 
-#define AXIS2_XML_SCHEMA_ANY_SET_PROCESS_CONTENT(any, env, process_content) \
-      (((axis2_xml_schema_any_t *) any)->ops->set_process_content(any, env, process_content))
+#define XML_SCHEMA_ANY_SET_PROCESS_CONTENT(any, env, process_content) \
+      (((xml_schema_any_t *) any)->ops->set_process_content(any, env, process_content))
 
 /*********************************** Macros ***************************************************/
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_ANY_H */
+#endif /* XML_SCHEMA_ANY_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_any_attribute.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_any_attribute.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_any_attribute.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_any_attribute.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_any_attribute.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_any_attribute.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_any_attribute.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_H
-#define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_H
+#ifndef XML_SCHEMA_ANY_ATTRIBUTE_H
+#define XML_SCHEMA_ANY_ATTRIBUTE_H
 
 /**
- * @file axis2_xml_schema_any.h
+ * @file xml_schema_any.h
  * @brief Axis2 Xml Schema Any Interface
  *          Enables any element from the specified namespace or namespaces
  *          to appear in the containing complexType element. Represents the
@@ -26,25 +26,25 @@
  *
  */
 
-#include <axis2_xml_schema_particle.h>
-#include <axis2_xml_schema_content_processing.h>
+#include <xml_schema_particle.h>
+#include <xml_schema_content_processing.h>
 
-/** @defgroup axis2_xml_schema_any Xml Schema Any
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_any Xml Schema Any
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_any_attribute 
-                    axis2_xml_schema_any_attribute_t;
-typedef struct axis2_xml_schema_any_attribute_ops 
-                axis2_xml_schema_any_attribute_ops_t;
+typedef struct xml_schema_any_attribute 
+                    xml_schema_any_attribute_t;
+typedef struct xml_schema_any_attribute_ops 
+                xml_schema_any_attribute_ops_t;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_any_attribute_ops
+struct xml_schema_any_attribute_ops
 {
    /** 
      * Deallocate memory
@@ -54,7 +54,7 @@
     free) (void *any_attr,
             const axis2_env_t *env);
             
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(void *any_attr,
           const axis2_env_t *env);
           
@@ -63,7 +63,7 @@
                 const axis2_env_t *env);
                                       
 
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl) (void *any_attr,
                     const axis2_env_t *env);
     
@@ -76,67 +76,67 @@
                     const axis2_env_t *env,
                     axis2_char_t *ns);
 
-    struct axis2_xml_schema_content_processing *(AXIS2_CALL *
+    struct xml_schema_content_processing *(AXIS2_CALL *
     get_process_content) (void *any_attr,
                           const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
     set_process_content)(void *any_attr,
                         const axis2_env_t *env,
-                        struct axis2_xml_schema_content_processing *process_content);
+                        struct xml_schema_content_processing *process_content);
 };
 
-struct axis2_xml_schema_any_attribute
+struct xml_schema_any_attribute
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_any_attribute_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_any_attribute_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_any_attribute_t * AXIS2_CALL
-axis2_xml_schema_any_attribute_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_any_attribute_t * AXIS2_CALL
+xml_schema_any_attribute_create(const axis2_env_t *env);
 
 /**
  * This method is internal to Axis2 C. It is called from Child Constructor
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_any_attribute_resolve_methods(
-                                axis2_xml_schema_any_attribute_t *any_attr,
+xml_schema_any_attribute_resolve_methods(
+                                xml_schema_any_attribute_t *any_attr,
                                 const axis2_env_t *env,
-                                axis2_xml_schema_any_attribute_t *any_impl,
+                                xml_schema_any_attribute_t *any_impl,
                                 axis2_hash_t *methods);
  */
 /******************************* Macros *************************************************/ 
  
-#define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(any_attr, env) \
-      (((axis2_xml_schema_any_attribute_t *) any_attr)->ops->free(any_attr, env))
+#define XML_SCHEMA_ANY_ATTRIBUTE_FREE(any_attr, env) \
+      (((xml_schema_any_attribute_t *) any_attr)->ops->free(any_attr, env))
 
-#define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_GET_BASE_IMPL(any_attr, env) \
-      (((axis2_xml_schema_any_attribute_t *) any_attr)->ops->get_base_impl(any_attr, env))
+#define XML_SCHEMA_ANY_ATTRIBUTE_GET_BASE_IMPL(any_attr, env) \
+      (((xml_schema_any_attribute_t *) any_attr)->ops->get_base_impl(any_attr, env))
 
 
-#define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_GET_TYPE(any_attr, env) \
-      (((axis2_xml_schema_any_attribute_t *) any_attr)->ops->get_type(any_attr, env))
+#define XML_SCHEMA_ANY_ATTRIBUTE_GET_TYPE(any_attr, env) \
+      (((xml_schema_any_attribute_t *) any_attr)->ops->get_type(any_attr, env))
       
       
-#define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_SUPER_OBJS(any_attr, env) \
-      (((axis2_xml_schema_any_attribute_t *) any_attr)->ops->super_objs(any_attr, env))
+#define XML_SCHEMA_ANY_ATTRIBUTE_SUPER_OBJS(any_attr, env) \
+      (((xml_schema_any_attribute_t *) any_attr)->ops->super_objs(any_attr, env))
       
       
-#define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_GET_NAMESPACE(any_attr, env) \
-      (((axis2_xml_schema_any_attribute_t *) any_attr)->ops->get_namespace(any_attr, env))
+#define XML_SCHEMA_ANY_ATTRIBUTE_GET_NAMESPACE(any_attr, env) \
+      (((xml_schema_any_attribute_t *) any_attr)->ops->get_namespace(any_attr, env))
 
-#define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_SET_NAMESPACE(any_attr, env, namespc) \
-      (((axis2_xml_schema_any_attribute_t *) any_attr)->ops->set_namespace(any_attr, env, namespc))
+#define XML_SCHEMA_ANY_ATTRIBUTE_SET_NAMESPACE(any_attr, env, namespc) \
+      (((xml_schema_any_attribute_t *) any_attr)->ops->set_namespace(any_attr, env, namespc))
 
-#define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_GET_PROCESS_CONTENT(any_attr, env) \
-      (((axis2_xml_schema_any_attribute_t *) any_attr)->ops->get_process_content(any_attr, env))
+#define XML_SCHEMA_ANY_ATTRIBUTE_GET_PROCESS_CONTENT(any_attr, env) \
+      (((xml_schema_any_attribute_t *) any_attr)->ops->get_process_content(any_attr, env))
 
-#define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_SET_PROCESS_CONTENT(any_attr, env, process_content) \
-      (((axis2_xml_schema_any_attribute_t *) any_attr)->ops->set_process_content(any_attr, env, process_content))
+#define XML_SCHEMA_ANY_ATTRIBUTE_SET_PROCESS_CONTENT(any_attr, env, process_content) \
+      (((xml_schema_any_attribute_t *) any_attr)->ops->set_process_content(any_attr, env, process_content))
 
 /******************************* end macros ***********************************************/
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_H */
+#endif /* XML_SCHEMA_ANY_ATTRIBUTE_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_app_info.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_app_info.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_app_info.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_app_info.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_app_info.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_app_info.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_app_info.h Mon Jun 12 03:29:40 2006
@@ -14,35 +14,35 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_APP_INFO_H
-#define AXIS2_XML_SCHEMA_APP_INFO_H
+#ifndef XML_SCHEMA_APP_INFO_H
+#define XML_SCHEMA_APP_INFO_H
 
 /**
- * @file axis2_xml_schema_app_info.h
+ * @file xml_schema_app_info.h
  * @brief Axis2 Xml Schema App Info Interface
  *          Defines application specific information within an annotation.
  *          Represents the World Wide Web Consortium (W3C) appinfo element.
  *
  */
 
-#include <axis2_xml_schema_defines.h>
-#include <axis2_xml_schema_obj.h>
+#include <xml_schema_defines.h>
+#include <xml_schema_obj.h>
 #include <axis2_hash.h>
 
-/** @defgroup axis2_xml_schema_app_info Xml Schema App Info
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_app_info Xml Schema App Info
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_app_info axis2_xml_schema_app_info_t;
-typedef struct axis2_xml_schema_app_info_ops axis2_xml_schema_app_info_ops_t;
+typedef struct xml_schema_app_info xml_schema_app_info_t;
+typedef struct xml_schema_app_info_ops xml_schema_app_info_ops_t;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_app_info_ops
+struct xml_schema_app_info_ops
 {
    /** 
      * Deallocate memory
@@ -58,12 +58,12 @@
             void *app_info,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (
             void *app_info,
             const axis2_env_t *env);
 
-    axis2_xml_schema_obj_t *(AXIS2_CALL *
+    xml_schema_obj_t *(AXIS2_CALL *
     get_base_impl) (void *app_info,
                         const axis2_env_t *env);
     
@@ -89,44 +89,44 @@
 
 };
 
-struct axis2_xml_schema_app_info
+struct xml_schema_app_info
 {
-    axis2_xml_schema_obj_t base;
-    axis2_xml_schema_app_info_ops_t *ops;
+    xml_schema_obj_t base;
+    xml_schema_app_info_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_app_info_t * AXIS2_CALL
-axis2_xml_schema_app_info_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_app_info_t * AXIS2_CALL
+xml_schema_app_info_create(const axis2_env_t *env);
 
 
 /*********************** macros ***********************************************/
 
-#define AXIS2_XML_SCHEMA_APP_INFO_FREE(app_info, env) \
-      (((axis2_xml_schema_app_info_t *) app_info)->ops->\
+#define XML_SCHEMA_APP_INFO_FREE(app_info, env) \
+      (((xml_schema_app_info_t *) app_info)->ops->\
             free(app_info, env))
 
-#define AXIS2_XML_SCHEMA_APP_INFO_SUPER_OBJS(app_info, env) \
-      (((axis2_xml_schema_app_info_t *) app_info)->ops->\
+#define XML_SCHEMA_APP_INFO_SUPER_OBJS(app_info, env) \
+      (((xml_schema_app_info_t *) app_info)->ops->\
             super_objs(app_info, env))
 
-#define AXIS2_XML_SCHEMA_APP_INFO_GET_TYPE(app_info, env) \
-      (((axis2_xml_schema_app_info_t *) app_info)->ops->\
+#define XML_SCHEMA_APP_INFO_GET_TYPE(app_info, env) \
+      (((xml_schema_app_info_t *) app_info)->ops->\
             get_type(app_info, env))
 
-#define AXIS2_XML_SCHEMA_APP_INFO_GET_SOURCE(app_info, env) \
-      (((axis2_xml_schema_app_info_t *) app_info)->ops->\
+#define XML_SCHEMA_APP_INFO_GET_SOURCE(app_info, env) \
+      (((xml_schema_app_info_t *) app_info)->ops->\
             get_source(app_info, env))
 
-#define AXIS2_XML_SCHEMA_APP_INFO_SET_SOURCE(app_info, env, source) \
-      (((axis2_xml_schema_app_info_t *) app_info)->ops->\
+#define XML_SCHEMA_APP_INFO_SET_SOURCE(app_info, env, source) \
+      (((xml_schema_app_info_t *) app_info)->ops->\
             set_source(app_info, env, source))
 
-#define AXIS2_XML_SCHEMA_APP_INFO_GET_MARKUP(app_info, env) \
-      (((axis2_xml_schema_app_info_t *) app_info)->ops->\
+#define XML_SCHEMA_APP_INFO_GET_MARKUP(app_info, env) \
+      (((xml_schema_app_info_t *) app_info)->ops->\
             get_markup(app_info, env))
 
-#define AXIS2_XML_SCHEMA_APP_INFO_SET_MARKUP(app_info, env, markup) \
-      (((axis2_xml_schema_app_info_t *) app_info)->ops->\
+#define XML_SCHEMA_APP_INFO_SET_MARKUP(app_info, env, markup) \
+      (((xml_schema_app_info_t *) app_info)->ops->\
             set_markup(app_info, env, markup))
 
 /************************ end macros ******************************************/
@@ -134,4 +134,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_APP_INFO_H */
+#endif /* XML_SCHEMA_APP_INFO_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_ATTRIBUTE_H
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_H
+#ifndef XML_SCHEMA_ATTRIBUTE_H
+#define XML_SCHEMA_ATTRIBUTE_H
 
 /**
- * @file axis2_xml_schema_any.h
+ * @file xml_schema_any.h
  * @brief Axis2 Xml Schema Any Interface
  *          Enables any element from the specified namespace or namespaces
  *          to appear in the containing complexType element. Represents the
@@ -26,36 +26,36 @@
  *
  */
 #include <axis2_qname.h>
-#include <axis2_xml_schema_particle.h>
-#include <axis2_xml_schema_form.h>
-#include <axis2_xml_schema_use.h>
-#include <axis2_xml_schema_content_processing.h>
-#include <axis2_xml_schema_simple_type.h>
+#include <xml_schema_particle.h>
+#include <xml_schema_form.h>
+#include <xml_schema_use.h>
+#include <xml_schema_content_processing.h>
+#include <xml_schema_simple_type.h>
 
 
-/** @defgroup axis2_xml_schema_any Xml Schema Any
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_any Xml Schema Any
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_attribute 
-                    axis2_xml_schema_attribute_t;
-typedef struct axis2_xml_schema_attribute_ops 
-                axis2_xml_schema_attribute_ops_t;
+typedef struct xml_schema_attribute 
+                    xml_schema_attribute_t;
+typedef struct xml_schema_attribute_ops 
+                xml_schema_attribute_ops_t;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_attribute_ops
+struct xml_schema_attribute_ops
 {
     axis2_status_t (AXIS2_CALL *
     free) (
             void *attr,
             const axis2_env_t *env);
             
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(
             void *attr,
             const axis2_env_t *env);
@@ -66,7 +66,7 @@
             const axis2_env_t *env);
                                       
 
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl)(
             void *attr,
             const axis2_env_t *env);
@@ -96,14 +96,14 @@
                      const axis2_env_t *env,
                      axis2_char_t *fixed_value);
 
-    struct axis2_xml_schema_form *(AXIS2_CALL *
+    struct xml_schema_form *(AXIS2_CALL *
     get_schema_form) (void *attr,
                       const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
     set_schema_form)(void *attr,
                      const axis2_env_t *env,
-                     axis2_xml_schema_form_t *schema_form);
+                     xml_schema_form_t *schema_form);
                      
     axis2_qname_t* (AXIS2_CALL *
     get_qname)(void *attr,
@@ -132,14 +132,14 @@
                   const axis2_env_t *env,
                   axis2_qname_t *ref_name);
                   
-    axis2_xml_schema_simple_type_t* (AXIS2_CALL *
+    xml_schema_simple_type_t* (AXIS2_CALL *
     get_schema_type)(void *attr,
                      const axis2_env_t *env);
                      
     axis2_status_t (AXIS2_CALL *
     set_schema_type)(void *attr,
                      const axis2_env_t *env,
-                     axis2_xml_schema_simple_type_t* sch_type);                     
+                     xml_schema_simple_type_t* sch_type);                     
                      
     axis2_qname_t* (AXIS2_CALL *
     get_schema_type_name)(void *attr,
@@ -151,14 +151,14 @@
                           const axis2_env_t *env,
                           axis2_qname_t *sch_type_name);
                           
-    axis2_xml_schema_use_t* (AXIS2_CALL *
+    xml_schema_use_t* (AXIS2_CALL *
     get_use)(void *attr,
              const axis2_env_t *env);
              
     axis2_status_t (AXIS2_CALL *
     set_use)(void *attr,
              const axis2_env_t *env,
-             axis2_xml_schema_use_t *use);
+             xml_schema_use_t *use);
              
     axis2_char_t* (AXIS2_CALL*
     to_string)(void *attr,
@@ -167,108 +167,108 @@
                int tab);                          
 };
 
-struct axis2_xml_schema_attribute
+struct xml_schema_attribute
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_attribute_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_attribute_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_attribute_t * AXIS2_CALL
-axis2_xml_schema_attribute_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_attribute_t * AXIS2_CALL
+xml_schema_attribute_create(const axis2_env_t *env);
 
 
 /******************************* Macros *************************************************/ 
  
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_FREE(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->free(attr, env))
+#define XML_SCHEMA_ATTRIBUTE_FREE(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->free(attr, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_BASE_IMPL(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->get_base_impl(attr, env))
+#define XML_SCHEMA_ATTRIBUTE_GET_BASE_IMPL(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->get_base_impl(attr, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_TYPE(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->get_type(attr, env))
+#define XML_SCHEMA_ATTRIBUTE_GET_TYPE(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->get_type(attr, env))
       
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_SUPER_OBJS(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->super_objs(attr, env))
+#define XML_SCHEMA_ATTRIBUTE_SUPER_OBJS(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->super_objs(attr, env))
       
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_ATTR_TYPE(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->get_namespace(attr, env))
+#define XML_SCHEMA_ATTRIBUTE_GET_ATTR_TYPE(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->get_namespace(attr, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_DEFAULT_VALUE(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GET_DEFAULT_VALUE(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           get_default_value(attr, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_SET_DEFAULT_VALUE(attr, env, default_val) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_SET_DEFAULT_VALUE(attr, env, default_val) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           set_default_value(attr, env, default_val))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_FIXED_VALUE(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GET_FIXED_VALUE(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           get_fixed_value(attr, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_SET_FIXED_VALUE(attr, env, default_val) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_SET_FIXED_VALUE(attr, env, default_val) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           set_fixed_value(attr, env, default_val))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_SCHEMA_FORM(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GET_SCHEMA_FORM(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           get_schema_form(attr, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_SET_SCHEMA_FORM(attr, env, form) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_SET_SCHEMA_FORM(attr, env, form) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           set_schema_form(attr, env, form))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_QNAME(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GET_QNAME(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           get_qname(attr, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_SET_QNAME(attr, env, qualified_name) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_SET_QNAME(attr, env, qualified_name) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           set_qname(attr, env, qualified_name))
           
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_NAME(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GET_NAME(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           get_name(attr, env))
           
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_SET_NAME(attr, env, name) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_SET_NAME(attr, env, name) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           set_name(attr, env, name))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_REF_NAME(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GET_REF_NAME(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           get_ref_name(attr, env))
           
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_SET_REF_NAME(attr, env, ref_name) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_SET_REF_NAME(attr, env, ref_name) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           set_ref_name(attr, env, ref_name))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_SCHEMA_TYPE(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GET_SCHEMA_TYPE(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           get_schema_type(attr, env))
           
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_SET_SCHEMA_TYPE(attr, env, sch_type) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_SET_SCHEMA_TYPE(attr, env, sch_type) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           set_schema_type(attr, env, sch_type))
           
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_SCHEMA_TYPE_NAME(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GET_SCHEMA_TYPE_NAME(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           get_schema_type_name(attr, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_SET_SCHEMA_TYPE_NAME(attr, env, sch_type_name) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_SET_SCHEMA_TYPE_NAME(attr, env, sch_type_name) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           set_schema_type_name(attr, env, sch_type_name))
           
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_USE(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GET_USE(attr, env) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           get_use(attr, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_SET_USE(attr, env, use) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_SET_USE(attr, env, use) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           set_schema_type_name(attr, env, use))   
           
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_TO_STRING(attr, env, prefix, tab) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_TO_STRING(attr, env, prefix, tab) \
+      (((xml_schema_attribute_t *) attr)->ops->\
           to_string(attr, env, prefix, tab))   
                  
 
@@ -277,4 +277,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_ATTRIBUTE_H */
+#endif /* XML_SCHEMA_ATTRIBUTE_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute_group.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute_group.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute_group.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute_group.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute_group.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_attribute_group.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_attribute_group.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_H
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_H
+#ifndef XML_SCHEMA_ATTRIBUTE_GROUP_H
+#define XML_SCHEMA_ATTRIBUTE_GROUP_H
 
 /**
- * @file axis2_xml_schema_any.h
+ * @file xml_schema_any.h
  * @brief Axis2 Xml Schema Any Interface
  *          Enables any element from the specified namespace or namespaces
  *          to appear in the containing complexType element. Represents the
@@ -26,36 +26,36 @@
  *
  */
 #include <axis2_qname.h>
-#include <axis2_xml_schema_particle.h>
-#include <axis2_xml_schema_obj_collection.h>
-#include <axis2_xml_schema_any_attribute.h>
-#include <axis2_xml_schema_content_processing.h>
-#include <axis2_xml_schema_simple_type.h>
+#include <xml_schema_particle.h>
+#include <xml_schema_obj_collection.h>
+#include <xml_schema_any_attribute.h>
+#include <xml_schema_content_processing.h>
+#include <xml_schema_simple_type.h>
 
 
-/** @defgroup axis2_xml_schema_any Xml Schema Any
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_any Xml Schema Any
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_attribute_group 
-                    axis2_xml_schema_attribute_group_t;
-typedef struct axis2_xml_schema_attribute_group_ops 
-                axis2_xml_schema_attribute_group_ops_t;
+typedef struct xml_schema_attribute_group 
+                    xml_schema_attribute_group_t;
+typedef struct xml_schema_attribute_group_ops 
+                xml_schema_attribute_group_ops_t;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_attribute_group_ops
+struct xml_schema_attribute_group_ops
 {
     axis2_status_t (AXIS2_CALL *
     free) (
             void *attr_grp,
             const axis2_env_t *env);
             
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(
             void *attr_grp,
             const axis2_env_t *env);
@@ -66,12 +66,12 @@
             const axis2_env_t *env);
                                       
 
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl)(
             void *attr_grp,
             const axis2_env_t *env);
     
-    axis2_xml_schema_any_attribute_t* (AXIS2_CALL *
+    xml_schema_any_attribute_t* (AXIS2_CALL *
     get_any_attribute)(
             void *attr_grp,
             const axis2_env_t *env);
@@ -80,16 +80,16 @@
     set_any_attribute)(
             void *attr_grp,
             const axis2_env_t *env,
-            axis2_xml_schema_any_attribute_t* any_attr);  
+            xml_schema_any_attribute_t* any_attr);  
     
-    axis2_xml_schema_obj_collection_t* (AXIS2_CALL *
+    xml_schema_obj_collection_t* (AXIS2_CALL *
     get_attributes)(void *attr_grp,
                     const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
     set_attributes)(void *attr_grp,
                      const axis2_env_t *env,
-                     axis2_xml_schema_obj_collection_t* attributes);
+                     xml_schema_obj_collection_t* attributes);
 
     axis2_char_t* (AXIS2_CALL *
     get_name)(void *attr_grp,
@@ -102,52 +102,52 @@
               
 };
 
-struct axis2_xml_schema_attribute_group
+struct xml_schema_attribute_group
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_attribute_group_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_attribute_group_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_attribute_group_t * AXIS2_CALL
-axis2_xml_schema_attribute_group_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_attribute_group_t * AXIS2_CALL
+xml_schema_attribute_group_create(const axis2_env_t *env);
 
 /******************************* Macros *************************************************/ 
  
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_FREE(attr_grp, env) \
-      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->free(attr_grp, env))
+#define XML_SCHEMA_ATTRIBUTE_GROUP_FREE(attr_grp, env) \
+      (((xml_schema_attribute_group_t *) attr_grp)->ops->free(attr_grp, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_GET_BASE_IMPL(attr_grp, env) \
-      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->get_base_impl(attr_grp, env))
+#define XML_SCHEMA_ATTRIBUTE_GROUP_GET_BASE_IMPL(attr_grp, env) \
+      (((xml_schema_attribute_group_t *) attr_grp)->ops->get_base_impl(attr_grp, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_GET_TYPE(attr_grp, env) \
-      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->get_type(attr_grp, env))
+#define XML_SCHEMA_ATTRIBUTE_GROUP_GET_TYPE(attr_grp, env) \
+      (((xml_schema_attribute_group_t *) attr_grp)->ops->get_type(attr_grp, env))
       
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_SUPER_OBJS(attr_grp, env) \
-      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->super_objs(attr_grp, env))
+#define XML_SCHEMA_ATTRIBUTE_GROUP_SUPER_OBJS(attr_grp, env) \
+      (((xml_schema_attribute_group_t *) attr_grp)->ops->super_objs(attr_grp, env))
       
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_GET_ANY_ATTRIBUTE(attr_grp, env) \
-      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GROUP_GET_ANY_ATTRIBUTE(attr_grp, env) \
+      (((xml_schema_attribute_group_t *) attr_grp)->ops->\
           get_any_attribute(attr_grp, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_SET_ANY_ATTRIBUTE(attr_grp, env, any_attr) \
-      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GROUP_SET_ANY_ATTRIBUTE(attr_grp, env, any_attr) \
+      (((xml_schema_attribute_group_t *) attr_grp)->ops->\
           set_any_attribute(attr_grp, env, any_attr))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_SET_ATTRIBUTES(attr_grp, env, attrs) \
-      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GROUP_SET_ATTRIBUTES(attr_grp, env, attrs) \
+      (((xml_schema_attribute_group_t *) attr_grp)->ops->\
           set_attributes(attr_grp, env, attrs))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_GET_ATTRIBUTES(attr_grp, env) \
-      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GROUP_GET_ATTRIBUTES(attr_grp, env) \
+      (((xml_schema_attribute_group_t *) attr_grp)->ops->\
           get_attributes(attr_grp, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_GET_NAME(attr_grp, env) \
-      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GROUP_GET_NAME(attr_grp, env) \
+      (((xml_schema_attribute_group_t *) attr_grp)->ops->\
           get_name(attr_grp, env))
           
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_SET_NAME(attr_grp, env, name) \
-      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->\
+#define XML_SCHEMA_ATTRIBUTE_GROUP_SET_NAME(attr_grp, env, name) \
+      (((xml_schema_attribute_group_t *) attr_grp)->ops->\
           set_name(attr_grp, env, name))
 
 /******************************* end macros ***********************************************/
@@ -155,4 +155,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_H */
+#endif /* XML_SCHEMA_ATTRIBUTE_GROUP_H */



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message