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 [3/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_defines.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_defines.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_defines.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_defines.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_defines.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_defines.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_defines.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_DEFINES_H
-#define AXIS2_XML_SCHEMA_DEFINES_H
+#ifndef XML_SCHEMA_DEFINES_H
+#define XML_SCHEMA_DEFINES_H
 
 /**
- * @file axis2_xml_schema_defines.h
+ * @file xml_schema_defines.h
  * @brief Axis2c specific global declarations
  */
 
@@ -30,8 +30,8 @@
 #endif
 
 
-/** @defgroup axis2_xml_schema_defines Xml Schema/C project
-  * @ingroup axis2_xml_schema_defines
+/** @defgroup xml_schema_defines Xml Schema/C project
+  * @ingroup xml_schema_defines
   * @{
   */
 /** @defgroup axis2 Xml Schema/C project
@@ -43,115 +43,115 @@
     *
     * All Xml Schema/C types
     */
-    typedef enum axis2_xml_schema_types
+    typedef enum xml_schema_types
     {
-        AXIS2_XML_SCHEMA = 0,
-        AXIS2_XML_SCHEMA_ENUM,
-        AXIS2_XML_SCHEMA_USE,
-        AXIS2_XML_SCHEMA_CONTENT_PROCESSING,
-        AXIS2_XML_SCHEMA_FORM,
-        AXIS2_XML_SCHEMA_CONTENT_TYPE,
-        AXIS2_XML_SCHEMA_DERIVATION_METHOD,
-        AXIS2_XML_SEVERITY_TYPE,
-        AXIS2_XML_TOKENIZED_TYPE,
-        AXIS2_XML_SCHEMA_OBJ, 
-        AXIS2_XML_SCHEMA_ANNOTATION,
-        AXIS2_XML_SCHEMA_APP_INFO,
-        AXIS2_XML_SCHEMA_DOCUMENTATION,
-        AXIS2_XML_SCHEMA_ANNOTATED,
-        AXIS2_XML_SCHEMA_FACET,
-        AXIS2_XML_SCHEMA_ENUMARATION_FACET,
-        AXIS2_XML_SCHEMA_FRACTION_DIGITS_FACET,
-        AXIS2_XML_SCHEMA_LENGTH_FACET,
-        AXIS2_XML_SCHEMA_MAX_EXCLUSIVE_FACET,
-        AXIS2_XML_SCHEMA_MAX_INCLUSIVE_FACET,
-        AXIS2_XML_SCHEMA_MAX_LENGTH_FACET,
-        AXIS2_XML_SCHEMA_MIN_EXCLUSIVE_FACET,
-        AXIS2_XML_SCHEMA_MIN_INCLUSIVE_FACET,
-        AXIS2_XML_SCHEMA_MIN_LENGTH_FACET,
-        AXIS2_XML_SCHEMA_NUMERAIC_FACET,
-        AXIS2_XML_SCHEMA_PATTERN_FACET,
-        AXIS2_XML_SCHEMA_TATAL_DIGITS_FACET,
-        AXIS2_XML_SCHEMA_WHITE_SPACE_FACET,
-        AXIS2_XML_SCHEMA_PARTICLE,
-        AXIS2_XML_SCHEMA_ANY,
-        AXIS2_XML_SCHEMA_GROUP_BASE,
-        AXIS2_XML_SCHEMA_CHOICE,
-        AXIS2_XML_SCHEMA_ALL,
-        AXIS2_XML_SCHEMA_SEQUENCE,
-        AXIS2_XML_SCHEMA_GROUP_REF,
-        AXIS2_XML_SCHEMA_ELEMENT,
-        AXIS2_XML_SCHEMA_XPATH,
-        AXIS2_XML_SCHEMA_GROUP,
-        AXIS2_XML_SCHEMA_ANY_ATTRIBUTE,
-        AXIS2_XML_SCHEMA_TYPE,
-        AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION,
-        AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION,
-        AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION,
-        AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION,
-        AXIS2_XML_SCHEMA_SIMPLE_CONTENT,
-        AXIS2_XML_SCHEMA_COMPLEX_CONTENT,
-        AXIS2_XML_SCHEMA_SIMPLE_TYPE,
-        AXIS2_XML_SCHEMA_COMPLEX_TYPE,
-        AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT,
-        AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST,
-        AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION,
-        AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION,
-        AXIS2_XML_SCHEMA_EXTERNAL,
-        AXIS2_XML_SCHEMA_IMPORT,
-        AXIS2_XML_SCHEMA_INCLUDE,
-        AXIS2_XML_SCHEMA_REDEFINE,
-        AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT,
-        AXIS2_XML_SCHEMA_UNIQUE,
-        AXIS2_XML_SCHEMA_KEY,
-        AXIS2_XML_SCHEMA_KEYREF,
-        AXIS2_XML_SCHEMA_ATTRIBUTE,
-        AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP,
-        AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_REF
-    } axis2_xml_schema_types_t;
+        XML_SCHEMA = 0,
+        XML_SCHEMA_ENUM,
+        XML_SCHEMA_USE,
+        XML_SCHEMA_CONTENT_PROCESSING,
+        XML_SCHEMA_FORM,
+        XML_SCHEMA_CONTENT_TYPE,
+        XML_SCHEMA_DERIVATION_METHOD,
+        XML_SCHEMA_SEVERITY_TYPE,
+        XML_SCHEMA_TOKENIZED_TYPE,
+        XML_SCHEMA_OBJ, 
+        XML_SCHEMA_ANNOTATION,
+        XML_SCHEMA_APP_INFO,
+        XML_SCHEMA_DOCUMENTATION,
+        XML_SCHEMA_ANNOTATED,
+        XML_SCHEMA_FACET,
+        XML_SCHEMA_ENUMARATION_FACET,
+        XML_SCHEMA_FRACTION_DIGITS_FACET,
+        XML_SCHEMA_LENGTH_FACET,
+        XML_SCHEMA_MAX_EXCLUSIVE_FACET,
+        XML_SCHEMA_MAX_INCLUSIVE_FACET,
+        XML_SCHEMA_MAX_LENGTH_FACET,
+        XML_SCHEMA_MIN_EXCLUSIVE_FACET,
+        XML_SCHEMA_MIN_INCLUSIVE_FACET,
+        XML_SCHEMA_MIN_LENGTH_FACET,
+        XML_SCHEMA_NUMERAIC_FACET,
+        XML_SCHEMA_PATTERN_FACET,
+        XML_SCHEMA_TATAL_DIGITS_FACET,
+        XML_SCHEMA_WHITE_SPACE_FACET,
+        XML_SCHEMA_PARTICLE,
+        XML_SCHEMA_ANY,
+        XML_SCHEMA_GROUP_BASE,
+        XML_SCHEMA_CHOICE,
+        XML_SCHEMA_ALL,
+        XML_SCHEMA_SEQUENCE,
+        XML_SCHEMA_GROUP_REF,
+        XML_SCHEMA_ELEMENT,
+        XML_SCHEMA_XPATH,
+        XML_SCHEMA_GROUP,
+        XML_SCHEMA_ANY_ATTRIBUTE,
+        XML_SCHEMA_TYPE,
+        XML_SCHEMA_SIMPLE_CONTENT_EXTENSION,
+        XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION,
+        XML_SCHEMA_COMPLEX_CONTENT_EXTENSION,
+        XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION,
+        XML_SCHEMA_SIMPLE_CONTENT,
+        XML_SCHEMA_COMPLEX_CONTENT,
+        XML_SCHEMA_SIMPLE_TYPE,
+        XML_SCHEMA_COMPLEX_TYPE,
+        XML_SCHEMA_SIMPLE_TYPE_CONTENT,
+        XML_SCHEMA_SIMPLE_TYPE_LIST,
+        XML_SCHEMA_SIMPLE_TYPE_RESTRICTION,
+        XML_SCHEMA_SIMPLE_TYPE_UNION,
+        XML_SCHEMA_EXTERNAL,
+        XML_SCHEMA_IMPORT,
+        XML_SCHEMA_INCLUDE,
+        XML_SCHEMA_REDEFINE,
+        XML_SCHEMA_IDENTITY_CONSTRAINT,
+        XML_SCHEMA_UNIQUE,
+        XML_SCHEMA_KEY,
+        XML_SCHEMA_KEYREF,
+        XML_SCHEMA_ATTRIBUTE,
+        XML_SCHEMA_ATTRIBUTE_GROUP,
+        XML_SCHEMA_ATTRIBUTE_GROUP_REF
+    } xml_schema_types_t;
     
 
-#define AXIS2_XML_SCHEMA_CONST_ALL "all"
+#define XML_SCHEMA_CONST_ALL "all"
 
-#define AXIS2_XML_SCHEMA_CONST_NONE "none"
+#define XML_SCHEMA_CONST_NONE "none"
 
-#define AXIS2_XML_SCHEMA_CONST_EXTENSION "extension"
+#define XML_SCHEMA_CONST_EXTENSION "extension"
 
-#define AXIS2_XML_SCHEMA_CONST_LIST "list"
+#define XML_SCHEMA_CONST_LIST "list"
 
-#define AXIS2_XML_SCHEMA_CONST_RESTRICTION "restricton"
+#define XML_SCHEMA_CONST_RESTRICTION "restricton"
 
-#define AXIS2_XML_SCHEMA_CONST_SUBSTITUTION "substitution"
+#define XML_SCHEMA_CONST_SUBSTITUTION "substitution"
 
-#define AXIS2_XML_SCHEMA_CONST_UNION "union"
+#define XML_SCHEMA_CONST_UNION "union"
 
-#define AXIS2_XML_SCHEMA_CONST_STRING "string"
+#define XML_SCHEMA_CONST_STRING "string"
 
-#define AXIS2_XML_SCHEMA_CONST_UNION "union"
+#define XML_SCHEMA_CONST_UNION "union"
 
-#define AXIS2_XML_SCHEMA_CONST_EMPTY "empty"
+#define XML_SCHEMA_CONST_EMPTY "empty"
 
-#define AXIS2_XML_SCHEMA_CONST_ELEMENT_ONLY "elementOnly"
+#define XML_SCHEMA_CONST_ELEMENT_ONLY "elementOnly"
 
