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 [4/18] - in /webservices/axis2/trunk/c/xml_schema: include/ samples/ src/ test/
Date Mon, 12 Jun 2006 10:29:46 GMT
Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_import.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_import.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_import.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_import.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_import.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_import.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_import.h Mon Jun 12 03:29:40 2006
@@ -14,42 +14,42 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_IMPORT_H
-#define AXIS2_XML_SCHEMA_IMPORT_H
+#ifndef XML_SCHEMA_IMPORT_H
+#define XML_SCHEMA_IMPORT_H
 
 /**
- * @file axis2_xml_schema_import.h
+ * @file xml_schema_import.h
  * @brief Axis2 Xml Schema Particle Interface
  *          Base class for all import types.
  */
 
-#include <axis2_xml_schema_external.h>
+#include <xml_schema_external.h>
 #include <axis2_hash.h>
 
-/** @defgroup axis2_xml_schema_include Xml Schema Particle
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_include Xml Schema Particle
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_import 
-                    axis2_xml_schema_import_t;
-typedef struct axis2_xml_schema_import_ops 
-                    axis2_xml_schema_import_ops_t;
+typedef struct xml_schema_import 
+                    xml_schema_import_t;
+typedef struct xml_schema_import_ops 
+                    xml_schema_import_ops_t;
                     
-struct axis2_xml_schema;                    
+struct xml_schema;                    
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_import_ops
+struct xml_schema_import_ops
 {
     axis2_status_t (AXIS2_CALL *
     free) (void *import,
             const axis2_env_t *env);
 
-    axis2_xml_schema_external_t* (AXIS2_CALL *
+    xml_schema_external_t* (AXIS2_CALL *
     get_base_impl)(void *import,
                    const axis2_env_t *env);
 
@@ -58,7 +58,7 @@
     super_objs)(void *import,
                 const axis2_env_t *env);
                 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(void *import,
                 const axis2_env_t *env);                
     
@@ -75,45 +75,45 @@
 
 };
 
-struct axis2_xml_schema_import
+struct xml_schema_import
 {
-    axis2_xml_schema_external_t base;
-    axis2_xml_schema_import_ops_t *ops;
+    xml_schema_external_t base;
+    xml_schema_import_ops_t *ops;
 };
 
 /**
  * Creates new Xml Schema import
  */