-#define AXIS2_XML_SCHEMA_CONST_MIXED "mixed"
+#define XML_SCHEMA_CONST_MIXED "mixed"
 
-#define AXIS2_XML_SCHEMA_CONST_TEXT_ONLY "textOnly"
+#define XML_SCHEMA_CONST_TEXT_ONLY "textOnly"
 
-#define AXIS2_XML_SCHEMA_CONST_LAX "lax"
+#define XML_SCHEMA_CONST_LAX "lax"
 
-#define AXIS2_XML_SCHEMA_CONST_SKIP "skip"
+#define XML_SCHEMA_CONST_SKIP "skip"
 
-#define AXIS2_XML_SCHEMA_CONST_STRICT "strict"
+#define XML_SCHEMA_CONST_STRICT "strict"
 
-#define AXIS2_XML_SCHEMA_CONST_OPTIONAL "optional"
+#define XML_SCHEMA_CONST_OPTIONAL "optional"
 
-#define AXIS2_XML_SCHEMA_CONST_PROHIBITED "prohibited"
+#define XML_SCHEMA_CONST_PROHIBITED "prohibited"
 
-#define AXIS2_XML_SCHEMA_CONST_REQUIRED "required"
+#define XML_SCHEMA_CONST_REQUIRED "required"
 
-#define AXIS2_XML_SCHEMA_CONST_ERROR "error"
+#define XML_SCHEMA_CONST_ERROR "error"
 
-#define AXIS2_XML_SCHEMA_CONST_WARNING "warning"
+#define XML_SCHEMA_CONST_WARNING "warning"
 
 /** @} */
 
@@ -159,4 +159,4 @@
 }
 #endif
 
-#endif /* AXIS2_XML_SCHEMA_DEFINES_H */
+#endif /* XML_SCHEMA_DEFINES_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_derivation_method.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_derivation_method.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_derivation_method.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_derivation_method.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_derivation_method.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_derivation_method.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_derivation_method.h Mon Jun 12 03:29:40 2006
@@ -14,32 +14,32 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_DERIVATION_METHOD_H
-#define AXIS2_XML_SCHEMA_DERIVATION_METHOD_H
+#ifndef XML_SCHEMA_DERIVATION_METHOD_H
+#define XML_SCHEMA_DERIVATION_METHOD_H
 
 /**
- * @file axis2_xml_schema_use.h
+ * @file xml_schema_use.h
  * @brief Axis2 Xml Schema Derivation Method Interface
  *          Provides different methods for preventing derivation.
  *
  */
 
-#include <axis2_xml_schema_enum.h>
+#include <xml_schema_enum.h>
 
-/** @defgroup axis2_xml_schema_derivation_method Xml Schema Derivation Method
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_derivation_method Xml Schema Derivation Method
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_derivation_method axis2_xml_schema_derivation_method_t;
-typedef struct axis2_xml_schema_derivation_method_ops axis2_xml_schema_derivation_method_ops_t;
+typedef struct xml_schema_derivation_method xml_schema_derivation_method_t;
+typedef struct xml_schema_derivation_method_ops xml_schema_derivation_method_ops_t;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_derivation_method_ops
+struct xml_schema_derivation_method_ops
 {
    /** 
      * Deallocate memory
@@ -49,7 +49,7 @@
     free) (void *derivation_method,
             const axis2_env_t *env);
 
-    axis2_xml_schema_enum_t *(AXIS2_CALL *
+    xml_schema_enum_t *(AXIS2_CALL *
     get_base_impl) (void *derivation_method,
                     const axis2_env_t *env);
     
@@ -61,41 +61,41 @@
     super_objs)(void *derivation_method,
                 const axis2_env_t *env);
     
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(void *derivation_method,
           const axis2_env_t *env);                                
     
 };
 
-struct axis2_xml_schema_derivation_method
+struct xml_schema_derivation_method
 {
-    axis2_xml_schema_enum_t base;
-    axis2_xml_schema_derivation_method_ops_t *ops;
+    xml_schema_enum_t base;
+    xml_schema_derivation_method_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_derivation_method_t * AXIS2_CALL
-axis2_xml_schema_derivation_method_create(const axis2_env_t *env,
+AXIS2_EXTERN xml_schema_derivation_method_t * AXIS2_CALL
+xml_schema_derivation_method_create(const axis2_env_t *env,
                                     axis2_char_t* value);
 
 
-#define AXIS2_XML_SCHEMA_DERIVATION_METHOD_FREE(derivation_method, env) \
-      (((axis2_xml_schema_derivation_method_t *) \
+#define XML_SCHEMA_DERIVATION_METHOD_FREE(derivation_method, env) \
+      (((xml_schema_derivation_method_t *) \
        derivation_method)->ops->free(derivation_method, env))
 
-#define AXIS2_XML_SCHEMA_DERIVATION_METHOD_GET_BASE_IMPL(derivation_method, env) \
-      (((axis2_xml_schema_derivation_method_t *) \
+#define XML_SCHEMA_DERIVATION_METHOD_GET_BASE_IMPL(derivation_method, env) \
+      (((xml_schema_derivation_method_t *) \
       derivation_method)->ops->get_base_impl(derivation_method, env))
 
-#define AXIS2_XML_SCHEMA_DERIVATION_METHOD_GET_VALUES(derivation_method, env) \
-      (((axis2_xml_schema_derivation_method_t *) \
+#define XML_SCHEMA_DERIVATION_METHOD_GET_VALUES(derivation_method, env) \
+      (((xml_schema_derivation_method_t *) \
       derivation_method)->ops->values(derivation_method, env))
 
-#define AXIS2_XML_SCHEMA_DERIVATION_METHOD_GET_TYPE(derivation_method, env) \
-      (((axis2_xml_schema_derivation_method_t *) \
+#define XML_SCHEMA_DERIVATION_METHOD_GET_TYPE(derivation_method, env) \
+      (((xml_schema_derivation_method_t *) \
       derivation_method)->ops->get_type(derivation_method, env))
       
-#define AXIS2_XML_SCHEMA_DERIVATION_METHOD_SUPER_OBJS(derivation_method, env) \
-        (((axis2_xml_schema_derivation_method_t *) \
+#define XML_SCHEMA_DERIVATION_METHOD_SUPER_OBJS(derivation_method, env) \
+        (((xml_schema_derivation_method_t *) \
       derivation_method)->ops->super_objs(derivation_method, env))
       
       
@@ -103,4 +103,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_DERIVATION_METHOD_H */
+#endif /* XML_SCHEMA_DERIVATION_METHOD_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_documentation.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_documentation.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_documentation.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_documentation.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_documentation.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_documentation.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_documentation.h Mon Jun 12 03:29:40 2006
@@ -14,38 +14,38 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_DOCUMENTATION_H
-#define AXIS2_XML_SCHEMA_DOCUMENTATION_H
+#ifndef XML_SCHEMA_DOCUMENTATION_H
+#define XML_SCHEMA_DOCUMENTATION_H
 
 /**
- * @file axis2_xml_schema_documentation.h
+ * @file xml_schema_documentation.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>
 #include <axiom.h>
 
-/** @defgroup axis2_xml_schema_documentation Xml Schema App Info
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_documentation Xml Schema App Info
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_documentation 
-                    axis2_xml_schema_documentation_t;
-typedef struct axis2_xml_schema_documentation_ops 
-                    axis2_xml_schema_documentation_ops_t;
+typedef struct xml_schema_documentation 
+                    xml_schema_documentation_t;
+typedef struct xml_schema_documentation_ops 
+                    xml_schema_documentation_ops_t;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_documentation_ops
+struct xml_schema_documentation_ops
 {
    /** 
      * Deallocate memory
@@ -61,12 +61,12 @@
             void *documentation,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (
             void *documentation,
             const axis2_env_t *env);
 
-    axis2_xml_schema_obj_t *(AXIS2_CALL *
+    xml_schema_obj_t *(AXIS2_CALL *
     get_base_impl) (void *documentation,
                         const axis2_env_t *env);
     
@@ -100,53 +100,53 @@
             axis2_char_t *language);            
 };
 
-struct axis2_xml_schema_documentation
+struct xml_schema_documentation
 {
-    axis2_xml_schema_obj_t base;
-    axis2_xml_schema_documentation_ops_t *ops;
+    xml_schema_obj_t base;
+    xml_schema_documentation_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_documentation_t * AXIS2_CALL
-axis2_xml_schema_documentation_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_documentation_t * AXIS2_CALL
+xml_schema_documentation_create(const axis2_env_t *env);
 
 
 /*********************** macros ***********************************************/
 