-AXIS2_EXTERN axis2_xml_schema_import_t * AXIS2_CALL
-axis2_xml_schema_import_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_import_t * AXIS2_CALL
+xml_schema_import_create(const axis2_env_t *env);
 
 
-#define AXIS2_XML_SCHEMA_IMPORT_FREE(import, env) \
-      (((axis2_xml_schema_import_t *) import)->ops->\
+#define XML_SCHEMA_IMPORT_FREE(import, env) \
+      (((xml_schema_import_t *) import)->ops->\
             free(import, env))
 
-#define AXIS2_XML_SCHEMA_IMPORT_GET_BASE_IMPL(import, env) \
-      (((axis2_xml_schema_import_t *) import)->ops->\
+#define XML_SCHEMA_IMPORT_GET_BASE_IMPL(import, env) \
+      (((xml_schema_import_t *) import)->ops->\
             get_base_impl(import, env))
             
-#define AXIS2_XML_SCHEMA_IMPORT_GET_TYPE(import, env) \
-      (((axis2_xml_schema_import_t *) import)->ops->\
+#define XML_SCHEMA_IMPORT_GET_TYPE(import, env) \
+      (((xml_schema_import_t *) import)->ops->\
             get_type(import, env))
             
-#define AXIS2_XML_SCHEMA_IMPORT_SUPER_OBJS(import, env) \
-      (((axis2_xml_schema_import_t *) import)->ops->\
+#define XML_SCHEMA_IMPORT_SUPER_OBJS(import, env) \
+      (((xml_schema_import_t *) import)->ops->\
             super_objs(import, env))                        
 
-#define AXIS2_XML_SCHEMA_IMPORT_GET_NAMESPACE(import, env) \
-      (((axis2_xml_schema_import_t *) import)->ops->\
+#define XML_SCHEMA_IMPORT_GET_NAMESPACE(import, env) \
+      (((xml_schema_import_t *) import)->ops->\
             get_namespace(import, env))
 
-#define AXIS2_XML_SCHEMA_IMPORT_SET_NAMESPACE(import, env, ns) \
-      (((axis2_xml_schema_import_t *) import)->ops->\
+#define XML_SCHEMA_IMPORT_SET_NAMESPACE(import, env, ns) \
+      (((xml_schema_import_t *) import)->ops->\
             set_namespace(import, env, ns))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_IMPORT_H */
+#endif /* XML_SCHEMA_IMPORT_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_includes.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_includes.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_includes.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_includes.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_includes.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_includes.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_includes.h Mon Jun 12 03:29:40 2006
@@ -14,64 +14,64 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_INCLUDES_H
-#define AXIS2_XML_SCHEMA_INCLUDES_H
+#ifndef XML_SCHEMA_INCLUDES_H
+#define XML_SCHEMA_INCLUDES_H
 
 /**
  * @file all schema header files 
  */
 
-#include "axis2_xml_schema_obj_table.h"
-#include "axis2_xml_schema_simple_type_content.h"
-#include "axis2_xml_schema_obj_collection.h"
-#include "axis2_xml_schema_simple_type_list.h"
-#include "axis2_xml_schema_group_base.h"
-#include "axis2_xml_schema_any.h"
-#include "axis2_xml_schema_external.h"
-#include "axis2_xml_schema_element.h"
-#include "axis2_xml_schema_simple_content.h"
-#include "axis2_xml_schema_app_info.h"
-#include "axis2_xml_schema_collection.h"
-#include "axis2_xml_schema_group.h"
-#include "axis2_xml_schema_complex_content_extension.h"
-#include "axis2_xml_schema_xpath.h"
-#include "axis2_xml_schema_identity_constraint.h"
-#include "axis2_xml_schema_complex_content.h"
-#include "axis2_xml_schema_attribute.h"
-#include "axis2_xml_schema_complex_content_restriction.h"
-#include "axis2_xml_schema_derivation_method.h"
-#include "axis2_xml_schema_complex_type.h"
-#include "axis2_xml_schema_any_attribute.h"
-#include "axis2_xml_schema_content_type.h"
-#include "axis2_xml_schema_annotated.h"
-#include "axis2_xml_schema_builder.h"
-#include "axis2_xml_tokenized_type.h"
-#include "axis2_xml_schema_attribute_group.h"
-#include "axis2_xml_schema_simple_content_extension.h"
-#include "axis2_xml_schema_group_ref.h"
-#include "axis2_xml_schema_simple_type.h"
-#include "axis2_xml_severity_type.h"
-#include "axis2_xml_schema_use.h"
-#include "axis2_xml_schema_facet.h"
-#include "axis2_xml_schema_simple_type_union.h"
-#include "axis2_xml_schema_form.h"
-#include "axis2_xml_schema_particle.h"
-#include "axis2_xml_schema_enum.h"
-#include "axis2_xml_schema_content_processing.h"
-#include "axis2_xml_schema_simple_content_restriction.h"
-#include "axis2_xml_schema_documentation.h"
-#include "axis2_xml_schema_data_type.h"
-#include "axis2_xml_schema_annotation.h"
-#include "axis2_xml_schema_import.h"
-#include "axis2_xml_schema_obj.h"
-#include "axis2_xml_schema_attribute_group_ref.h"
-#include "axis2_xml_schema_constants.h"
-#include "axis2_xml_schema_defines.h"
-#include "axis2_xml_schema_simple_type_restriction.h"
-#include "axis2_xml_schema.h"
-#include "axis2_xml_schema_redefine.h"
-#include "axis2_xml_schema_type.h"
-#include "axis2_xml_schema_url_resolver.h"
+#include "xml_schema_obj_table.h"
+#include "xml_schema_simple_type_content.h"
+#include "xml_schema_obj_collection.h"
+#include "xml_schema_simple_type_list.h"
+#include "xml_schema_group_base.h"
+#include "xml_schema_any.h"
+#include "xml_schema_external.h"
+#include "xml_schema_element.h"
+#include "xml_schema_simple_content.h"
+#include "xml_schema_app_info.h"
+#include "xml_schema_collection.h"
+#include "xml_schema_group.h"
+#include "xml_schema_complex_content_extension.h"
+#include "xml_schema_xpath.h"
+#include "xml_schema_identity_constraint.h"
+#include "xml_schema_complex_content.h"
+#include "xml_schema_attribute.h"
+#include "xml_schema_complex_content_restriction.h"
+#include "xml_schema_derivation_method.h"
+#include "xml_schema_complex_type.h"
+#include "xml_schema_any_attribute.h"
+#include "xml_schema_content_type.h"
+#include "xml_schema_annotated.h"
+#include "xml_schema_builder.h"
+#include "xml_schema_tokenized_type.h"
+#include "xml_schema_attribute_group.h"
+#include "xml_schema_simple_content_extension.h"
+#include "xml_schema_group_ref.h"
+#include "xml_schema_simple_type.h"
+#include "xml_schema_severity_type.h"
+#include "xml_schema_use.h"
+#include "xml_schema_facet.h"
+#include "xml_schema_simple_type_union.h"
+#include "xml_schema_form.h"
+#include "xml_schema_particle.h"
+#include "xml_schema_enum.h"
+#include "xml_schema_content_processing.h"
+#include "xml_schema_simple_content_restriction.h"
+#include "xml_schema_documentation.h"
+#include "xml_schema_data_type.h"
+#include "xml_schema_annotation.h"
+#include "xml_schema_import.h"
+#include "xml_schema_obj.h"
+#include "xml_schema_attribute_group_ref.h"
+#include "xml_schema_constants.h"
+#include "xml_schema_defines.h"
+#include "xml_schema_simple_type_restriction.h"
+#include "xml_schema.h"
+#include "xml_schema_redefine.h"
+#include "xml_schema_type.h"
+#include "xml_schema_url_resolver.h"
 #include "xml_schema_input_source.h"
 
 #ifdef _cplusplus
@@ -84,4 +84,4 @@
 #ifdef _cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_INCLUDES_H */
+#endif /* XML_SCHEMA_INCLUDES_H */

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema_input_source.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_input_source.h?rev=413626&r1=413625&r2=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema_input_source.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_input_source.h Mon Jun 12 03:29:40 2006
@@ -18,11 +18,11 @@
 #define XML_SCHEMA_INPUT_SOURCE_H
  
 /**
- * @file axis2_xml_schema_input_source.h
+ * @file xml_schema_input_source.h
  */ 
 
-/** @defgroup axis2_xml_schema
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema
+  * @ingroup xml_schema
   * @{
   */ 
 

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_OBJ_H
-#define AXIS2_XML_SCHEMA_OBJ_H
+#ifndef XML_SCHEMA_OBJ_H
+#define XML_SCHEMA_OBJ_H
 
 /**
- * @file axis2_xml_schema_obj.h
+ * @file xml_schema_obj.h
  * @brief Axis2 Xml Schema Obj  interface
  */
 
@@ -29,22 +29,22 @@
 #include <axis2_utils_defines.h>
 #include <axis2_array_list.h>
 #include <axis2_hash.h>
-#include <axis2_xml_schema_defines.h>
+#include <xml_schema_defines.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-typedef struct axis2_xml_schema_obj axis2_xml_schema_obj_t;
-typedef struct axis2_xml_schema_obj_ops axis2_xml_schema_obj_ops_t;
+typedef struct xml_schema_obj xml_schema_obj_t;
+typedef struct xml_schema_obj_ops xml_schema_obj_ops_t;
 
-/** @defgroup axis2_xml_schema_obj Xml Schema Obj
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_obj Xml Schema Obj
+  * @ingroup xml_schema
   * @{
   */
 
-struct axis2_xml_schema_obj_ops
+struct xml_schema_obj_ops
 {
     axis2_status_t (AXIS2_CALL *
     free) (
@@ -56,7 +56,7 @@
             void *obj,
             const axis2_env_t *env);
     
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (
             void *obj,
             const axis2_env_t *env);
@@ -95,56 +95,56 @@
 
 };
 
-struct axis2_xml_schema_obj
+struct xml_schema_obj
 {
-    axis2_xml_schema_obj_ops_t *ops;
+    xml_schema_obj_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_obj_t * AXIS2_CALL
-axis2_xml_schema_obj_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_obj_t * AXIS2_CALL
+xml_schema_obj_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_obj_resolve_methods(axis2_xml_schema_obj_t *schema_obj,
+xml_schema_obj_resolve_methods(xml_schema_obj_t *schema_obj,
                                         const axis2_env_t *env,
-                                        axis2_xml_schema_obj_t *schema_obj_impl,
+                                        xml_schema_obj_t *schema_obj_impl,
                                         axis2_hash_t *methods);
 
-#define AXIS2_XML_SCHEMA_OBJ_FREE(obj, env) \
-      (((axis2_xml_schema_obj_t *) obj)->ops->free (obj, env))
+#define XML_SCHEMA_OBJ_FREE(obj, env) \
+      (((xml_schema_obj_t *) obj)->ops->free (obj, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_SUPER_OBJS(obj, env) \
-      (((axis2_xml_schema_obj_t *) obj)->ops->super_objs (obj, env))
+#define XML_SCHEMA_OBJ_SUPER_OBJS(obj, env) \
+      (((xml_schema_obj_t *) obj)->ops->super_objs (obj, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_GET_TYPE(obj, env) \
-      (((axis2_xml_schema_obj_t *) obj)->ops->get_type (obj, env))
+#define XML_SCHEMA_OBJ_GET_TYPE(obj, env) \
+      (((xml_schema_obj_t *) obj)->ops->get_type (obj, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_GET_LINE_NUM(obj, env) \
-      (((axis2_xml_schema_obj_t *) obj)->ops->get_line_num (obj, env))
+#define XML_SCHEMA_OBJ_GET_LINE_NUM(obj, env) \
+      (((xml_schema_obj_t *) obj)->ops->get_line_num (obj, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_SET_LINE_NUM(obj, env, line_num) \
-      (((axis2_xml_schema_obj_t *) obj)->ops->set_line_num (obj, env, line_num))
+#define XML_SCHEMA_OBJ_SET_LINE_NUM(obj, env, line_num) \
+      (((xml_schema_obj_t *) obj)->ops->set_line_num (obj, env, line_num))
 
-#define AXIS2_XML_SCHEMA_OBJ_GET_LINE_POS(obj, env) \
-      (((axis2_xml_schema_obj_t *) obj)->ops->get_line_pos (obj, env))
+#define XML_SCHEMA_OBJ_GET_LINE_POS(obj, env) \
+      (((xml_schema_obj_t *) obj)->ops->get_line_pos (obj, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_SET_LINE_POS(obj, env, line_pos) \
-      (((axis2_xml_schema_obj_t *) obj)->ops->set_line_pos (obj, env, line_pos))
+#define XML_SCHEMA_OBJ_SET_LINE_POS(obj, env, line_pos) \
+      (((xml_schema_obj_t *) obj)->ops->set_line_pos (obj, env, line_pos))
 
-#define AXIS2_XML_SCHEMA_OBJ_GET_SOURCE_URI(obj, env) \
-      (((axis2_xml_schema_obj_t *) obj)->ops->get_source_uri (obj, env))
+#define XML_SCHEMA_OBJ_GET_SOURCE_URI(obj, env) \
+      (((xml_schema_obj_t *) obj)->ops->get_source_uri (obj, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_SET_SOURCE_URI(obj, env, source_uri) \
-      (((axis2_xml_schema_obj_t *) obj)->ops->set_source_uri (obj, env, \
+#define XML_SCHEMA_OBJ_SET_SOURCE_URI(obj, env, source_uri) \
+      (((xml_schema_obj_t *) obj)->ops->set_source_uri (obj, env, \
                                                                 source_uri))
 
-#define AXIS2_XML_SCHEMA_OBJ_EQUALS(obj, env) \
-      (((axis2_xml_schema_obj_t *) obj)->ops->equals (obj, env))
+#define XML_SCHEMA_OBJ_EQUALS(obj, env) \
+      (((xml_schema_obj_t *) obj)->ops->equals (obj, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_OBJ_H */
+#endif /* XML_SCHEMA_OBJ_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_collection.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj_collection.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_collection.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_collection.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj_collection.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj_collection.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_collection.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_OBJ_COLLECTION_H
-#define AXIS2_XML_SCHEMA_OBJ_COLLECTION_H
+#ifndef XML_SCHEMA_OBJ_COLLECTION_H
+#define XML_SCHEMA_OBJ_COLLECTION_H
 
 /**
- * @file axis2_xml_schema_obj_collection.h
+ * @file xml_schema_obj_collection.h
  * @brief Axis2 Xml Schema Obj Collection  interface
  *          An object collection class to handle xml_schema_objs when 
  *          collections are returned from method calls.
@@ -30,112 +30,112 @@
 #include <axis2_string.h>
 #include <axis2_array_list.h>
 #include <axis2_hash.h>
-#include <axis2_xml_schema_obj.h>
+#include <xml_schema_obj.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-typedef struct axis2_xml_schema_obj_collection 
-                    axis2_xml_schema_obj_collection_t;
-typedef struct axis2_xml_schema_obj_collection_ops 
-                    axis2_xml_schema_obj_collection_ops_t;
+typedef struct xml_schema_obj_collection 
+                    xml_schema_obj_collection_t;
+typedef struct xml_schema_obj_collection_ops 
+                    xml_schema_obj_collection_ops_t;
 
-/** @defgroup axis2_xml_schema_obj_collection Xml Schema Obj Collection
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_obj_collection Xml Schema Obj Collection
+  * @ingroup xml_schema
   * @{
   */
 
-struct axis2_xml_schema_obj_collection_ops
+struct xml_schema_obj_collection_ops
 {
    /** 
      * Deallocate memory
      * @return status code
      */
     axis2_status_t (AXIS2_CALL *
-    free) (axis2_xml_schema_obj_collection_t *obj_collection,
+    free) (xml_schema_obj_collection_t *obj_collection,
             const axis2_env_t *env);
 
     int (AXIS2_CALL *
-    get_count) (axis2_xml_schema_obj_collection_t *obj_collection,
+    get_count) (xml_schema_obj_collection_t *obj_collection,
                     const axis2_env_t *env);
 
-    axis2_xml_schema_obj_t *(AXIS2_CALL *
-    get_item) (axis2_xml_schema_obj_collection_t *obj_collection,
+    xml_schema_obj_t *(AXIS2_CALL *
+    get_item) (xml_schema_obj_collection_t *obj_collection,
                     const axis2_env_t *env,
                     int i);
 
     axis2_status_t (AXIS2_CALL *
-    set_item) (axis2_xml_schema_obj_collection_t *obj_collection,
+    set_item) (xml_schema_obj_collection_t *obj_collection,
                 const axis2_env_t *env,
                 int i,
                 void *item);
 
     axis2_status_t (AXIS2_CALL *
-    add) (axis2_xml_schema_obj_collection_t *obj_collection,
+    add) (xml_schema_obj_collection_t *obj_collection,
           const axis2_env_t *env,
           void *item);
 
     axis2_bool_t (AXIS2_CALL *
-    contains)(axis2_xml_schema_obj_collection_t *obj_collection,
+    contains)(xml_schema_obj_collection_t *obj_collection,
               const axis2_env_t *env,
               void *item);
 
     axis2_status_t (AXIS2_CALL *
-    index_of) (axis2_xml_schema_obj_collection_t *obj_collection,
+    index_of) (xml_schema_obj_collection_t *obj_collection,
                const axis2_env_t *env,
                void *item);
 
     void* (AXIS2_CALL *
-    remove_at)(axis2_xml_schema_obj_collection_t *obj_collection,
+    remove_at)(xml_schema_obj_collection_t *obj_collection,
                const axis2_env_t *env,
                int i);
                 
     axis2_array_list_t* (AXIS2_CALL *
-    to_array)(axis2_xml_schema_obj_collection_t *obj_collection,
+    to_array)(xml_schema_obj_collection_t *obj_collection,
               const axis2_env_t *env);                
 
 };
 
-struct axis2_xml_schema_obj_collection
+struct xml_schema_obj_collection
 {
-    axis2_xml_schema_obj_collection_ops_t *ops;
+    xml_schema_obj_collection_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_obj_collection_t * AXIS2_CALL
-axis2_xml_schema_obj_collection_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_obj_collection_t * AXIS2_CALL
+xml_schema_obj_collection_create(const axis2_env_t *env);
 
 /******************* MACROS ***************************************************/
-#define AXIS2_XML_SCHEMA_OBJ_COLLECTION_FREE(obj_collection, env) \
+#define XML_SCHEMA_OBJ_COLLECTION_FREE(obj_collection, env) \
       ((obj_collection)->ops->free (obj_collection, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_COLLECTION_GET_COUNT(obj_collection, env) \
+#define XML_SCHEMA_OBJ_COLLECTION_GET_COUNT(obj_collection, env) \
       ((obj_collection)->ops->get_count (obj_collection, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_COLLECTION_GET_ITEM(obj_collection, env, i) \
+#define XML_SCHEMA_OBJ_COLLECTION_GET_ITEM(obj_collection, env, i) \
       ((obj_collection)->ops->get_item (obj_collection, env, i))
 
-#define AXIS2_XML_SCHEMA_OBJ_COLLECTION_SET_ITEM(obj_collection, env, i, item) \
+#define XML_SCHEMA_OBJ_COLLECTION_SET_ITEM(obj_collection, env, i, item) \
       ((obj_collection)->ops->set_item (obj_collection, env, i, item))
 
-#define AXIS2_XML_SCHEMA_OBJ_COLLECTION_ADD(obj_collection, env, item) \
+#define XML_SCHEMA_OBJ_COLLECTION_ADD(obj_collection, env, item) \
       ((obj_collection)->ops->add (obj_collection, env, item))
 
-#define AXIS2_XML_SCHEMA_OBJ_COLLECTION_CONTAINS(obj_collection, env, item) \
+#define XML_SCHEMA_OBJ_COLLECTION_CONTAINS(obj_collection, env, item) \
       ((obj_collection)->ops->contains (obj_collection, env, item))
 
-#define AXIS2_XML_SCHEMA_OBJ_COLLECTION_INDEX_OF(obj_collection, env, item) \
+#define XML_SCHEMA_OBJ_COLLECTION_INDEX_OF(obj_collection, env, item) \
       ((obj_collection)->ops->index_of (obj_collection, env, item))
 
-#define AXIS2_XML_SCHEMA_OBJ_COLLECTION_REMOVE_AT(obj_collection, env, i) \
+#define XML_SCHEMA_OBJ_COLLECTION_REMOVE_AT(obj_collection, env, i) \
       ((obj_collection)->ops->remove_at (obj_collection, env, i))
 
-#define AXIS2_XML_SCHEMA_OBJ_COLLECTION_TO_ARRAY(obj_collection, env) \
+#define XML_SCHEMA_OBJ_COLLECTION_TO_ARRAY(obj_collection, env) \
         ((obj_collection)->ops->to_array(obj_collection, env))
         
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_OBJ_COLLECTION_H */
+#endif /* XML_SCHEMA_OBJ_COLLECTION_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj_table.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj_table.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_obj_table.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_OBJ_TABLE_H
-#define AXIS2_XML_SCHEMA_OBJ_TABLE_H
+#ifndef XML_SCHEMA_OBJ_TABLE_H
+#define XML_SCHEMA_OBJ_TABLE_H
 
 /**
- * @file axis2_xml_schema_obj_table.h
+ * @file xml_schema_obj_table.h
  * @brief Axis2 Xml Schema Obj Table  interface
  *          A table class that provides read-only helpers for Xml Schema 
  *          Object objects. This class is used to provide the tables for 
@@ -35,24 +35,24 @@
 #include <axis2_array_list.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_xml_schema_obj.h>
+#include <xml_schema_obj.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-typedef struct axis2_xml_schema_obj_table 
-                    axis2_xml_schema_obj_table_t;
-typedef struct axis2_xml_schema_obj_table_ops 
-                    axis2_xml_schema_obj_table_ops_t;
+typedef struct xml_schema_obj_table 
+                    xml_schema_obj_table_t;
+typedef struct xml_schema_obj_table_ops 
+                    xml_schema_obj_table_ops_t;
 
-/** @defgroup axis2_xml_schema_obj_table Xml Schema Obj Table
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_obj_table Xml Schema Obj Table
+  * @ingroup xml_schema
   * @{
   */
 
-struct axis2_xml_schema_obj_table_ops
+struct xml_schema_obj_table_ops
 {
    /** 
      * Deallocate memory
@@ -60,104 +60,104 @@
      */
     axis2_status_t (AXIS2_CALL *
     free)(
-            axis2_xml_schema_obj_table_t *obj_table,
+            xml_schema_obj_table_t *obj_table,
             const axis2_env_t *env);
 
     int (AXIS2_CALL *
     get_count)(
-            axis2_xml_schema_obj_table_t *obj_table,
+            xml_schema_obj_table_t *obj_table,
             const axis2_env_t *env);
 
     void *(AXIS2_CALL *
     get_item)(
-            axis2_xml_schema_obj_table_t *obj_table,
+            xml_schema_obj_table_t *obj_table,
             const axis2_env_t *env,
             axis2_qname_t *qname);
 
     axis2_array_list_t *(AXIS2_CALL *
     get_names)(
-            axis2_xml_schema_obj_table_t *obj_table,
+            xml_schema_obj_table_t *obj_table,
             const axis2_env_t *env);
 
     axis2_array_list_t *(AXIS2_CALL *
     get_values)(
-            axis2_xml_schema_obj_table_t *obj_table,
+            xml_schema_obj_table_t *obj_table,
             const axis2_env_t *env);
 
     axis2_bool_t (AXIS2_CALL *
     contains)(
-            axis2_xml_schema_obj_table_t *obj_table,
+            xml_schema_obj_table_t *obj_table,
             const axis2_env_t *env,
             axis2_qname_t *qname);
 
     axis2_status_t (AXIS2_CALL *
     add) (
-            axis2_xml_schema_obj_table_t *obj_table,
+            xml_schema_obj_table_t *obj_table,
             const axis2_env_t *env,
             axis2_qname_t *qname,
             void *value);
           
     axis2_status_t (AXIS2_CALL *
     put)(
-            axis2_xml_schema_obj_table_t *obj_table,
+            xml_schema_obj_table_t *obj_table,
             const axis2_env_t *env,
             axis2_char_t *key,
             void *value);
          
     axis2_hash_t* (AXIS2_CALL *
     get_hash_table)(
-            axis2_xml_schema_obj_table_t *obj_table,
+            xml_schema_obj_table_t *obj_table,
             const axis2_env_t *env);
             
     void* (AXIS2_CALL*
-    get)(   axis2_xml_schema_obj_table_t *obj_table,
+    get)(   xml_schema_obj_table_t *obj_table,
             const axis2_env_t *env,
             axis2_char_t *key);            
             
                                            
 };
 
-struct axis2_xml_schema_obj_table
+struct xml_schema_obj_table
 {
-    axis2_xml_schema_obj_table_ops_t *ops;
+    xml_schema_obj_table_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_obj_table_t * AXIS2_CALL
-axis2_xml_schema_obj_table_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_obj_table_t * AXIS2_CALL
+xml_schema_obj_table_create(const axis2_env_t *env);
 
 /********************* macros ************************************************/
-#define AXIS2_XML_SCHEMA_OBJ_TABLE_FREE(obj_table, env) \
+#define XML_SCHEMA_OBJ_TABLE_FREE(obj_table, env) \
       ((obj_table)->ops->free (obj_table, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_TABLE_GET_COUNT(obj_table, env) \
+#define XML_SCHEMA_OBJ_TABLE_GET_COUNT(obj_table, env) \
       ((obj_table)->ops->get_count (obj_table, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_TABLE_GET_ITEM(obj_table, env, qname) \
+#define XML_SCHEMA_OBJ_TABLE_GET_ITEM(obj_table, env, qname) \
       ((obj_table)->ops->get_item (obj_table, env, qname))
 
-#define AXIS2_XML_SCHEMA_OBJ_TABLE_GET_NAMES(obj_table, env) \
+#define XML_SCHEMA_OBJ_TABLE_GET_NAMES(obj_table, env) \
       ((obj_table)->ops->get_names (obj_table, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_TABLE_GET_VALUES(obj_table, env) \
+#define XML_SCHEMA_OBJ_TABLE_GET_VALUES(obj_table, env) \
       ((obj_table)->ops->get_values (obj_table, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_TABLE_CONTAINS(obj_table, env, qname) \
+#define XML_SCHEMA_OBJ_TABLE_CONTAINS(obj_table, env, qname) \
       ((obj_table)->ops->contains (obj_table, env, qname))
 
-#define AXIS2_XML_SCHEMA_OBJ_TABLE_ADD(obj_table, env, qname, value) \
+#define XML_SCHEMA_OBJ_TABLE_ADD(obj_table, env, qname, value) \
       ((obj_table)->ops->add (obj_table, env, qname, value))
       
-#define AXIS2_XML_SCHEMA_OBJ_TABLE_PUT(obj_table, env, key, value) \
+#define XML_SCHEMA_OBJ_TABLE_PUT(obj_table, env, key, value) \
       ((obj_table)->ops->put(obj_table, env, key, value))
       
-#define AXIS2_XML_SCHEMA_OBJ_TABLE_GET(obj_table, env, key) \
+#define XML_SCHEMA_OBJ_TABLE_GET(obj_table, env, key) \
       ((obj_table)->ops->get(obj_table, env, key))
       
-#define AXIS2_XML_SCHEMA_OBJ_TABLE_GET_HASH_TABLE(obj_table, env) \
+#define XML_SCHEMA_OBJ_TABLE_GET_HASH_TABLE(obj_table, env) \
       ((obj_table)->ops->get_hash_table(obj_table, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_OBJ_TABLE_H */
+#endif /* XML_SCHEMA_OBJ_TABLE_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_particle.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_particle.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_particle.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_particle.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_particle.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_particle.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_particle.h Mon Jun 12 03:29:40 2006
@@ -14,35 +14,35 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_PARTICLE_H
-#define AXIS2_XML_SCHEMA_PARTICLE_H
+#ifndef XML_SCHEMA_PARTICLE_H
+#define XML_SCHEMA_PARTICLE_H
 
 /**
- * @file axis2_xml_schema_particle.h
+ * @file xml_schema_particle.h
  * @brief Axis2 Xml Schema Particle Interface
  *          Base class for all particle types.
  */
 
-#include <axis2_xml_schema_defines.h>
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema_defines.h>
+#include <xml_schema_annotated.h>
 #include <axis2_hash.h>
 
-/** @defgroup axis2_xml_schema_particle Xml Schema Particle
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_particle Xml Schema Particle
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_particle 
-                    axis2_xml_schema_particle_t;
-typedef struct axis2_xml_schema_particle_ops 
-                    axis2_xml_schema_particle_ops_t;
+typedef struct xml_schema_particle 
+                    xml_schema_particle_t;
+typedef struct xml_schema_particle_ops 
+                    xml_schema_particle_ops_t;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_particle_ops
+struct xml_schema_particle_ops
 {
    /** 
      * Deallocate memory
@@ -58,12 +58,12 @@
             void *particle,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (
             void *particle,
             const axis2_env_t *env);
 
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl) (void *particle,
                     const axis2_env_t *env);
 
@@ -86,10 +86,10 @@
                     long min_occurs);
 };
 
-struct axis2_xml_schema_particle
+struct xml_schema_particle
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_particle_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_particle_ops_t *ops;
 };
 
 /**
@@ -100,53 +100,53 @@
  * a reference to a named content model group (group), or an element wildcard 
  * (any).
  */
-AXIS2_EXTERN axis2_xml_schema_particle_t * AXIS2_CALL
-axis2_xml_schema_particle_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_particle_t * AXIS2_CALL
+xml_schema_particle_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_particle_resolve_methods(
-                                axis2_xml_schema_particle_t *particle,
+xml_schema_particle_resolve_methods(
+                                xml_schema_particle_t *particle,
                                 const axis2_env_t *env,
-                                axis2_xml_schema_particle_t *particle_impl,
+                                xml_schema_particle_t *particle_impl,
                                 axis2_hash_t *methods);
 
-#define AXIS2_XML_SCHEMA_PARTICLE_FREE(particle, env) \
-      (((axis2_xml_schema_particle_t *) particle)->ops->\
+#define XML_SCHEMA_PARTICLE_FREE(particle, env) \
+      (((xml_schema_particle_t *) particle)->ops->\
             free(particle, env))
 
-#define AXIS2_XML_SCHEMA_PARTICLE_SUPER_OBJS(particle, env) \
-      (((axis2_xml_schema_particle_t *) particle)->ops->\
+#define XML_SCHEMA_PARTICLE_SUPER_OBJS(particle, env) \
+      (((xml_schema_particle_t *) particle)->ops->\
             super_objs(particle, env))
 
-#define AXIS2_XML_SCHEMA_PARTICLE_GET_TYPE(particle, env) \
-      (((axis2_xml_schema_particle_t *) particle)->ops->\
+#define XML_SCHEMA_PARTICLE_GET_TYPE(particle, env) \
+      (((xml_schema_particle_t *) particle)->ops->\
             get_type(particle, env))
 
-#define AXIS2_XML_SCHEMA_PARTICLE_GET_BASE_IMPL(particle, env) \
-      (((axis2_xml_schema_particle_t *) particle)->ops->\
+#define XML_SCHEMA_PARTICLE_GET_BASE_IMPL(particle, env) \
+      (((xml_schema_particle_t *) particle)->ops->\
             get_base_impl(particle, env))
 
-#define AXIS2_XML_SCHEMA_PARTICLE_GET_MAX_OCCURS(particle, env) \
-      (((axis2_xml_schema_particle_t *) particle)->ops->\
+#define XML_SCHEMA_PARTICLE_GET_MAX_OCCURS(particle, env) \
+      (((xml_schema_particle_t *) particle)->ops->\
             get_max_occurs(particle, env))
 
-#define AXIS2_XML_SCHEMA_PARTICLE_SET_MAX_OCCURS(particle, env, max_occurs) \
-      (((axis2_xml_schema_particle_t *) particle)->ops->\
+#define XML_SCHEMA_PARTICLE_SET_MAX_OCCURS(particle, env, max_occurs) \
+      (((xml_schema_particle_t *) particle)->ops->\
             set_max_occurs(particle, env, max_occurs))
 
-#define AXIS2_XML_SCHEMA_PARTICLE_GET_MIN_OCCURS(particle, env) \
-      (((axis2_xml_schema_particle_t *) particle)->ops->\
+#define XML_SCHEMA_PARTICLE_GET_MIN_OCCURS(particle, env) \
+      (((xml_schema_particle_t *) particle)->ops->\
             get_min_occurs(particle, env))
 
-#define AXIS2_XML_SCHEMA_PARTICLE_SET_MIN_OCCURS(particle, env, min_occurs) \
-      (((axis2_xml_schema_particle_t *) particle)->ops->\
+#define XML_SCHEMA_PARTICLE_SET_MIN_OCCURS(particle, env, min_occurs) \
+      (((xml_schema_particle_t *) particle)->ops->\
             set_min_occurs(particle, env, min_occurs))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_PARTICLE_H */
+#endif /* XML_SCHEMA_PARTICLE_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_redefine.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_redefine.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_redefine.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_redefine.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_redefine.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_redefine.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_redefine.h Mon Jun 12 03:29:40 2006
@@ -14,44 +14,44 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_REDEFINE_H
-#define AXIS2_XML_SCHEMA_REDEFINE_H
+#ifndef XML_SCHEMA_REDEFINE_H
+#define XML_SCHEMA_REDEFINE_H
 
 /**
- * @file axis2_xml_schema_redefine.h
+ * @file xml_schema_redefine.h
  * @brief Axis2 Xml Schema Particle Interface
  *          Base class for all redefine types.
  */
 
-#include <axis2_xml_schema_external.h>
+#include <xml_schema_external.h>
 #include <axis2_hash.h>
-#include <axis2_xml_schema_obj_table.h>
-#include <axis2_xml_schema_obj_collection.h>
+#include <xml_schema_obj_table.h>
+#include <xml_schema_obj_collection.h>
 
-/** @defgroup axis2_xml_schema_include Xml Schema Particle
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_include Xml Schema Particle
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_redefine 
-                    axis2_xml_schema_redefine_t;
-typedef struct axis2_xml_schema_redefine_ops 
-                    axis2_xml_schema_redefine_ops_t;
+typedef struct xml_schema_redefine 
+                    xml_schema_redefine_t;
+typedef struct xml_schema_redefine_ops 
+                    xml_schema_redefine_ops_t;
                     
-struct axis2_xml_schema;                    
+struct xml_schema;                    
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_redefine_ops
+struct xml_schema_redefine_ops
 {
     axis2_status_t (AXIS2_CALL *
     free) (void *redefine,
             const axis2_env_t *env);
             
-    axis2_xml_schema_external_t* (AXIS2_CALL *
+    xml_schema_external_t* (AXIS2_CALL *
     get_base_impl)(void *redefine,
                    const axis2_env_t *env);            
 
@@ -59,82 +59,82 @@
     super_objs)(void *redefine,
                 const axis2_env_t *env);            
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(void *redefine,
           const axis2_env_t *env);            
 
-    axis2_xml_schema_obj_table_t* (AXIS2_CALL *
+    xml_schema_obj_table_t* (AXIS2_CALL *
     get_attribute_group)(void *redefine,
                 const axis2_env_t *env);
                 
     axis2_status_t (AXIS2_CALL *
     set_attribute_group)(void *redefine,
                 const axis2_env_t *env,
-                axis2_xml_schema_obj_table_t *group);
+                xml_schema_obj_table_t *group);
                    
-    axis2_xml_schema_obj_collection_t* (AXIS2_CALL *
+    xml_schema_obj_collection_t* (AXIS2_CALL *
     get_items)(void *redefine,
                const axis2_env_t *env);
                
-    axis2_xml_schema_obj_table_t* (AXIS2_CALL *
+    xml_schema_obj_table_t* (AXIS2_CALL *
     get_schema_types)(void *redefine,
                       const axis2_env_t *env);
                       
-    axis2_xml_schema_obj_table_t* (AXIS2_CALL *
+    xml_schema_obj_table_t* (AXIS2_CALL *
     get_group)(void *redefine, 
                const axis2_env_t *env);                      
                       
 };
 
-struct axis2_xml_schema_redefine
+struct xml_schema_redefine
 {
-    axis2_xml_schema_external_t base;
-    axis2_xml_schema_redefine_ops_t *ops;
+    xml_schema_external_t base;
+    xml_schema_redefine_ops_t *ops;
 };
 
 /**
  * Creates new Xml Schema redefine
  */
-AXIS2_EXTERN axis2_xml_schema_redefine_t * AXIS2_CALL
-axis2_xml_schema_redefine_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_redefine_t * AXIS2_CALL
+xml_schema_redefine_create(const axis2_env_t *env);
 
-#define AXIS2_XML_SCHEMA_REDEFINE_FREE(redefine, env) \
-      (((axis2_xml_schema_redefine_t *) redefine)->ops->\
+#define XML_SCHEMA_REDEFINE_FREE(redefine, env) \
+      (((xml_schema_redefine_t *) redefine)->ops->\
             free(redefine, env))
 
-#define AXIS2_XML_SCHEMA_REDEFINE_GET_BASE_IMPL(redefine, env) \
-      (((axis2_xml_schema_redefine_t *) redefine)->ops->\
+#define XML_SCHEMA_REDEFINE_GET_BASE_IMPL(redefine, env) \
+      (((xml_schema_redefine_t *) redefine)->ops->\
             get_base_impl(redefine, env))
 
-#define AXIS2_XML_SCHEMA_REDEFINE_GET_TYPE(redefine, env) \
-      (((axis2_xml_schema_redefine_t *) redefine)->ops->\
+#define XML_SCHEMA_REDEFINE_GET_TYPE(redefine, env) \
+      (((xml_schema_redefine_t *) redefine)->ops->\
             get_type(redefine, env))
 
-#define AXIS2_XML_SCHEMA_REDEFINE_SUPER_OBJS(redefine, env) \
-      (((axis2_xml_schema_redefine_t *) redefine)->ops->\
+#define XML_SCHEMA_REDEFINE_SUPER_OBJS(redefine, env) \
+      (((xml_schema_redefine_t *) redefine)->ops->\
             super_objs(redefine, env))
 
-#define AXIS2_XML_SCHEMA_REDEFINE_GET_ATTRIBUTE_GROUP(redefine, env) \
-      (((axis2_xml_schema_redefine_t *) redefine)->ops->\
+#define XML_SCHEMA_REDEFINE_GET_ATTRIBUTE_GROUP(redefine, env) \
+      (((xml_schema_redefine_t *) redefine)->ops->\
             get_attribute_group(redefine, env))
 
-#define AXIS2_XML_SCHEMA_REDEFINE_SET_ATTRIBUTE_GROUP(redefine, env, group) \
-      (((axis2_xml_schema_redefine_t *) redefine)->ops->\
+#define XML_SCHEMA_REDEFINE_SET_ATTRIBUTE_GROUP(redefine, env, group) \
+      (((xml_schema_redefine_t *) redefine)->ops->\
             set_attribute_group(redefine, env, group))
             
-#define AXIS2_XML_SCHEMA_REDEFINE_GET_ITEMS(redefine, env) \
-        (((axis2_xml_schema_redefine_t *) redefine)->ops->\
+#define XML_SCHEMA_REDEFINE_GET_ITEMS(redefine, env) \
+        (((xml_schema_redefine_t *) redefine)->ops->\
             get_items(redefine, env))
             
-#define AXIS2_XML_SCHEMA_REDEFINE_GET_GROUP(redefine, env) \
-        (((axis2_xml_schema_redefine_t *) redefine)->ops->\
+#define XML_SCHEMA_REDEFINE_GET_GROUP(redefine, env) \
+        (((xml_schema_redefine_t *) redefine)->ops->\
             get_group(redefine, env))                       
 
-#define AXIS2_XML_SCHEMA_REDEFINE_GET_SCHEMA_TYPES(redefine, env) \
-        (((axis2_xml_schema_redefine_t *) redefine)->ops->\
+#define XML_SCHEMA_REDEFINE_GET_SCHEMA_TYPES(redefine, env) \
+        (((xml_schema_redefine_t *) redefine)->ops->\
             get_schema_types(redefine, env))
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_REDEFINE_H */
+#endif /* XML_SCHEMA_REDEFINE_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_severity_type.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_severity_type.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_severity_type.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_severity_type.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_severity_type.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_severity_type.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_severity_type.h Mon Jun 12 03:29:40 2006
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SEREVITY_TYPE_H
-#define AXIS2_XML_SEREVITY_TYPE_H
+#ifndef XML_SCHEMA_SEREVITY_TYPE_H
+#define XML_SCHEMA_SEREVITY_TYPE_H
 
 /**
  * @file axis2_xml_severity_type.h
@@ -25,18 +25,18 @@
  *
  */
 
-#include <axis2_xml_schema_enum.h>
+#include <xml_schema_enum.h>
 
 /** @defgroup axis2_xml_severity_type Xml Schema Form
-  * @ingroup axis2_xml_schema
+  * @ingroup xml_schema
   * @{
   */
 
 typedef struct axis2_xml_severity_type axis2_xml_severity_type_t;
 typedef struct axis2_xml_severity_type_ops axis2_xml_severity_type_ops_t;
 
-#define AXIS2_XML_ERROR "error"
-#define AXIS2_XML_WARNING "warning"
+#define XML_SCHEMA_ERROR "error"
+#define XML_SCHEMA_WARNING "warning"
 
 #ifdef __cplusplus
 extern "C"
@@ -53,7 +53,7 @@
     free) (void *sevetiry,
             const axis2_env_t *env);
 
-    axis2_xml_schema_enum_t *(AXIS2_CALL *
+    xml_schema_enum_t *(AXIS2_CALL *
     get_base_impl) (void *severity,
                     const axis2_env_t *env);
     
@@ -65,7 +65,7 @@
     super_objs)(void *severity,
                 const axis2_env_t *env);
                 
-    axis2_xml_schema_types_t (AXIS2_CALL*
+    xml_schema_types_t (AXIS2_CALL*
     get_type)(void *severity,
           const axis2_env_t *env);                              
     
@@ -73,7 +73,7 @@
 
 struct axis2_xml_severity_type
 {
-    axis2_xml_schema_enum_t base;
+    xml_schema_enum_t base;
     axis2_xml_severity_type_ops_t *ops;
 };
 
@@ -83,23 +83,23 @@
 
 /***************************** Macros ******************************************/
 
-#define AXIS2_XML_SEREVITY_TYPE_FREE(severity, env) \
+#define XML_SCHEMA_SEREVITY_TYPE_FREE(severity, env) \
       (((axis2_xml_severity_type_t *) severity)->ops->free(severity, env))
 
-#define AXIS2_XML_SEREVITY_TYPE_GET_BASE_IMPL(severity, env) \
+#define XML_SCHEMA_SEREVITY_TYPE_GET_BASE_IMPL(severity, env) \
       (((axis2_xml_severity_type_t *) severity)->ops->get_base_impl(severity, env))
 
-#define AXIS2_XML_SEREVITY_TYPE_GET_VALUES(severity, env) \
+#define XML_SCHEMA_SEREVITY_TYPE_GET_VALUES(severity, env) \
       (((axis2_xml_severity_type_t *) severity)->ops->values(severity, env))
 
-#define AXIS2_XML_SEREVITY_TYPE_GET_TYPE(severity, env) \
+#define XML_SCHEMA_SEREVITY_TYPE_GET_TYPE(severity, env) \
       (((axis2_xml_severity_type_t *) severity)->ops->get_type(severity, env))
 
-#define AXIS2_XML_SEREVITY_TYPE_SUPER_OBJS(severity, env) \
+#define XML_SCHEMA_SEREVITY_TYPE_SUPER_OBJS(severity, env) \
       (((axis2_xml_severity_type_t *) severity)->ops->super_objs(severity, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SEREVITY_TYPE_H */
+#endif /* XML_SCHEMA_SEREVITY_TYPE_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_SIMPLE_CONTENT_H
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_H
+#ifndef XML_SCHEMA_SIMPLE_CONTENT_H
+#define XML_SCHEMA_SIMPLE_CONTENT_H
 
 /**
- * @file axis2_xml_schema_simple_content.h
+ * @file xml_schema_simple_content.h
  * @brief Axis2 Xml Schema Group Interface
  *          Class that defines groups at the schema level that are referenced
  *          from the complex types. Groups a set of element declarations so that
@@ -26,11 +26,11 @@
  *          Represents the World Wide Web Consortium (W3C) sim_content element.
  */
 
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema_annotated.h>
 #include <axis2_hash.h>
 
-/** @defgroup axis2_xml_schema_simple_content Xml Schema Group
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_simple_content Xml Schema Group
+  * @ingroup xml_schema
   * @{
   */
 
@@ -41,19 +41,19 @@
 {
 #endif
 
-typedef struct axis2_xml_schema_simple_content 
-                axis2_xml_schema_simple_content_t;
+typedef struct xml_schema_simple_content 
+                xml_schema_simple_content_t;
                 
-typedef struct axis2_xml_schema_simple_content_ops 
-                axis2_xml_schema_simple_content_ops_t;
+typedef struct xml_schema_simple_content_ops 
+                xml_schema_simple_content_ops_t;
 
-struct axis2_xml_schema_simple_content_ops
+struct xml_schema_simple_content_ops
 {
     axis2_status_t (AXIS2_CALL *
     free) (void *sim_content,
             const axis2_env_t *env);
 
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl) (void *sim_content,
                     const axis2_env_t *env);
                     
@@ -61,7 +61,7 @@
     super_objs) (void *sim_content,
                 const axis2_env_t *env);
                     
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (void *sim_content,
            const axis2_env_t *env);                                        
 
@@ -84,49 +84,49 @@
     
 };
 
-struct axis2_xml_schema_simple_content
+struct xml_schema_simple_content
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_simple_content_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_simple_content_ops_t *ops;
 };
 
 /**
  * Creates new Xml Schema Group
  */
-AXIS2_EXTERN axis2_xml_schema_simple_content_t * AXIS2_CALL
-axis2_xml_schema_simple_content_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_simple_content_t * AXIS2_CALL
+xml_schema_simple_content_create(const axis2_env_t *env);
 
  
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_FREE(sim_content, env) \
-      (((axis2_xml_schema_simple_content_t *) sim_content)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_FREE(sim_content, env) \
+      (((xml_schema_simple_content_t *) sim_content)->ops->\
             free(sim_content, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_GET_BASE_IMPL(sim_content, env) \
-      (((axis2_xml_schema_simple_content_t *) sim_content)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_GET_BASE_IMPL(sim_content, env) \
+      (((xml_schema_simple_content_t *) sim_content)->ops->\
             get_base_impl(sim_content, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_SUPER_OBJS(sim_content, env) \
-      (((axis2_xml_schema_simple_content_t *) sim_content)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_SUPER_OBJS(sim_content, env) \
+      (((xml_schema_simple_content_t *) sim_content)->ops->\
             super_objs(sim_content, env))
             
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_GET_TYPE(sim_content, env) \
-      (((axis2_xml_schema_simple_content_t *) sim_content)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_GET_TYPE(sim_content, env) \
+      (((xml_schema_simple_content_t *) sim_content)->ops->\
             get_type(sim_content, env))
                         
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_GET_CONTENT(sim_content, env) \
-      (((axis2_xml_schema_simple_content_t *) sim_content)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_GET_CONTENT(sim_content, env) \
+      (((xml_schema_simple_content_t *) sim_content)->ops->\
             get_content(sim_content, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_SET_CONTENT(sim_content, env, content) \
-      (((axis2_xml_schema_simple_content_t *) sim_content)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_SET_CONTENT(sim_content, env, content) \
+      (((xml_schema_simple_content_t *) sim_content)->ops->\
             set_content(sim_content, env, content))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_TO_STRING(sim_content, env, prefix, tab) \
-        (((axis2_xml_schema_simple_content_t *) sim_content)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_TO_STRING(sim_content, env, prefix, tab) \
+        (((xml_schema_simple_content_t *) sim_content)->ops->\
             to_string(sim_content, env, prefix, tab))            
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_SIMPLE_CONTENT_H */
+#endif /* XML_SCHEMA_SIMPLE_CONTENT_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_extension.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content_extension.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_extension.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_extension.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content_extension.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content_extension.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_extension.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_H
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_H
+#ifndef XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_H
+#define XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_H
 
 /**
- * @file axis2_xml_schema_simple_content_extension.h
+ * @file xml_schema_simple_content_extension.h
  * @brief Axis2 Xml Schema Group Interface
  *          Class that defines groups at the schema level that are referenced
  *          from the complex types. Groups a set of element declarations so that
@@ -26,13 +26,13 @@
  *          Represents the World Wide Web Consortium (W3C) sim_content_ext element.
  */
 
-#include <axis2_xml_schema_annotated.h>
-#include <axis2_xml_schema_obj_collection.h>
-#include <axis2_xml_schema_any_attribute.h>
+#include <xml_schema_annotated.h>
+#include <xml_schema_obj_collection.h>
+#include <xml_schema_any_attribute.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-/** @defgroup axis2_xml_schema_simple_content_extension Xml Schema Group
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_simple_content_extension Xml Schema Group
+  * @ingroup xml_schema
   * @{
   */
 
@@ -43,23 +43,23 @@
 {
 #endif
 
-typedef struct axis2_xml_schema_simple_content_extension 
-                axis2_xml_schema_simple_content_extension_t;
+typedef struct xml_schema_simple_content_extension 
+                xml_schema_simple_content_extension_t;
                 
-typedef struct axis2_xml_schema_simple_content_extension_ops 
-                axis2_xml_schema_simple_content_extension_ops_t;
+typedef struct xml_schema_simple_content_extension_ops 
+                xml_schema_simple_content_extension_ops_t;
 
-struct axis2_xml_schema_simple_content_extension_ops
+struct xml_schema_simple_content_extension_ops
 {
     axis2_status_t (AXIS2_CALL *
     free) (void *sim_content_ext,
             const axis2_env_t *env);
 
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl) (void *sim_content_ext,
                     const axis2_env_t *env);
                     
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(void *sim_content_ext,
           const axis2_env_t *env);
           
@@ -67,7 +67,7 @@
     super_objs)(void *sim_content_ext,
                 const axis2_env_t *env);                              
 
-    axis2_xml_schema_any_attribute_t* (AXIS2_CALL *
+    xml_schema_any_attribute_t* (AXIS2_CALL *
     get_any_attribute)(
             void* sim_content_ext,
             const axis2_env_t *env);
@@ -76,9 +76,9 @@
     set_any_attribute)(
             void *sim_content_ext,
             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 *sim_content_ext,
             const axis2_env_t *env);
@@ -98,55 +98,55 @@
     
 };
 
-struct axis2_xml_schema_simple_content_extension
+struct xml_schema_simple_content_extension
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_simple_content_extension_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_simple_content_extension_ops_t *ops;
 };
 
 /**
  * Creates new Xml Schema Group
  */
-AXIS2_EXTERN axis2_xml_schema_simple_content_extension_t * AXIS2_CALL
-axis2_xml_schema_simple_content_extension_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_simple_content_extension_t * AXIS2_CALL
+xml_schema_simple_content_extension_create(const axis2_env_t *env);
 
 /************************** Macros ****************************************************/
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_FREE(sim_content_ext, env) \
-      (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_FREE(sim_content_ext, env) \
+      (((xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
           free(sim_content_ext, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_BASE_IMPL(sim_content_ext, env) \
-      (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_BASE_IMPL(sim_content_ext, env) \
+      (((xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
             get_base_impl(sim_content_ext, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_TYPE(sim_content_ext, env) \
-      (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_TYPE(sim_content_ext, env) \
+      (((xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
             get_type(sim_content_ext, env))
             
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_SUPER_OBJS(sim_content_ext, env) \
-      (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_SUPER_OBJS(sim_content_ext, env) \
+      (((xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
             super_objs(sim_content_ext, env))            
     
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_ANY_ATTRIBUTE(sim_content_ext, env) \
-      (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_ANY_ATTRIBUTE(sim_content_ext, env) \
+      (((xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
           get_any_attribute(sim_content_ext, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_SET_ANY_ATTRIBUTE(sim_content_ext, env, any_attr)\
-      (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_SET_ANY_ATTRIBUTE(sim_content_ext, env, any_attr)\
+      (((xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
           set_any_attribute(sim_content_ext, env, any_attr ))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_ATTRIBUTES(sim_content_ext, env) \
-      (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_ATTRIBUTES(sim_content_ext, env) \
+      (((xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
           get_attributes(sim_content_ext, env))
             
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_BASE_TYPE_NAME(sim_content_ext, env)\
-        (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_BASE_TYPE_NAME(sim_content_ext, env)\
+        (((xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
             get_base_type_name(sim_content_ext, env))            
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_SET_BASE_TYPE_NAME(sim_content_ext, \
+#define XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_SET_BASE_TYPE_NAME(sim_content_ext, \
           env, base_type_name) \
-        (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
+        (((xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
             set_base_type_name(sim_content_ext, env, base_type_name))
             
             
@@ -154,4 +154,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_H */
+#endif /* XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_restriction.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content_restriction.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_restriction.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_restriction.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content_restriction.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_content_restriction.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_content_restriction.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_H
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_H
+#ifndef XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_H
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_H
 
 /**
- * @file axis2_xml_schema_simple_content_restriction.h
+ * @file xml_schema_simple_content_restriction.h
  * @brief Axis2 Xml Schema Group Interface
  *          Class that defines groups at the schema level that are referenced
  *          from the complex types. Groups a set of element declarations so that
@@ -26,15 +26,15 @@
  *          Represents the World Wide Web Consortium (W3C) sim_content_res element.
  */
 
-#include <axis2_xml_schema_annotated.h>
-#include <axis2_xml_schema_obj_collection.h>
-#include <axis2_xml_schema_any_attribute.h>
-#include <axis2_xml_schema_simple_type.h>
+#include <xml_schema_annotated.h>
+#include <xml_schema_obj_collection.h>
+#include <xml_schema_any_attribute.h>
+#include <xml_schema_simple_type.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 
-/** @defgroup axis2_xml_schema_simple_content_restriction Xml Schema Group
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_simple_content_restriction Xml Schema Group
+  * @ingroup xml_schema
   * @{
   */
 
@@ -43,19 +43,19 @@
 {
 #endif
 
-typedef struct axis2_xml_schema_simple_content_restriction 
-                axis2_xml_schema_simple_content_restriction_t;
+typedef struct xml_schema_simple_content_restriction 
+                xml_schema_simple_content_restriction_t;
                 
-typedef struct axis2_xml_schema_simple_content_restriction_ops 
-                axis2_xml_schema_simple_content_restriction_ops_t;
+typedef struct xml_schema_simple_content_restriction_ops 
+                xml_schema_simple_content_restriction_ops_t;
 
-struct axis2_xml_schema_simple_content_restriction_ops
+struct xml_schema_simple_content_restriction_ops
 {
     axis2_status_t (AXIS2_CALL *
     free) (void *sim_content_res,
            const axis2_env_t *env);
 
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl)(
             void *sim_content_res,
             const axis2_env_t *env);
@@ -65,12 +65,12 @@
             void *sim_content_res,
             const axis2_env_t *env);
             
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(
             void *sim_content_res,
             const axis2_env_t *env);                        
 
-    axis2_xml_schema_any_attribute_t* (AXIS2_CALL *
+    xml_schema_any_attribute_t* (AXIS2_CALL *
     get_any_attribute)(
             void *sim_content_res,
             const axis2_env_t *env);
@@ -79,9 +79,9 @@
     set_any_attribute)(
             void *sim_content_res,
             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 *sim_content_res,
             const axis2_env_t *env);
@@ -97,7 +97,7 @@
             const axis2_env_t *env,
             axis2_qname_t *qname); 
             
-    axis2_xml_schema_simple_type_t* (AXIS2_CALL*
+    xml_schema_simple_type_t* (AXIS2_CALL*
     get_base_type)(
             void *sim_content_res,
             const axis2_env_t *env);
@@ -106,78 +106,78 @@
     set_base_type)(
             void *sim_content_res,
             const axis2_env_t *env,
-            axis2_xml_schema_simple_type_t *base_type); 
+            xml_schema_simple_type_t *base_type); 
                    
-    axis2_xml_schema_obj_collection_t* (AXIS2_CALL *
+    xml_schema_obj_collection_t* (AXIS2_CALL *
     get_facets)(
             void *sim_content_res,
             const axis2_env_t *env);                   
 };
 
-struct axis2_xml_schema_simple_content_restriction
+struct xml_schema_simple_content_restriction
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_simple_content_restriction_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_simple_content_restriction_ops_t *ops;
 };
 
 /**
  * Creates new Xml Schema Group
  */
-AXIS2_EXTERN axis2_xml_schema_simple_content_restriction_t * AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_simple_content_restriction_t * AXIS2_CALL
+xml_schema_simple_content_restriction_create(const axis2_env_t *env);
 
 
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_FREE(sim_content_res, env) \
-      (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_FREE(sim_content_res, env) \
+      (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
       free(sim_content_res, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_BASE_IMPL(sim_content_res, env) \
-      (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_BASE_IMPL(sim_content_res, env) \
+      (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
       get_base_impl(sim_content_res, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_ANY_ATTRIBUTE(sim_content_res, env) \
-      (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_ANY_ATTRIBUTE(sim_content_res, env) \
+      (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
         get_any_attribute(sim_content_res, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SET_ANY_ATTRIBUTE(sim_content_res,\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SET_ANY_ATTRIBUTE(sim_content_res,\
          env, any_attr)\
-      (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+      (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
           set_content(sim_content_res, env, any_attr ))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_ATTRIBUTES(sim_content_res, env) \
-      (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_ATTRIBUTES(sim_content_res, env) \
+      (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
           get_attributes(sim_content_res, env))
             
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_BASE_TYPE_NAME(sim_content_res, env)\
-        (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_BASE_TYPE_NAME(sim_content_res, env)\
+        (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
             get_base_type_name(sim_content_res, env))            
     
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SET_BASE_TYPE_NAME(sim_content_res, env, base_type_name) \
-        (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SET_BASE_TYPE_NAME(sim_content_res, env, base_type_name) \
+        (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
         set_base_type_name(sim_content_res, env, base_type_name))
                 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SET_BASE_TYPE(sim_content_res, env, base_type) \
-        (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SET_BASE_TYPE(sim_content_res, env, base_type) \
+        (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
             set_base_type(sim_content_res, env, base_type)) 
             
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_BASE_TYPE(sim_content_res, env)\
-        (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_BASE_TYPE(sim_content_res, env)\
+        (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
             get_base_type(sim_content_res, env))
             
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_FACETS(sim_content_res, env)\
-        (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_FACETS(sim_content_res, env)\
+        (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
             get_facets(sim_content_res, env))            
             
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SUPER_OBJS(sim_content_res, env) \
-      (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SUPER_OBJS(sim_content_res, env) \
+      (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
       super_objs(sim_content_res, env))  
       
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_TYPE(sim_content_res, env) \
-      (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
+#define XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_TYPE(sim_content_res, env) \
+      (((xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
       get_type(sim_content_res, env))                                          
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_H */
+#endif /* XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type.h Mon Jun 12 03:29:40 2006
@@ -14,35 +14,35 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_SIMPLE_TYPE_H
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_H
+#ifndef XML_SCHEMA_SIMPLE_TYPE_H
+#define XML_SCHEMA_SIMPLE_TYPE_H
 
 /**
- * @file axis2_xml_schema_type.h
+ * @file xml_schema_type.h
  * @brief Axis2 Xml Schema Type Interface
  *          The base class for all simple types and complex types.
  */
 
-#include <axis2_xml_schema_annotated.h>
-#include <axis2_xml_schema_type.h>
+#include <xml_schema_annotated.h>
+#include <xml_schema_type.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
-#include <axis2_xml_schema_simple_type_content.h>
-/** @defgroup axis2_xml_schema_simple_type Xml Schema Type
-  * @ingroup axis2_xml_schema
+#include <xml_schema_simple_type_content.h>
+/** @defgroup xml_schema_simple_type Xml Schema Type
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_simple_type 
-                    axis2_xml_schema_simple_type_t;
-typedef struct axis2_xml_schema_simple_type_ops 
-                    axis2_xml_schema_simple_type_ops_t;
+typedef struct xml_schema_simple_type 
+                    xml_schema_simple_type_t;
+typedef struct xml_schema_simple_type_ops 
+                    xml_schema_simple_type_ops_t;
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_simple_type_ops
+struct xml_schema_simple_type_ops
 {
    /** 
      * Deallocate memory
@@ -52,11 +52,11 @@
     free) (void *simple_type,
             const axis2_env_t *env);
 
-    axis2_xml_schema_type_t *(AXIS2_CALL *
+    xml_schema_type_t *(AXIS2_CALL *
     get_base_impl) (void *simple_type,
                     const axis2_env_t *env);
                     
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (void *simple_type,
             const axis2_env_t *env);
                     
@@ -64,14 +64,14 @@
     super_objs) (void *simple_type,
                  const axis2_env_t *env);                                        
                     
-    axis2_xml_schema_simple_type_content_t* (AXIS2_CALL *
+    xml_schema_simple_type_content_t* (AXIS2_CALL *
     get_content)(void *simple_type,
                  const axis2_env_t *env);
                  
     axis2_status_t (AXIS2_CALL*
     set_content)(void *simple_type,
                  const axis2_env_t *env,
-                 axis2_xml_schema_simple_type_content_t *simple_content);
+                 xml_schema_simple_type_content_t *simple_content);
                  
     axis2_char_t* (AXIS2_CALL *
     to_string)(void *simple_type,
@@ -80,10 +80,10 @@
                int tab);
 };
 
-struct axis2_xml_schema_simple_type
+struct xml_schema_simple_type
 {
-    axis2_xml_schema_type_t base;
-    axis2_xml_schema_simple_type_ops_t *ops;
+    xml_schema_type_t base;
+    xml_schema_simple_type_ops_t *ops;
 };
 
 /**
@@ -94,47 +94,47 @@
  * a reference to a named content model group (group), or an element wildcard 
  * (any).
  */
-AXIS2_EXTERN axis2_xml_schema_simple_type_t * AXIS2_CALL
-axis2_xml_schema_simple_type_create(const axis2_env_t *env,
-                                struct axis2_xml_schema *schema);
+AXIS2_EXTERN xml_schema_simple_type_t * AXIS2_CALL
+xml_schema_simple_type_create(const axis2_env_t *env,
+                                struct xml_schema *schema);
 
 /**
  * This method is internal to Axis2 C. It is called from Child Constructor
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_resolve_methods(
-                                axis2_xml_schema_simple_type_t *simple_type,
+xml_schema_simple_type_resolve_methods(
+                                xml_schema_simple_type_t *simple_type,
                                 const axis2_env_t *env,
-                                axis2_xml_schema_simple_type_t *type_impl,
+                                xml_schema_simple_type_t *type_impl,
                                 axis2_hash_t *methods);
  */
  /***************** Macros ***************************************************/
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_FREE(simple_type, env) \
-      (((axis2_xml_schema_simple_type_t *) simple_type)->ops->\
+#define XML_SCHEMA_SIMPLE_TYPE_FREE(simple_type, env) \
+      (((xml_schema_simple_type_t *) simple_type)->ops->\
             free(simple_type, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_GET_BASE_IMPL(simple_type, env) \
-      (((axis2_xml_schema_simple_type_t *) simple_type)->ops->\
+#define XML_SCHEMA_SIMPLE_TYPE_GET_BASE_IMPL(simple_type, env) \
+      (((xml_schema_simple_type_t *) simple_type)->ops->\
             get_base_impl(simple_type, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_GET_TYPE(simple_type, env) \
-      (((axis2_xml_schema_simple_type_t *) simple_type)->ops->\
+#define XML_SCHEMA_SIMPLE_TYPE_GET_TYPE(simple_type, env) \
+      (((xml_schema_simple_type_t *) simple_type)->ops->\
             get_type(simple_type, env))
             
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_SUPER_OBJS(simple_type, env) \
-      (((axis2_xml_schema_simple_type_t *) simple_type)->ops->\
+#define XML_SCHEMA_SIMPLE_TYPE_SUPER_OBJS(simple_type, env) \
+      (((xml_schema_simple_type_t *) simple_type)->ops->\
             super_objs(simple_type, env))            
 
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_GET_CONTENT(simple_type, env) \
-      (((axis2_xml_schema_simple_type_t *) simple_type)->ops->\
+#define XML_SCHEMA_SIMPLE_TYPE_GET_CONTENT(simple_type, env) \
+      (((xml_schema_simple_type_t *) simple_type)->ops->\
             get_content(simple_type, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_SET_CONTENT(simple_type, env, content) \
-      (((axis2_xml_schema_simple_type_t *) simple_type)->ops->\
+#define XML_SCHEMA_SIMPLE_TYPE_SET_CONTENT(simple_type, env, content) \
+      (((xml_schema_simple_type_t *) simple_type)->ops->\
             set_content(simple_type, env, content))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_TO_STRING(simple_type, env) \
-      (((axis2_xml_schema_simple_type_t *) simple_type)->ops->\
+#define XML_SCHEMA_SIMPLE_TYPE_TO_STRING(simple_type, env) \
+      (((xml_schema_simple_type_t *) simple_type)->ops->\
             to_string(simple_type, env))
                                                            
 /************************ end macros ********************************************/                                                           
@@ -142,4 +142,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_SIMPLE_TYPE_H */
+#endif /* XML_SCHEMA_SIMPLE_TYPE_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_content.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_content.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_content.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_content.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_content.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_simple_type_content.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_simple_type_content.h Mon Jun 12 03:29:40 2006
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_H
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_H
+#ifndef XML_SCHEMA_SIMPLE_TYPE_CONTENT_H
+#define XML_SCHEMA_SIMPLE_TYPE_CONTENT_H
 
 /**
- * @file axis2_xml_schema_simple_type_content.h
+ * @file xml_schema_simple_type_content.h
  * @brief Axis2 Xml Schema Particle Interface
  *          Base class for all sim_type_cont types.
  */
 
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema_annotated.h>
 #include <axis2_hash.h>
 
-/** @defgroup axis2_xml_schema_simple_type_content Xml Schema Particle
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_simple_type_content Xml Schema Particle
+  * @ingroup xml_schema
   * @{
   */
 #ifdef __cplusplus
@@ -35,13 +35,13 @@
 {
 #endif
 
-typedef struct axis2_xml_schema_simple_type_content 
-                    axis2_xml_schema_simple_type_content_t;
-typedef struct axis2_xml_schema_simple_type_content_ops 
-                    axis2_xml_schema_simple_type_content_ops_t;
+typedef struct xml_schema_simple_type_content 
+                    xml_schema_simple_type_content_t;
+typedef struct xml_schema_simple_type_content_ops 
+                    xml_schema_simple_type_content_ops_t;
 
 
-struct axis2_xml_schema_simple_type_content_ops
+struct xml_schema_simple_type_content_ops
 {
    /** 
      * Deallocate memory
@@ -51,11 +51,11 @@
     free) (void *sim_type_cont,
             const axis2_env_t *env);
 
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl) (void *sim_type_cont,
                     const axis2_env_t *env);
 
-    axis2_xml_schema_types_t    (AXIS2_CALL *
+    xml_schema_types_t    (AXIS2_CALL *
     get_type)(void *sim_type_cont,
               const axis2_env_t *env);
     
@@ -65,10 +65,10 @@
     
 };
 
-struct axis2_xml_schema_simple_type_content
+struct xml_schema_simple_type_content
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_simple_type_content_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_simple_type_content_ops_t *ops;
 };
 
 /**
@@ -79,34 +79,34 @@
  * a reference to a named content model group (group), or an element wildcard 
  * (any).
  */
-AXIS2_EXTERN axis2_xml_schema_simple_type_content_t * AXIS2_CALL
-axis2_xml_schema_simple_type_content_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_simple_type_content_t * AXIS2_CALL
+xml_schema_simple_type_content_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_simple_type_content_resolve_methods(
-                                axis2_xml_schema_simple_type_content_t *sim_type_cont,
+xml_schema_simple_type_content_resolve_methods(
+                                xml_schema_simple_type_content_t *sim_type_cont,
                                 const axis2_env_t *env,
-                                axis2_xml_schema_simple_type_content_t *sim_type_cont_impl,
+                                xml_schema_simple_type_content_t *sim_type_cont_impl,
                                 axis2_hash_t *methods);
 
 /*************************** Macros **********************************************/
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(sim_type_cont, env) \
-      (((axis2_xml_schema_simple_type_content_t *) sim_type_cont)->ops->\
+#define XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(sim_type_cont, env) \
+      (((xml_schema_simple_type_content_t *) sim_type_cont)->ops->\
             free(sim_type_cont, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(sim_type_cont, env) \
-      (((axis2_xml_schema_simple_type_content_t *) sim_type_cont)->ops->\
+#define XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(sim_type_cont, env) \
+      (((xml_schema_simple_type_content_t *) sim_type_cont)->ops->\
             get_base_impl(sim_type_cont, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_TYPE(sim_type_cont, env) \
-      (((axis2_xml_schema_simple_type_content_t *) sim_type_cont)->ops->\
+#define XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_TYPE(sim_type_cont, env) \
+      (((xml_schema_simple_type_content_t *) sim_type_cont)->ops->\
             get_type(sim_type_cont, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_SUPER_OBJS(sim_type_cont, env) \
-      (((axis2_xml_schema_simple_type_content_t *) sim_type_cont)->ops->\
+#define XML_SCHEMA_SIMPLE_TYPE_CONTENT_SUPER_OBJS(sim_type_cont, env) \
+      (((xml_schema_simple_type_content_t *) sim_type_cont)->ops->\
             super_objs(sim_type_cont, env))
 
 /************************ end macros *********************************************/
@@ -114,4 +114,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_H */
+#endif /* XML_SCHEMA_SIMPLE_TYPE_CONTENT_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