-#define AXIS2_XML_SCHEMA_DOCUMENTATION_FREE(documentation, env) \
-      (((axis2_xml_schema_documentation_t *) documentation)->ops->\
+#define XML_SCHEMA_DOCUMENTATION_FREE(documentation, env) \
+      (((xml_schema_documentation_t *) documentation)->ops->\
             free(documentation, env))
 
-#define AXIS2_XML_SCHEMA_DOCUMENTATION_SUPER_OBJS(documentation, env) \
-      (((axis2_xml_schema_documentation_t *) documentation)->ops->\
+#define XML_SCHEMA_DOCUMENTATION_SUPER_OBJS(documentation, env) \
+      (((xml_schema_documentation_t *) documentation)->ops->\
             super_objs(documentation, env))
 
-#define AXIS2_XML_SCHEMA_DOCUMENTATION_GET_TYPE(documentation, env) \
-      (((axis2_xml_schema_documentation_t *) documentation)->ops->\
+#define XML_SCHEMA_DOCUMENTATION_GET_TYPE(documentation, env) \
+      (((xml_schema_documentation_t *) documentation)->ops->\
             GET_type(documentation, env))
 
-#define AXIS2_XML_SCHEMA_DOCUMENTATION_GET_SOURCE(documentation, env) \
-      (((axis2_xml_schema_documentation_t *) documentation)->ops->\
+#define XML_SCHEMA_DOCUMENTATION_GET_SOURCE(documentation, env) \
+      (((xml_schema_documentation_t *) documentation)->ops->\
             get_source(documentation, env))
 
-#define AXIS2_XML_SCHEMA_DOCUMENTATION_SET_SOURCE(documentation, env, source) \
-      (((axis2_xml_schema_documentation_t *) documentation)->ops->\
+#define XML_SCHEMA_DOCUMENTATION_SET_SOURCE(documentation, env, source) \
+      (((xml_schema_documentation_t *) documentation)->ops->\
             set_source(documentation, env, source))
 
-#define AXIS2_XML_SCHEMA_DOCUMENTATION_GET_MARKUP(documentation, env) \
-      (((axis2_xml_schema_documentation_t *) documentation)->ops->\
+#define XML_SCHEMA_DOCUMENTATION_GET_MARKUP(documentation, env) \
+      (((xml_schema_documentation_t *) documentation)->ops->\
             get_markup(documentation, env))
 
-#define AXIS2_XML_SCHEMA_DOCUMENTATION_SET_MARKUP(documentation, env, markup) \
-      (((axis2_xml_schema_documentation_t *) documentation)->ops->\
+#define XML_SCHEMA_DOCUMENTATION_SET_MARKUP(documentation, env, markup) \
+      (((xml_schema_documentation_t *) documentation)->ops->\
             set_markup(documentation, env, markup))
 
 
-#define AXIS2_XML_SCHEMA_DOCUMENTATION_GET_LANGUAGE(documentation, env) \
-        (((axis2_xml_schema_documentation_t*) documentation)->ops->\
+#define XML_SCHEMA_DOCUMENTATION_GET_LANGUAGE(documentation, env) \
+        (((xml_schema_documentation_t*) documentation)->ops->\
             get_language(documentation, env))
             
-#define AXIS2_XML_SCHEMA_DOCUMENTATION_SET_LANGUAGE(documentation, env, language)\
-        (((axis2_xml_schema_documentation_t *) documentation)->ops->\
+#define XML_SCHEMA_DOCUMENTATION_SET_LANGUAGE(documentation, env, language)\
+        (((xml_schema_documentation_t *) documentation)->ops->\
             set_language(documentation, env, language))            
 
 /************************ end macros ******************************************/
@@ -154,4 +154,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_DOCUMENTATION_H */
+#endif /* XML_SCHEMA_DOCUMENTATION_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_element.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_element.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_element.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_element.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_element.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_element.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_element.h Mon Jun 12 03:29:40 2006
@@ -14,50 +14,50 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_ELEMENT_H
-#define AXIS2_XML_SCHEMA_ELEMENT_H
+#ifndef XML_SCHEMA_ELEMENT_H
+#define XML_SCHEMA_ELEMENT_H
 
 /**
- * @file axis2_xml_schema_element.h
+ * @file xml_schema_element.h
  * @brief Axis2 Xml Schema Element Interface
  *          Class for elements. Represents the World Wide Web Consortium (W3C) 
  *          element element.
  */
 
-#include <axis2_xml_schema_particle.h>
+#include <xml_schema_particle.h>
 #include <axis2_qname.h>
 
-/** @defgroup axis2_xml_schema_element Xml Schema Element
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_element Xml Schema Element
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_element axis2_xml_schema_element_t;
-typedef struct axis2_xml_schema_element_ops axis2_xml_schema_element_ops_t;
-struct axis2_xml_schema;
-struct axis2_xml_schema_type_receiver;
-struct axis2_xml_schema_obj_collection;
-struct axis2_xml_schema_derivation_method;
-struct axis2_xml_schema_form;
-struct axis2_xml_schema_type;
+typedef struct xml_schema_element xml_schema_element_t;
+typedef struct xml_schema_element_ops xml_schema_element_ops_t;
+struct xml_schema;
+struct xml_schema_type_receiver;
+struct xml_schema_obj_collection;
+struct xml_schema_derivation_method;
+struct xml_schema_form;
+struct xml_schema_type;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_element_ops
+struct xml_schema_element_ops
 {
     axis2_status_t (AXIS2_CALL *
     free) (void *element,
             const axis2_env_t *env);
     
-    axis2_xml_schema_particle_t *(AXIS2_CALL *
+    xml_schema_particle_t *(AXIS2_CALL *
     get_base_impl) (
             void *element,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(void *element,
           const axis2_env_t *env);
           
@@ -65,7 +65,7 @@
     super_objs)(void *element,
                 const axis2_env_t *env);          
 
-    struct axis2_xml_schema_obj_collection *(AXIS2_CALL *
+    struct xml_schema_obj_collection *(AXIS2_CALL *
     get_constraints)(
             void *element,
             const axis2_env_t *env); 
@@ -81,7 +81,7 @@
             const axis2_env_t *env,
             axis2_char_t *default_value);
 
-    struct axis2_xml_schema_derivation_method *(AXIS2_CALL *
+    struct xml_schema_derivation_method *(AXIS2_CALL *
     get_block)(
             void *element,
             const axis2_env_t *env); 
@@ -90,19 +90,19 @@
     set_block)(
             void *element,
             const axis2_env_t *env,
-            struct axis2_xml_schema_derivation_method * block);
+            struct xml_schema_derivation_method * block);
             
 
-    struct axis2_xml_schema_derivation_method *(AXIS2_CALL *
+    struct xml_schema_derivation_method *(AXIS2_CALL *
     get_final) (void *element,
                 const axis2_env_t *env);
 
     axis2_status_t (AXIS2_CALL *
     set_final)(void *element,
                const axis2_env_t *env,
-               struct axis2_xml_schema_derivation_method *final_derivation);
+               struct xml_schema_derivation_method *final_derivation);
 
-    struct axis2_xml_schema_derivation_method *(AXIS2_CALL * 
+    struct xml_schema_derivation_method *(AXIS2_CALL * 
     get_block_resolved)(
             void *element,
             const axis2_env_t *env);
@@ -125,14 +125,14 @@
             const axis2_env_t *env); 
             
 
-    struct axis2_xml_schema_form *(AXIS2_CALL *
+    struct xml_schema_form *(AXIS2_CALL *
     get_form)(void *element,
               const axis2_env_t *env); 
 
     axis2_status_t (AXIS2_CALL *
     set_form)(void *element,
                const axis2_env_t *env,
-                struct axis2_xml_schema_form *form); 
+                struct xml_schema_form *form); 
 
     axis2_bool_t (AXIS2_CALL *
     is_abstract) (void *element,
@@ -186,7 +186,7 @@
             const axis2_env_t *env,
             axis2_qname_t *qualified_name); 
 
-    struct axis2_xml_schema_type *(AXIS2_CALL *
+    struct xml_schema_type *(AXIS2_CALL *
     get_schema_type)(
             void *element,
             const axis2_env_t *env);
@@ -195,7 +195,7 @@
     set_schema_type)(
             void *element,
             const axis2_env_t *env,
-            struct axis2_xml_schema_type *schema_type);
+            struct xml_schema_type *schema_type);
 
     axis2_qname_t *(AXIS2_CALL * 
     get_schema_type_qname)(
@@ -230,157 +230,157 @@
     set_type)(
             void *element,
             const axis2_env_t *env,
-            struct axis2_xml_schema_type *type);
+            struct xml_schema_type *type);
 
 };
 
-struct axis2_xml_schema_element
+struct xml_schema_element
 {
-    axis2_xml_schema_particle_t base;
-    axis2_xml_schema_element_ops_t *ops;
+    xml_schema_particle_t base;
+    xml_schema_element_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_element_t * AXIS2_CALL
-axis2_xml_schema_element_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_element_t * AXIS2_CALL
+xml_schema_element_create(const axis2_env_t *env);
 
 /************ macros **********************************************************/
 
-#define AXIS2_XML_SCHEMA_ELEMENT_FREE(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->free(\
+#define XML_SCHEMA_ELEMENT_FREE(element, env) \
+      (((xml_schema_element_t *) element)->ops->free(\
             element, env))
 
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_BASE_IMPL(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_base_impl(\
+#define XML_SCHEMA_ELEMENT_GET_BASE_IMPL(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_base_impl(\
             element, env))
 
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_TYPE(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_type(\
+#define XML_SCHEMA_ELEMENT_GET_TYPE(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_type(\
             element, env))
 
-#define AXIS2_XML_SCHEMA_ELEMENT_SUPER_OBJS(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->super_objs(\
+#define XML_SCHEMA_ELEMENT_SUPER_OBJS(element, env) \
+      (((xml_schema_element_t *) element)->ops->super_objs(\
             element, env))
 
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_CONSTRAINTS(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_constraints(\
+#define XML_SCHEMA_ELEMENT_GET_CONSTRAINTS(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_constraints(\
             element, env))
             
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_DEFAULT_VALUE(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_default_value(\
+#define XML_SCHEMA_ELEMENT_GET_DEFAULT_VALUE(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_default_value(\
             element, env))            
             
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_DEFAULT_VALUE(element, env, def_value) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_default_value(\
+#define XML_SCHEMA_ELEMENT_SET_DEFAULT_VALUE(element, env, def_value) \
+      (((xml_schema_element_t *) element)->ops->set_default_value(\
             element, env, def_value))            
             
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_BLOCK(element, env, block) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_block(\
+#define XML_SCHEMA_ELEMENT_SET_BLOCK(element, env, block) \
+      (((xml_schema_element_t *) element)->ops->set_block(\
             element, env, block))            
             
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_FINAL(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_final(\
+#define XML_SCHEMA_ELEMENT_GET_FINAL(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_final(\
             element, env))              
 
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_FINAL(element, env, final_derivation) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_final(\
+#define XML_SCHEMA_ELEMENT_SET_FINAL(element, env, final_derivation) \
+      (((xml_schema_element_t *) element)->ops->set_final(\
             element, env, final_derivation))            
 
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_BLOCK_RESOLVED(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_block_resolved(\
+#define XML_SCHEMA_ELEMENT_GET_BLOCK_RESOLVED(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_block_resolved(\
             element, env))
             
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_BLOCK(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_block(\
+#define XML_SCHEMA_ELEMENT_GET_BLOCK(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_block(\
             element, env))              
             
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_FIXED_VALUE(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_fixed_value(\
+#define XML_SCHEMA_ELEMENT_GET_FIXED_VALUE(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_fixed_value(\
             element, env))             
 
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_FIXED_VALUE(element, env, fixed_value) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_fixed_value(\
+#define XML_SCHEMA_ELEMENT_SET_FIXED_VALUE(element, env, fixed_value) \
+      (((xml_schema_element_t *) element)->ops->set_fixed_value(\
             element, env, fixed_value))
 
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_ELEMENT_TYPE(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_element_type(\
+#define XML_SCHEMA_ELEMENT_GET_ELEMENT_TYPE(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_element_type(\
             element, env))             
             
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_FORM(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_form(\
+#define XML_SCHEMA_ELEMENT_GET_FORM(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_form(\
             element, env))              
 
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_FORM(element, env, form) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_form(\
+#define XML_SCHEMA_ELEMENT_SET_FORM(element, env, form) \
+      (((xml_schema_element_t *) element)->ops->set_form(\
             element, env, form))             
                      
 
-#define AXIS2_XML_SCHEMA_ELEMENT_IS_ABSTRACT(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->is_abstract(\
+#define XML_SCHEMA_ELEMENT_IS_ABSTRACT(element, env) \
+      (((xml_schema_element_t *) element)->ops->is_abstract(\
             element, env))
 
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_ABSTRACT(element, env, is_abstract) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_abstract(\
+#define XML_SCHEMA_ELEMENT_SET_ABSTRACT(element, env, is_abstract) \
+      (((xml_schema_element_t *) element)->ops->set_abstract(\
             element, env, is_abstract))   
             
 
-#define AXIS2_XML_SCHEMA_ELEMENT_IS_NILLABLE(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->is_nillable(\
+#define XML_SCHEMA_ELEMENT_IS_NILLABLE(element, env) \
+      (((xml_schema_element_t *) element)->ops->is_nillable(\
             element, env))       
             
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_NILLABLE(element, env, is_nillable) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_nillable(\
+#define XML_SCHEMA_ELEMENT_SET_NILLABLE(element, env, is_nillable) \
+      (((xml_schema_element_t *) element)->ops->set_nillable(\
             element, env, is_nillable))
             
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_NAME(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_name(\
+#define XML_SCHEMA_ELEMENT_GET_NAME(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_name(\
             element, env))
             
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_NAME(element, env, name) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_name(\
+#define XML_SCHEMA_ELEMENT_SET_NAME(element, env, name) \
+      (((xml_schema_element_t *) element)->ops->set_name(\
             element, env, name)) 
 
             
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_REF_NAME(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_ref_qname(\
+#define XML_SCHEMA_ELEMENT_GET_REF_NAME(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_ref_qname(\
             element, env)) 
             
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_REF_NAME(element, env, ref_name) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_ref_qname(\
+#define XML_SCHEMA_ELEMENT_SET_REF_NAME(element, env, ref_name) \
+      (((xml_schema_element_t *) element)->ops->set_ref_qname(\
             element, env, ref_name))
             
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_QNAME(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_qname(\
+#define XML_SCHEMA_ELEMENT_GET_QNAME(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_qname(\
             element, env)) 
             
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_QNAME(element, env, qualified_name) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_qname(\
+#define XML_SCHEMA_ELEMENT_SET_QNAME(element, env, qualified_name) \
+      (((xml_schema_element_t *) element)->ops->set_qname(\
             element, env, qualified_name))
                                                                          
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_schema_type(\
+#define XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_schema_type(\
             element, env)) 
             
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_SCHEMA_TYPE(element, env, schema_type) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_schema_type(\
+#define XML_SCHEMA_ELEMENT_SET_SCHEMA_TYPE(element, env, schema_type) \
+      (((xml_schema_element_t *) element)->ops->set_schema_type(\
             element, env, schema_type))
             
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE_QNAME(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_schema_type_qname(\
+#define XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE_QNAME(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_schema_type_qname(\
             element, env)) 
             
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_SCHEMA_TYPE_QNAME(element, env, schema_type_name) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_schema_type_qname(\
+#define XML_SCHEMA_ELEMENT_SET_SCHEMA_TYPE_QNAME(element, env, schema_type_name) \
+      (((xml_schema_element_t *) element)->ops->set_schema_type_qname(\
             element, env, schema_type_name))            
         
-#define AXIS2_XML_SCHEMA_ELEMENT_GET_SUBSTITUTION_GROUP(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->get_substitution_group(\
+#define XML_SCHEMA_ELEMENT_GET_SUBSTITUTION_GROUP(element, env) \
+      (((xml_schema_element_t *) element)->ops->get_substitution_group(\
             element, env)) 
             
-#define AXIS2_XML_SCHEMA_ELEMENT_SET_SUBSTITUTION_GROUP(element, env, sub_group) \
-      (((axis2_xml_schema_element_t *) element)->ops->set_substitution_group(\
+#define XML_SCHEMA_ELEMENT_SET_SUBSTITUTION_GROUP(element, env, sub_group) \
+      (((xml_schema_element_t *) element)->ops->set_substitution_group(\
             element, env, sub_group))            
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_ELEMENT_H */
+#endif /* XML_SCHEMA_ELEMENT_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_enum.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_enum.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_enum.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_ENUM_H
-#define AXIS2_XML_SCHEMA_ENUM_H
+#ifndef XML_SCHEMA_ENUM_H
+#define XML_SCHEMA_ENUM_H
 
 /**
- * @file axis2_xml_schema_enum.h
+ * @file xml_schema_enum.h
  * @brief Axis2 Xml Schema Enum  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_enum axis2_xml_schema_enum_t;
-typedef struct axis2_xml_schema_enum_ops axis2_xml_schema_enum_ops_t;
+typedef struct xml_schema_enum xml_schema_enum_t;
+typedef struct xml_schema_enum_ops xml_schema_enum_ops_t;
 
-/** @defgroup axis2_xml_schema_enum Xml Schema Enum
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_enum Xml Schema Enum
+  * @ingroup xml_schema
   * @{
   */
 
-struct axis2_xml_schema_enum_ops
+struct xml_schema_enum_ops
 {
     axis2_status_t (AXIS2_CALL *
     free)(
@@ -56,7 +56,7 @@
             void *schema_enum,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (
             void *schema_enum,
             const axis2_env_t *env);
@@ -84,53 +84,53 @@
     
 };
 
-struct axis2_xml_schema_enum
+struct xml_schema_enum
 {
-    axis2_xml_schema_enum_ops_t *ops;
+    xml_schema_enum_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_enum_t * AXIS2_CALL
-axis2_xml_schema_enum_create(const axis2_env_t *env,
+AXIS2_EXTERN xml_schema_enum_t * AXIS2_CALL
+xml_schema_enum_create(const axis2_env_t *env,
                              axis2_char_t *value);
 
 /**
  * This method is internal to Axis2 C. It is called from Child Constructor
  */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_enum_resolve_methods(axis2_xml_schema_enum_t *schema_enum,
+xml_schema_enum_resolve_methods(xml_schema_enum_t *schema_enum,
                                       const axis2_env_t *env,
-                                      axis2_xml_schema_enum_t *schema_enum_impl,
+                                      xml_schema_enum_t *schema_enum_impl,
                                       axis2_hash_t *methods);
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_xml_schema_enum_index(axis2_char_t *value,
+xml_schema_enum_index(axis2_char_t *value,
                             const axis2_env_t *env,
                             axis2_array_list_t *values);
                             
 /***************** macros ****************************************************/                           
 
-#define AXIS2_XML_SCHEMA_ENUM_FREE(schema_enum, env) \
-      (((axis2_xml_schema_enum_t *) schema_enum)->ops->free (schema_enum, env))
+#define XML_SCHEMA_ENUM_FREE(schema_enum, env) \
+      (((xml_schema_enum_t *) schema_enum)->ops->free (schema_enum, env))
 
-#define AXIS2_XML_SCHEMA_ENUM_SUPER_OBJS(schema_enum, env) \
-      (((axis2_xml_schema_enum_t *) schema_enum)->ops->super_objs (schema_enum, env))
+#define XML_SCHEMA_ENUM_SUPER_OBJS(schema_enum, env) \
+      (((xml_schema_enum_t *) schema_enum)->ops->super_objs (schema_enum, env))
 
-#define AXIS2_XML_SCHEMA_ENUM_GET_TYPE(schema_enum, env) \
-      (((axis2_xml_schema_enum_t *) schema_enum)->ops->get_type(schema_enum, env))
+#define XML_SCHEMA_ENUM_GET_TYPE(schema_enum, env) \
+      (((xml_schema_enum_t *) schema_enum)->ops->get_type(schema_enum, env))
 
-#define AXIS2_XML_SCHEMA_ENUM_GET_VALUE(schema_enum, env) \
-      (((axis2_xml_schema_enum_t *) schema_enum)->ops->get_value \
+#define XML_SCHEMA_ENUM_GET_VALUE(schema_enum, env) \
+      (((xml_schema_enum_t *) schema_enum)->ops->get_value \
          (schema_enum, env))
 
-#define AXIS2_XML_SCHEMA_ENUM_SET_VALUE(schema_enum, env, value) \
-      (((axis2_xml_schema_enum_t *) schema_enum)->ops->set_value \
+#define XML_SCHEMA_ENUM_SET_VALUE(schema_enum, env, value) \
+      (((xml_schema_enum_t *) schema_enum)->ops->set_value \
          (schema_enum, env, value))
 
-#define AXIS2_XML_SCHEMA_ENUM_EQUALS(schema_enum, env) \
-      (((axis2_xml_schema_enum_t *) schema_enum)->ops->equals (schema_enum, env))
+#define XML_SCHEMA_ENUM_EQUALS(schema_enum, env) \
+      (((xml_schema_enum_t *) schema_enum)->ops->equals (schema_enum, env))
 
-#define AXIS2_XML_SCHEMA_ENUM_GET_VALUES(schema_enum, env) \
-      (((axis2_xml_schema_enum_t *) schema_enum)->ops->get_values \
+#define XML_SCHEMA_ENUM_GET_VALUES(schema_enum, env) \
+      (((xml_schema_enum_t *) schema_enum)->ops->get_values \
          (schema_enum, env))
 
 /**************** end macros *************************************************/
@@ -138,4 +138,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_ENUM_H */
+#endif /* XML_SCHEMA_ENUM_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_external.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_external.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_external.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_external.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_external.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_external.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_external.h Mon Jun 12 03:29:40 2006
@@ -14,36 +14,36 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_EXTERNAL_H
-#define AXIS2_XML_SCHEMA_EXTERNAL_H
+#ifndef XML_SCHEMA_EXTERNAL_H
+#define XML_SCHEMA_EXTERNAL_H
 
 /**
- * @file axis2_xml_schema_external.h
+ * @file xml_schema_external.h
  * @brief Axis2 Xml Schema Particle Interface
  *          Base class for all external types.
  */
 
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema_annotated.h>
 #include <axis2_hash.h>
 
-/** @defgroup axis2_xml_schema_external Xml Schema Particle
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_external Xml Schema Particle
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_external 
-                    axis2_xml_schema_external_t;
-typedef struct axis2_xml_schema_external_ops 
-                    axis2_xml_schema_external_ops_t;
+typedef struct xml_schema_external 
+                    xml_schema_external_t;
+typedef struct xml_schema_external_ops 
+                    xml_schema_external_ops_t;
                     
-struct axis2_xml_schema;                    
+struct xml_schema;                    
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_external_ops
+struct xml_schema_external_ops
 {
    /** 
      * Deallocate memory
@@ -53,12 +53,12 @@
     free) (void *external,
             const axis2_env_t *env);
             
-    axis2_xml_schema_annotated_t* (AXIS2_CALL *
+    xml_schema_annotated_t* (AXIS2_CALL *
     get_base_impl)(
             void *external,
             const axis2_env_t *env);            
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type)(
             void *external,
             const axis2_env_t *env);            
@@ -69,7 +69,7 @@
             void *external,
             const axis2_env_t *env);            
 
-    struct axis2_xml_schema* (AXIS2_CALL *
+    struct xml_schema* (AXIS2_CALL *
     get_schema)(
             void *external,
             const axis2_env_t *env);
@@ -78,7 +78,7 @@
     set_schema)(
             void *external,
             const axis2_env_t *env,
-            struct axis2_xml_schema* schema);
+            struct xml_schema* schema);
                 
     axis2_char_t* (AXIS2_CALL *
     get_schema_location)(
@@ -93,66 +93,66 @@
 
 };
 
-struct axis2_xml_schema_external
+struct xml_schema_external
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_external_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_external_ops_t *ops;
 };
 
 /**
  * Creates new Xml Schema external
  */
-AXIS2_EXTERN axis2_xml_schema_external_t * AXIS2_CALL
-axis2_xml_schema_external_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_external_t * AXIS2_CALL
+xml_schema_external_create(const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_xml_schema_external_t * AXIS2_CALL
-axis2_xml_schema_include_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_external_t * AXIS2_CALL
+xml_schema_include_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_external_resolve_methods(
-                                axis2_xml_schema_external_t *external,
+xml_schema_external_resolve_methods(
+                                xml_schema_external_t *external,
                                 const axis2_env_t *env,
-                                axis2_xml_schema_external_t *external_impl,
+                                xml_schema_external_t *external_impl,
                                 axis2_hash_t *methods);
 
 
-#define AXIS2_XML_SCHEMA_EXTERNAL_FREE(external, env) \
-      (((axis2_xml_schema_external_t *) external)->ops->\
+#define XML_SCHEMA_EXTERNAL_FREE(external, env) \
+      (((xml_schema_external_t *) external)->ops->\
             free(external, env))
 
-#define AXIS2_XML_SCHEMA_EXTERNAL_GET_BASE_IMPL(external, env) \
-      (((axis2_xml_schema_external_t *) external)->ops->\
+#define XML_SCHEMA_EXTERNAL_GET_BASE_IMPL(external, env) \
+      (((xml_schema_external_t *) external)->ops->\
             get_base_impl(external, env))
 
-#define AXIS2_XML_SCHEMA_EXTERNAL_SUPER_OBJS(external, env) \
-      (((axis2_xml_schema_external_t *) external)->ops->\
+#define XML_SCHEMA_EXTERNAL_SUPER_OBJS(external, env) \
+      (((xml_schema_external_t *) external)->ops->\
             super_objs(external, env))
 
-#define AXIS2_XML_SCHEMA_EXTERNAL_GET_TYPE(external, env) \
-      (((axis2_xml_schema_external_t *) external)->ops->\
+#define XML_SCHEMA_EXTERNAL_GET_TYPE(external, env) \
+      (((xml_schema_external_t *) external)->ops->\
             get_type(external, env))
 
-#define AXIS2_XML_SCHEMA_EXTERNAL_GET_SCHEMA(external, env) \
-      (((axis2_xml_schema_external_t *) external)->ops->\
+#define XML_SCHEMA_EXTERNAL_GET_SCHEMA(external, env) \
+      (((xml_schema_external_t *) external)->ops->\
             get_schema(external, env))
 
-#define AXIS2_XML_SCHEMA_EXTERNAL_SET_SCHEMA(external, env, sch) \
-      (((axis2_xml_schema_external_t *) external)->ops->\
+#define XML_SCHEMA_EXTERNAL_SET_SCHEMA(external, env, sch) \
+      (((xml_schema_external_t *) external)->ops->\
             set_schema(external, env, sch))
             
-#define AXIS2_XML_SCHEMA_EXTERNAL_GET_SCHEMA_LOCATION(external, env) \
-      (((axis2_xml_schema_external_t *) external)->ops->\
+#define XML_SCHEMA_EXTERNAL_GET_SCHEMA_LOCATION(external, env) \
+      (((xml_schema_external_t *) external)->ops->\
             get_schema_location(external, env))
 
-#define AXIS2_XML_SCHEMA_EXTERNAL_SET_SCHEMA_LOCATION(external, env, location) \
-      (((axis2_xml_schema_external_t *) external)->ops->\
+#define XML_SCHEMA_EXTERNAL_SET_SCHEMA_LOCATION(external, env, location) \
+      (((xml_schema_external_t *) external)->ops->\
             set_schema_location(external, env, location))            
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_EXTERNAL_H */
+#endif /* XML_SCHEMA_EXTERNAL_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_facet.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_facet.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_facet.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_facet.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_facet.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_facet.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_facet.h Mon Jun 12 03:29:40 2006
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_FACET_H
-#define AXIS2_XML_SCHEMA_FACET_H
+#ifndef XML_SCHEMA_FACET_H
+#define XML_SCHEMA_FACET_H
 
 /**
- * @file axis2_xml_schema_facet.h
+ * @file xml_schema_facet.h
  * @brief Axis2 Xml Schema Facet Interface
  *          Abstract class for all facets that are used when simple types are
  *          derived by restriction.
  */
 
-#include <axis2_xml_schema_annotated.h>
-#include <axis2_xml_schema_defines.h>
+#include <xml_schema_annotated.h>
+#include <xml_schema_defines.h>
 #include <axiom_element.h>
 #include <axiom_node.h>
 #include <axis2_hash.h>
 
-/** @defgroup axis2_xml_schema_facet Xml Schema Facet
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_facet Xml Schema Facet
+  * @ingroup xml_schema
   * @{
   */
 #ifdef __cplusplus
@@ -39,12 +39,12 @@
 {
 #endif
 
-typedef struct axis2_xml_schema_facet 
-                    axis2_xml_schema_facet_t;
-typedef struct axis2_xml_schema_facet_ops 
-                    axis2_xml_schema_facet_ops_t;
+typedef struct xml_schema_facet 
+                    xml_schema_facet_t;
+typedef struct xml_schema_facet_ops 
+                    xml_schema_facet_ops_t;
 
-struct axis2_xml_schema_facet_ops
+struct xml_schema_facet_ops
 {
    /** 
      * Deallocate memory
@@ -54,11 +54,11 @@
     free) (void *facet,
             const axis2_env_t *env);
 
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl) (void *facet,
                     const axis2_env_t *env);
     
-    axis2_xml_schema_types_t (AXIS2_CALL*
+    xml_schema_types_t (AXIS2_CALL*
     get_type)(void *facet,
           const axis2_env_t *env);
           
@@ -91,61 +91,61 @@
     
 };
 
-struct axis2_xml_schema_facet
+struct xml_schema_facet
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_facet_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_facet_ops_t *ops;
 };
 
 /**
  * Creates new Xml Schema Facet
  */
-AXIS2_EXTERN axis2_xml_schema_facet_t * AXIS2_CALL
-axis2_xml_schema_facet_create(const axis2_env_t *env,
+AXIS2_EXTERN xml_schema_facet_t * AXIS2_CALL
+xml_schema_facet_create(const axis2_env_t *env,
                               axis2_char_t *value,
                               axis2_bool_t fixed,
-                              axis2_xml_schema_types_t type);
+                              xml_schema_types_t type);
 
-AXIS2_EXTERN axis2_xml_schema_facet_t * AXIS2_CALL
-axis2_xml_schema_facet_construct(const axis2_env_t *env,
+AXIS2_EXTERN xml_schema_facet_t * AXIS2_CALL
+xml_schema_facet_construct(const axis2_env_t *env,
                                  axiom_node_t *node);
                                                                  
 /************************* macros *********************************************/
 
-#define AXIS2_XML_SCHEMA_FACET_FREE(facet, env) \
-      (((axis2_xml_schema_facet_t *) facet)->ops->\
+#define XML_SCHEMA_FACET_FREE(facet, env) \
+      (((xml_schema_facet_t *) facet)->ops->\
             free(facet, env))
 
-#define AXIS2_XML_SCHEMA_FACET_GET_BASE_IMPL(facet, env) \
-      (((axis2_xml_schema_facet_t *) facet)->ops->\
+#define XML_SCHEMA_FACET_GET_BASE_IMPL(facet, env) \
+      (((xml_schema_facet_t *) facet)->ops->\
             get_base_impl(facet, env))
 
-#define AXIS2_XML_SCHEMA_FACET_GET_TYPE(facet, env) \
-      (((axis2_xml_schema_facet_t *) facet)->ops->\
+#define XML_SCHEMA_FACET_GET_TYPE(facet, env) \
+      (((xml_schema_facet_t *) facet)->ops->\
             get_type(facet, env))
 
-#define AXIS2_XML_SCHEMA_FACET_SUPER_OBJS(facet, env) \
-        (((axis2_xml_schema_facet_t *) facet)->ops->\
+#define XML_SCHEMA_FACET_SUPER_OBJS(facet, env) \
+        (((xml_schema_facet_t *) facet)->ops->\
             super_objs(facet, env))
 
-#define AXIS2_XML_SCHEMA_FACET_IS_FIXED(facet, env) \
-      (((axis2_xml_schema_facet_t *) facet)->ops->\
+#define XML_SCHEMA_FACET_IS_FIXED(facet, env) \
+      (((xml_schema_facet_t *) facet)->ops->\
             is_fixed(facet, env))
 
-#define AXIS2_XML_SCHEMA_FACET_SET_FIXED(facet, env, fixed) \
-      (((axis2_xml_schema_facet_t *) facet)->ops->\
+#define XML_SCHEMA_FACET_SET_FIXED(facet, env, fixed) \
+      (((xml_schema_facet_t *) facet)->ops->\
             set_fixed(facet, env, fixed))
 
-#define AXIS2_XML_SCHEMA_FACET_GET_VALUE(facet, env) \
-      (((axis2_xml_schema_facet_t *) facet)->ops->\
+#define XML_SCHEMA_FACET_GET_VALUE(facet, env) \
+      (((xml_schema_facet_t *) facet)->ops->\
             get_value(facet, env))
 
-#define AXIS2_XML_SCHEMA_FACET_SET_VALUE(facet, env, value) \
-      (((axis2_xml_schema_facet_t *) facet)->ops->\
+#define XML_SCHEMA_FACET_SET_VALUE(facet, env, value) \
+      (((xml_schema_facet_t *) facet)->ops->\
             set_value(facet, env, value))
             
-#define AXIS2_XML_SCHEMA_FACET_SET_FACET_TYPE(facet, env, facet_type) \
-        (((axis2_xml_schema_facet_t *) facet)->ops->\
+#define XML_SCHEMA_FACET_SET_FACET_TYPE(facet, env, facet_type) \
+        (((xml_schema_facet_t *) facet)->ops->\
             set_facet_type(facet, env, facet_type))
             
 /*************************** macros ************************************************/
@@ -153,4 +153,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_FACET_H */
+#endif /* XML_SCHEMA_FACET_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_form.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_form.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_form.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_form.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_form.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_form.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_form.h Mon Jun 12 03:29:40 2006
@@ -14,38 +14,38 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_FORM_H
-#define AXIS2_XML_SCHEMA_FORM_H
+#ifndef XML_SCHEMA_FORM_H
+#define XML_SCHEMA_FORM_H
 
 /**
- * @file axis2_xml_schema_form.h
+ * @file xml_schema_form.h
  * @brief Axis2 Xml Schema Form Interface
  *          Indicates if attributes or elements need to be qualified or left 
  *          unqualified.
  *
  */
 
-#include <axis2_xml_schema_defines.h>
-#include <axis2_xml_schema_enum.h>
+#include <xml_schema_defines.h>
+#include <xml_schema_enum.h>
 
-/** @defgroup axis2_xml_schema_form Xml Schema Form
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_form Xml Schema Form
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_form axis2_xml_schema_form_t;
-typedef struct axis2_xml_schema_form_ops axis2_xml_schema_form_ops_t;
+typedef struct xml_schema_form xml_schema_form_t;
+typedef struct xml_schema_form_ops xml_schema_form_ops_t;
 
-#define AXIS2_XML_SCHEMA_FORM_QUALIFIED "qualified"
-#define AXIS2_XML_SCHEMA_FORM_UNQUALIFIED "unqualified"
-#define AXIS2_XML_SCHEMA_FORM_NONE "none"
+#define XML_SCHEMA_FORM_QUALIFIED "qualified"
+#define XML_SCHEMA_FORM_UNQUALIFIED "unqualified"
+#define XML_SCHEMA_FORM_NONE "none"
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_form_ops
+struct xml_schema_form_ops
 {
     axis2_status_t (AXIS2_CALL *
     free) (void *form,
@@ -55,11 +55,11 @@
     super_objs) (void *form,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (void *form,
             const axis2_env_t *env);
 
-    axis2_xml_schema_enum_t *(AXIS2_CALL *
+    xml_schema_enum_t *(AXIS2_CALL *
     get_base_impl) (void *form,
                     const axis2_env_t *env);
     
@@ -69,35 +69,35 @@
     
 };
 
-struct axis2_xml_schema_form
+struct xml_schema_form
 {
-    axis2_xml_schema_enum_t base;
-    axis2_xml_schema_form_ops_t *ops;
+    xml_schema_enum_t base;
+    xml_schema_form_ops_t *ops;
 };
 
-AXIS2_EXTERN axis2_xml_schema_form_t * AXIS2_CALL
-axis2_xml_schema_form_create(const axis2_env_t *env,
+AXIS2_EXTERN xml_schema_form_t * AXIS2_CALL
+xml_schema_form_create(const axis2_env_t *env,
                                     axis2_char_t* value);
 
 /***************** Macros ************************************************/
 
-#define AXIS2_XML_SCHEMA_FORM_FREE(form, env) \
-      (((axis2_xml_schema_form_t *) form)->ops->free(form, env))
+#define XML_SCHEMA_FORM_FREE(form, env) \
+      (((xml_schema_form_t *) form)->ops->free(form, env))
 
-#define AXIS2_XML_SCHEMA_FORM_SUPER_OBJS(form, env) \
-      (((axis2_xml_schema_form_t *) form)->ops->super_objs(form, env))
+#define XML_SCHEMA_FORM_SUPER_OBJS(form, env) \
+      (((xml_schema_form_t *) form)->ops->super_objs(form, env))
 
-#define AXIS2_XML_SCHEMA_FORM_GET_TYPE(form, env) \
-      (((axis2_xml_schema_form_t *) form)->ops->type(form, env))
+#define XML_SCHEMA_FORM_GET_TYPE(form, env) \
+      (((xml_schema_form_t *) form)->ops->type(form, env))
 
-#define AXIS2_XML_SCHEMA_FORM_GET_BASE_IMPL(form, env) \
-      (((axis2_xml_schema_form_t *) form)->ops->get_base_impl(form, env))
+#define XML_SCHEMA_FORM_GET_BASE_IMPL(form, env) \
+      (((xml_schema_form_t *) form)->ops->get_base_impl(form, env))
 
-#define AXIS2_XML_SCHEMA_FORM_GET_VALUES(form, env) \
-      (((axis2_xml_schema_form_t *) form)->ops->values(form, env))
+#define XML_SCHEMA_FORM_GET_VALUES(form, env) \
+      (((xml_schema_form_t *) form)->ops->values(form, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_FORM_H */
+#endif /* XML_SCHEMA_FORM_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_group.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_group.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_group.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_group.h Mon Jun 12 03:29:40 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_GROUP_H
-#define AXIS2_XML_SCHEMA_GROUP_H
+#ifndef XML_SCHEMA_GROUP_H
+#define XML_SCHEMA_GROUP_H
 
 /**
- * @file axis2_xml_schema_group.h
+ * @file xml_schema_group.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,25 +26,25 @@
  *          Represents the World Wide Web Consortium (W3C) group element.
  */
 
-#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_group Xml Schema Group
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_group Xml Schema Group
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_group axis2_xml_schema_group_t;
-typedef struct axis2_xml_schema_group_ops axis2_xml_schema_group_ops_t;
-struct axis2_xml_schema_group_base;
+typedef struct xml_schema_group xml_schema_group_t;
+typedef struct xml_schema_group_ops xml_schema_group_ops_t;
+struct xml_schema_group_base;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_group_ops
+struct xml_schema_group_ops
 {
    /** 
      * Deallocate memory
@@ -58,11 +58,11 @@
     super_objs) (void *group,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (void *group,
             const axis2_env_t *env);
 
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl) (void *group,
                     const axis2_env_t *env);
 
@@ -75,63 +75,63 @@
                     const axis2_env_t *env,
                     axis2_char_t *name);
     
-    struct axis2_xml_schema_group_base *(AXIS2_CALL *
+    struct xml_schema_group_base *(AXIS2_CALL *
     get_particle)(void *group,
                 const axis2_env_t *env);
     
     axis2_status_t (AXIS2_CALL *
     set_particle)(void *group,
                     const axis2_env_t *env,
-                    struct axis2_xml_schema_group_base *particle);
+                    struct xml_schema_group_base *particle);
 };
 
-struct axis2_xml_schema_group
+struct xml_schema_group
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_group_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_group_ops_t *ops;
 };
 
 /**
  * Creates new Xml Schema Group
  */
-AXIS2_EXTERN axis2_xml_schema_group_t * AXIS2_CALL
-axis2_xml_schema_group_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_group_t * AXIS2_CALL
+xml_schema_group_create(const axis2_env_t *env);
 
 /**************************** Macros *************************************/
-#define AXIS2_XML_SCHEMA_GROUP_FREE(group, env) \
-      (((axis2_xml_schema_group_t *) group)->ops->\
+#define XML_SCHEMA_GROUP_FREE(group, env) \
+      (((xml_schema_group_t *) group)->ops->\
             free(group, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_SUPER_OBJS(group, env) \
-      (((axis2_xml_schema_group_t *) group)->ops->\
+#define XML_SCHEMA_GROUP_SUPER_OBJS(group, env) \
+      (((xml_schema_group_t *) group)->ops->\
             super_objs(group, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_GET_TYPE(group, env) \
-      (((axis2_xml_schema_group_t *) group)->ops->\
+#define XML_SCHEMA_GROUP_GET_TYPE(group, env) \
+      (((xml_schema_group_t *) group)->ops->\
             get_type(group, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_GET_BASE_IMPL(group, env) \
-      (((axis2_xml_schema_group_t *) group)->ops->\
+#define XML_SCHEMA_GROUP_GET_BASE_IMPL(group, env) \
+      (((xml_schema_group_t *) group)->ops->\
             get_base_impl(group, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_GET_NAME(group, env) \
-      (((axis2_xml_schema_group_t *) group)->ops->\
+#define XML_SCHEMA_GROUP_GET_NAME(group, env) \
+      (((xml_schema_group_t *) group)->ops->\
             get_name(group, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_SET_NAME(group, env, name) \
-      (((axis2_xml_schema_group_t *) group)->ops->\
+#define XML_SCHEMA_GROUP_SET_NAME(group, env, name) \
+      (((xml_schema_group_t *) group)->ops->\
             set_name(group, env, name))
 
-#define AXIS2_XML_SCHEMA_GROUP_GET_PARTICLE(group, env) \
-      (((axis2_xml_schema_group_t *) group)->ops->\
+#define XML_SCHEMA_GROUP_GET_PARTICLE(group, env) \
+      (((xml_schema_group_t *) group)->ops->\
             get_particle(group, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_SET_PARTICLE(group, env, particle) \
-      (((axis2_xml_schema_group_t *) group)->ops->\
+#define XML_SCHEMA_GROUP_SET_PARTICLE(group, env, particle) \
+      (((xml_schema_group_t *) group)->ops->\
             set_particle(group, env, particle))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_GROUP_H */
+#endif /* XML_SCHEMA_GROUP_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_group_base.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group_base.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_group_base.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_group_base.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group_base.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group_base.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_group_base.h Mon Jun 12 03:29:40 2006
@@ -14,37 +14,37 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_GROUP_BASE_H
-#define AXIS2_XML_SCHEMA_GROUP_BASE_H
+#ifndef XML_SCHEMA_GROUP_BASE_H
+#define XML_SCHEMA_GROUP_BASE_H
 
 /**
- * @file axis2_xml_schema_group_base.h
+ * @file xml_schema_group_base.h
  * @brief Axis2 Xml Schema Group Base Interface
  *          An abstract class for xml_schema_choice, xml_schema_all, or 
  *          xml_schema_sequence.
  *
  */
 
-#include <axis2_xml_schema_defines.h>
-#include <axis2_xml_schema_particle.h>
-#include <axis2_xml_schema_obj_collection.h>
+#include <xml_schema_defines.h>
+#include <xml_schema_particle.h>
+#include <xml_schema_obj_collection.h>
 
-/** @defgroup axis2_xml_schema_group_base Xml Schema Group Base
-  * @ingroup axis2_xml_schema
+/** @defgroup xml_schema_group_base Xml Schema Group Base
+  * @ingroup xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_group_base 
-                    axis2_xml_schema_group_base_t;
-typedef struct axis2_xml_schema_group_base_ops 
-                    axis2_xml_schema_group_base_ops_t;
+typedef struct xml_schema_group_base 
+                    xml_schema_group_base_t;
+typedef struct xml_schema_group_base_ops 
+                    xml_schema_group_base_ops_t;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_group_base_ops
+struct xml_schema_group_base_ops
 {
    /** 
      * Deallocate memory
@@ -58,19 +58,19 @@
     super_objs) (void *group_base,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (void *group_base,
             const axis2_env_t *env);
 
-    axis2_xml_schema_particle_t *(AXIS2_CALL *
+    xml_schema_particle_t *(AXIS2_CALL *
     get_base_impl) (void *group_base,
                     const axis2_env_t *env);
     
-    axis2_xml_schema_obj_collection_t *(AXIS2_CALL *
+    xml_schema_obj_collection_t *(AXIS2_CALL *
     get_items)(void *group_base,
                     const axis2_env_t *env);
     /**
-     * only valid if the type is AXIS2_XML_SCHEMA_SEQUENCE
+     * only valid if the type is XML_SCHEMA_SEQUENCE
      */
     axis2_status_t (AXIS2_CALL *
     to_string)(void *group_base,
@@ -81,43 +81,43 @@
 
 };
 
-struct axis2_xml_schema_group_base
+struct xml_schema_group_base
 {
-    axis2_xml_schema_particle_t base;
-    axis2_xml_schema_group_base_ops_t *ops;
+    xml_schema_particle_t base;
+    xml_schema_group_base_ops_t *ops;
 };
 
 
-AXIS2_EXTERN axis2_xml_schema_group_base_t * AXIS2_CALL
-axis2_xml_schema_group_base_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_group_base_t * AXIS2_CALL
+xml_schema_group_base_create(const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_xml_schema_group_base_t * AXIS2_CALL
-axis2_xml_schema_all_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_group_base_t * AXIS2_CALL
+xml_schema_all_create(const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_xml_schema_group_base_t * AXIS2_CALL
-axis2_xml_schema_sequence_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_group_base_t * AXIS2_CALL
+xml_schema_sequence_create(const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_xml_schema_group_base_t * AXIS2_CALL
-axis2_xml_schema_choice_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_group_base_t * AXIS2_CALL
+xml_schema_choice_create(const axis2_env_t *env);
 
 /********************** macros ***********************************************/
-#define AXIS2_XML_SCHEMA_GROUP_BASE_FREE(group_base, env) \
-      (((axis2_xml_schema_group_base_t *) group_base)->ops->free(group_base, env))
+#define XML_SCHEMA_GROUP_BASE_FREE(group_base, env) \
+      (((xml_schema_group_base_t *) group_base)->ops->free(group_base, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_BASE_SUPER_OBJS(group_base, env) \
-      (((axis2_xml_schema_group_base_t *) group_base)->ops->super_objs(group_base, env))
+#define XML_SCHEMA_GROUP_BASE_SUPER_OBJS(group_base, env) \
+      (((xml_schema_group_base_t *) group_base)->ops->super_objs(group_base, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_BASE_GET_TYPE(group_base, env) \
-      (((axis2_xml_schema_group_base_t *) group_base)->ops->get_type(group_base, env))
+#define XML_SCHEMA_GROUP_BASE_GET_TYPE(group_base, env) \
+      (((xml_schema_group_base_t *) group_base)->ops->get_type(group_base, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_BASE_GET_BASE_IMPL(group_base, env) \
-      (((axis2_xml_schema_group_base_t *) group_base)->ops->get_base_impl(group_base, env))
+#define XML_SCHEMA_GROUP_BASE_GET_BASE_IMPL(group_base, env) \
+      (((xml_schema_group_base_t *) group_base)->ops->get_base_impl(group_base, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_BASE_GET_ITEMS(group_base, env) \
-      (((axis2_xml_schema_group_base_t *) group_base)->ops->get_items(group_base, env))
+#define XML_SCHEMA_GROUP_BASE_GET_ITEMS(group_base, env) \
+      (((xml_schema_group_base_t *) group_base)->ops->get_items(group_base, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_BASE_TO_STRING(group_base, env, prefix, tab) \
-        (((axis2_xml_schema_group_base_t *) group_base)->ops->to_string(group_base, \
+#define XML_SCHEMA_GROUP_BASE_TO_STRING(group_base, env, prefix, tab) \
+        (((xml_schema_group_base_t *) group_base)->ops->to_string(group_base, \
             env, prefix, tab))
 
 /*********************** end macros ********************************************/
@@ -125,4 +125,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_GROUP_BASE_H */
+#endif /* XML_SCHEMA_GROUP_BASE_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_group_ref.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group_ref.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_group_ref.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_group_ref.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group_ref.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_group_ref.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_group_ref.h Mon Jun 12 03:29:40 2006
@@ -14,37 +14,37 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_GROUP_REF_H
-#define AXIS2_XML_SCHEMA_GROUP_REF_H
+#ifndef XML_SCHEMA_GROUP_REF_H
+#define XML_SCHEMA_GROUP_REF_H
 
 /**
- * @file axis2_xml_schema_group_ref.h
+ * @file xml_schema_group_ref.h
  * @brief Axis2 Xml Schema Group Ref Interface
  *          Class used within complex types that defines the reference to
  *          groups defined at the schema level. Represents the World Wide
  *          Web Consortium (W3C) group element with ref attribute.
  */
 
-#include <axis2_xml_schema_defines.h>
-#include <axis2_xml_schema_particle.h>
+#include <xml_schema_defines.h>
+#include <xml_schema_particle.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 
-/** @defgroup_ref axis2_xml_schema_group_ref Xml Schema Group Ref
-  * @ingroup_ref axis2_xml_schema
+/** @defgroup_ref xml_schema_group_ref Xml Schema Group Ref
+  * @ingroup_ref xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_group_ref axis2_xml_schema_group_ref_t;
-typedef struct axis2_xml_schema_group_ref_ops axis2_xml_schema_group_ref_ops_t;
-struct axis2_xml_schema_group_base;
+typedef struct xml_schema_group_ref xml_schema_group_ref_t;
+typedef struct xml_schema_group_ref_ops xml_schema_group_ref_ops_t;
+struct xml_schema_group_base;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_group_ref_ops
+struct xml_schema_group_ref_ops
 {
     axis2_status_t (AXIS2_CALL *
     free) (void *group_ref,
@@ -55,12 +55,12 @@
             void *group_ref,
             const axis2_env_t *env);
 
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (
             void *group_ref,
             const axis2_env_t *env);
 
-    axis2_xml_schema_particle_t *(AXIS2_CALL *
+    xml_schema_particle_t *(AXIS2_CALL *
     get_base_impl) (void *group_ref,
                     const axis2_env_t *env);
 
@@ -85,47 +85,47 @@
     
 };
 
-struct axis2_xml_schema_group_ref
+struct xml_schema_group_ref
 {
-    axis2_xml_schema_particle_t base;
-    axis2_xml_schema_group_ref_ops_t *ops;
+    xml_schema_particle_t base;
+    xml_schema_group_ref_ops_t *ops;
 };
 
 /**
  * Creates new Xml Schema Group Ref
  */
-AXIS2_EXTERN axis2_xml_schema_group_ref_t * AXIS2_CALL
-axis2_xml_schema_group_ref_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_group_ref_t * AXIS2_CALL
+xml_schema_group_ref_create(const axis2_env_t *env);
 
 /******************* Macros ******************************************************/ 
-#define AXIS2_XML_SCHEMA_GROUP_REF_FREE(group_ref, env) \
-      (((axis2_xml_schema_group_ref_t *) group_ref)->ops->\
+#define XML_SCHEMA_GROUP_REF_FREE(group_ref, env) \
+      (((xml_schema_group_ref_t *) group_ref)->ops->\
             free(group_ref, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_REF_SUPER_OBJS(group_ref, env) \
-      (((axis2_xml_schema_group_ref_t *) group_ref)->ops->super_objs(group_ref, env))
+#define XML_SCHEMA_GROUP_REF_SUPER_OBJS(group_ref, env) \
+      (((xml_schema_group_ref_t *) group_ref)->ops->super_objs(group_ref, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_REF_GET_TYPE(group_ref, env) \
-      (((axis2_xml_schema_group_ref_t *) group_ref)->ops->get_type(group_ref, env))
+#define XML_SCHEMA_GROUP_REF_GET_TYPE(group_ref, env) \
+      (((xml_schema_group_ref_t *) group_ref)->ops->get_type(group_ref, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_REF_GET_BASE_IMPL(group_ref, env) \
-      (((axis2_xml_schema_group_ref_t *) group_ref)->ops->\
+#define XML_SCHEMA_GROUP_REF_GET_BASE_IMPL(group_ref, env) \
+      (((xml_schema_group_ref_t *) group_ref)->ops->\
             get_base_impl(group_ref, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_REF_GET_REF_QNAME(group_ref, env) \
-      (((axis2_xml_schema_group_ref_t *) group_ref)->ops->\
+#define XML_SCHEMA_GROUP_REF_GET_REF_QNAME(group_ref, env) \
+      (((xml_schema_group_ref_t *) group_ref)->ops->\
             get_ref_qname(group_ref, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_REF_SET_REF_QNAME(group_ref, env, ref_qname) \
-      (((axis2_xml_schema_group_ref_t *) group_ref)->ops->\
+#define XML_SCHEMA_GROUP_REF_SET_REF_QNAME(group_ref, env, ref_qname) \
+      (((xml_schema_group_ref_t *) group_ref)->ops->\
             set_ref_qname(group_ref, env, ref_qname))
 
-#define AXIS2_XML_SCHEMA_GROUP_REF_GET_PARTICLE(group_ref, env) \
-      (((axis2_xml_schema_group_ref_t *) group_ref)->ops->\
+#define XML_SCHEMA_GROUP_REF_GET_PARTICLE(group_ref, env) \
+      (((xml_schema_group_ref_t *) group_ref)->ops->\
             get_particle(group_ref, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_REF_SET_PARTICLE(group_ref, env, particle) \
-      (((axis2_xml_schema_group_ref_t *) group_ref)->ops->\
+#define XML_SCHEMA_GROUP_REF_SET_PARTICLE(group_ref, env, particle) \
+      (((xml_schema_group_ref_t *) group_ref)->ops->\
             set_particle(group_ref, env, particle))
 
 /*************************** end macros ****************************************/
@@ -134,4 +134,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_GROUP_REF_H */
+#endif /* XML_SCHEMA_GROUP_REF_H */

Copied: webservices/axis2/trunk/c/xml_schema/include/xml_schema_identity_constraint.h (from r413615, webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_identity_constraint.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_identity_constraint.h?p2=webservices/axis2/trunk/c/xml_schema/include/xml_schema_identity_constraint.h&p1=webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_identity_constraint.h&r1=413615&r2=413626&rev=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/axis2_xml_schema_identity_constraint.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_identity_constraint.h Mon Jun 12 03:29:40 2006
@@ -14,38 +14,38 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_H
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_H
+#ifndef XML_SCHEMA_IDENTITY_CONSTRAINT_H
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_H
 
 /**
- * @file axis2_xml_schema_identity_constraint.h
+ * @file xml_schema_identity_constraint.h
  * @brief Axis2 Xml Schema Identity Constraint Interface
  *          Class for the identity constraints: key, keyref, and unique elements.
  */
 
-#include <axis2_xml_schema_annotated.h>
+#include <xml_schema_annotated.h>
 #include <axis2_hash.h>
 #include <axis2_qname.h>
 
-/** @defidentity_constraint axis2_xml_schema_identity_constraint Xml Schema 
+/** @defidentity_constraint xml_schema_identity_constraint Xml Schema 
   *  Identity Constraint
-  * @inidentity_constraint axis2_xml_schema
+  * @inidentity_constraint xml_schema
   * @{
   */
 
-typedef struct axis2_xml_schema_identity_constraint 
-        axis2_xml_schema_identity_constraint_t;
-typedef struct axis2_xml_schema_identity_constraint_ops 
-        axis2_xml_schema_identity_constraint_ops_t;
-struct axis2_xml_schema_xpath;
-struct axis2_xml_schema_obj_collection;
+typedef struct xml_schema_identity_constraint 
+        xml_schema_identity_constraint_t;
+typedef struct xml_schema_identity_constraint_ops 
+        xml_schema_identity_constraint_ops_t;
+struct xml_schema_xpath;
+struct xml_schema_obj_collection;
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-struct axis2_xml_schema_identity_constraint_ops
+struct xml_schema_identity_constraint_ops
 {
    /** 
      * Deallocate memory
@@ -55,7 +55,7 @@
     free) (void *id_constr,
             const axis2_env_t *env);
 
-    axis2_xml_schema_annotated_t *(AXIS2_CALL *
+    xml_schema_annotated_t *(AXIS2_CALL *
     get_base_impl) (void *id_constr,
                     const axis2_env_t *env);
                     
@@ -64,7 +64,7 @@
                 const axis2_env_t *env);
                 
                         
-    axis2_xml_schema_types_t (AXIS2_CALL *
+    xml_schema_types_t (AXIS2_CALL *
     get_type) (void *id_constr,
             const axis2_env_t *env);   
         
@@ -78,7 +78,7 @@
                const axis2_env_t *env,
                axis2_qname_t *refer);
 
-    struct axis2_xml_schema_obj_collection *(AXIS2_CALL *
+    struct xml_schema_obj_collection *(AXIS2_CALL *
     get_fields)(void *id_constr,
                 const axis2_env_t *env);
 
@@ -91,82 +91,82 @@
                     const axis2_env_t *env,
                     axis2_char_t *name);
     
-    struct axis2_xml_schema_xpath *(AXIS2_CALL *
+    struct xml_schema_xpath *(AXIS2_CALL *
     get_selector)(void *id_constr,
                     const axis2_env_t *env);
     
     axis2_status_t (AXIS2_CALL *
     set_selector)(void *id_constr,
                     const axis2_env_t *env,
-                    struct axis2_xml_schema_xpath *selector);
+                    struct xml_schema_xpath *selector);
 };
 
-struct axis2_xml_schema_identity_constraint
+struct xml_schema_identity_constraint
 {
-    axis2_xml_schema_annotated_t base;
-    axis2_xml_schema_identity_constraint_ops_t *ops;
+    xml_schema_annotated_t base;
+    xml_schema_identity_constraint_ops_t *ops;
 };
 
 /**
  * Creates new Xml Schema Identity Constraint
  */
-AXIS2_EXTERN axis2_xml_schema_identity_constraint_t * AXIS2_CALL
-axis2_xml_schema_identity_constraint_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_identity_constraint_t * AXIS2_CALL
+xml_schema_identity_constraint_create(const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_xml_schema_identity_constraint_t * AXIS2_CALL
-axis2_xml_schema_unique_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_identity_constraint_t * AXIS2_CALL
+xml_schema_unique_create(const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_xml_schema_identity_constraint_t * AXIS2_CALL
-axis2_xml_schema_keyref_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_identity_constraint_t * AXIS2_CALL
+xml_schema_keyref_create(const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_xml_schema_identity_constraint_t * AXIS2_CALL
-axis2_xml_schema_key_create(const axis2_env_t *env);
+AXIS2_EXTERN xml_schema_identity_constraint_t * AXIS2_CALL
+xml_schema_key_create(const axis2_env_t *env);
 
 /**************** Macros *****************************************************/        
 
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_FREE(id_constr, env) \
-      (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_FREE(id_constr, env) \
+      (((xml_schema_identity_constraint_t *) id_constr)->ops->\
             free(id_constr, env))
 
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_GET_BASE_IMPL(id_constr, env) \
-      (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_GET_BASE_IMPL(id_constr, env) \
+      (((xml_schema_identity_constraint_t *) id_constr)->ops->\
             get_base_impl(id_constr, env))
 
 
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_GET_TYPE(id_constr, env) \
-      (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_GET_TYPE(id_constr, env) \
+      (((xml_schema_identity_constraint_t *) id_constr)->ops->\
             get_type(id_constr, env))
 
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_SUPER_OBJS(id_constr, env) \
-      (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_SUPER_OBJS(id_constr, env) \
+      (((xml_schema_identity_constraint_t *) id_constr)->ops->\
             super_objs(id_constr, env))
 
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_GET_REFER(id_constr, env) \
-      (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_GET_REFER(id_constr, env) \
+      (((xml_schema_identity_constraint_t *) id_constr)->ops->\
             get_refer(id_constr, env))
             
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_SET_REFER(id_constr, env, refer) \
-      (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_SET_REFER(id_constr, env, refer) \
+      (((xml_schema_identity_constraint_t *) id_constr)->ops->\
             set_refer(id_constr, env, refer))            
 
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_GET_FIELDS(id_constr, env) \
-      (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_GET_FIELDS(id_constr, env) \
+      (((xml_schema_identity_constraint_t *) id_constr)->ops->\
             get_fields(id_constr, env))
 
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_GET_NAME(id_constr, env) \
-      (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_GET_NAME(id_constr, env) \
+      (((xml_schema_identity_constraint_t *) id_constr)->ops->\
             get_name(id_constr, env))
 
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_SET_NAME(id_constr, env, name) \
-      (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_SET_NAME(id_constr, env, name) \
+      (((xml_schema_identity_constraint_t *) id_constr)->ops->\
             set_name(id_constr, env, name))
 
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_GET_SELECTOR(id_constr, env) \
-      (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_GET_SELECTOR(id_constr, env) \
+      (((xml_schema_identity_constraint_t *) id_constr)->ops->\
             get_selector(id_constr, env))
 
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_SET_SELECTOR(id_constr, env, selector) \
-      (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
+#define XML_SCHEMA_IDENTITY_CONSTRAINT_SET_SELECTOR(id_constr, env, selector) \
+      (((xml_schema_identity_constraint_t *) id_constr)->ops->\
             set_selector(id_constr, env, selector))
 
 /********************** macros **************************************************/
@@ -174,4 +174,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_H */
+#endif /* XML_SCHEMA_IDENTITY_CONSTRAINT_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