You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/06/12 12:29:46 UTC

svn commit: r413626 [16/18] - in /webservices/axis2/trunk/c/xml_schema: include/ samples/ src/ test/

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c?rev=413626&r1=413625&r2=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c Mon Jun 12 03:29:40 2006
@@ -14,60 +14,60 @@
  * limitations under the License.
  */
 
-#include <axis2_xml_schema_simple_type_content.h>
+#include <xml_schema_simple_type_content.h>
 #include <axis2_utils.h>
 
-typedef struct axis2_xml_schema_simple_type_content_impl 
-                    axis2_xml_schema_simple_type_content_impl_t;
+typedef struct xml_schema_simple_type_content_impl 
+                    xml_schema_simple_type_content_impl_t;
 
 /** 
  * @brief Other Extension Struct Impl
  *   Axis2 Other Extension  
  */ 
-struct axis2_xml_schema_simple_type_content_impl
+struct xml_schema_simple_type_content_impl
 {
-    axis2_xml_schema_simple_type_content_t sim_type_cont;
+    xml_schema_simple_type_content_t sim_type_cont;
     
-    axis2_xml_schema_annotated_t *annotated;
+    xml_schema_annotated_t *annotated;
 
     axis2_hash_t *methods;
 
     axis2_hash_t *ht_super; 
     
-    axis2_xml_schema_types_t obj_type;   
+    xml_schema_types_t obj_type;   
 };
 
 #define AXIS2_INTF_TO_IMPL(sim_type_cont) \
-        ((axis2_xml_schema_simple_type_content_impl_t *) sim_type_cont)
+        ((xml_schema_simple_type_content_impl_t *) sim_type_cont)
         
 /*************** function prototypes *****************************************/
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_simple_type_content_free(void *sim_type_cont,
+xml_schema_simple_type_content_free(void *sim_type_cont,
                         const axis2_env_t *env);
 
-axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_simple_type_content_get_base_impl(void *sim_type_cont,
+xml_schema_annotated_t *AXIS2_CALL
+xml_schema_simple_type_content_get_base_impl(void *sim_type_cont,
                                         const axis2_env_t *env);
 
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_content_get_type(void *sim_type_cont,
+xml_schema_types_t AXIS2_CALL
+xml_schema_simple_type_content_get_type(void *sim_type_cont,
                                             const axis2_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_simple_type_content_super_objs(void *sim_type_cont,
+xml_schema_simple_type_content_super_objs(void *sim_type_cont,
                                                 const axis2_env_t *env);
 
 /*************** function prototypes *****************************************/
 
-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)
 {
-    axis2_xml_schema_simple_type_content_impl_t *sim_type_cont_impl = NULL;
+    xml_schema_simple_type_content_impl_t *sim_type_cont_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
     sim_type_cont_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_simple_type_content_impl_t));
+                    sizeof(xml_schema_simple_type_content_impl_t));
     
     if(!sim_type_cont_impl)
     {
@@ -80,60 +80,60 @@
     sim_type_cont_impl->sim_type_cont.base.ops = NULL;
     sim_type_cont_impl->methods = NULL;
     sim_type_cont_impl->ht_super = NULL;
-    sim_type_cont_impl->obj_type = AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT;
+    sim_type_cont_impl->obj_type = XML_SCHEMA_SIMPLE_TYPE_CONTENT;
     
     sim_type_cont_impl->sim_type_cont.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_simple_type_content_ops_t));
+                    sizeof(xml_schema_simple_type_content_ops_t));
 
     if(!sim_type_cont_impl->sim_type_cont.ops)
     {
-        axis2_xml_schema_simple_type_content_free(&(sim_type_cont_impl->sim_type_cont), env);
+        xml_schema_simple_type_content_free(&(sim_type_cont_impl->sim_type_cont), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
     sim_type_cont_impl->sim_type_cont.ops->free = 
-            axis2_xml_schema_simple_type_content_free;
+            xml_schema_simple_type_content_free;
     sim_type_cont_impl->sim_type_cont.ops->get_base_impl = 
-            axis2_xml_schema_simple_type_content_get_base_impl;
+            xml_schema_simple_type_content_get_base_impl;
     sim_type_cont_impl->sim_type_cont.ops->get_type = 
-            axis2_xml_schema_simple_type_content_get_type;
+            xml_schema_simple_type_content_get_type;
     sim_type_cont_impl->sim_type_cont.ops->super_objs = 
-            axis2_xml_schema_simple_type_content_super_objs;
+            xml_schema_simple_type_content_super_objs;
    
     sim_type_cont_impl->methods = axis2_hash_make(env);
     sim_type_cont_impl->ht_super = axis2_hash_make(env);
     if(!sim_type_cont_impl->methods || !sim_type_cont_impl->ht_super)
     {
-        axis2_xml_schema_simple_type_content_free(&(sim_type_cont_impl->sim_type_cont), env);
+        xml_schema_simple_type_content_free(&(sim_type_cont_impl->sim_type_cont), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     axis2_hash_set(sim_type_cont_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_simple_type_content_free);
+            xml_schema_simple_type_content_free);
     axis2_hash_set(sim_type_cont_impl->methods, "get_type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_content_get_type);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_content_get_type);
     axis2_hash_set(sim_type_cont_impl->methods, "super_objs", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_content_super_objs);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_content_super_objs);
 
-    sim_type_cont_impl->annotated = axis2_xml_schema_annotated_create(env);
+    sim_type_cont_impl->annotated = xml_schema_annotated_create(env);
     if(!sim_type_cont_impl->annotated)
     {
-        axis2_xml_schema_simple_type_content_free(&(sim_type_cont_impl->sim_type_cont), env);
+        xml_schema_simple_type_content_free(&(sim_type_cont_impl->sim_type_cont), env);
         return NULL;        
     }
     
-    axis2_hash_set(sim_type_cont_impl->ht_super, "AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT",
+    axis2_hash_set(sim_type_cont_impl->ht_super, "XML_SCHEMA_SIMPLE_TYPE_CONTENT",
         AXIS2_HASH_KEY_STRING, &(sim_type_cont_impl->sim_type_cont));
         
-    axis2_hash_set(sim_type_cont_impl->ht_super, "AXIS2_XML_SCHEMA_ANNOTATED",
+    axis2_hash_set(sim_type_cont_impl->ht_super, "XML_SCHEMA_ANNOTATED",
         AXIS2_HASH_KEY_STRING, sim_type_cont_impl->annotated);
     
-    axis2_hash_set(sim_type_cont_impl->ht_super, "AXIS2_XML_SCHEMA_OBJ",
+    axis2_hash_set(sim_type_cont_impl->ht_super, "XML_SCHEMA_OBJ",
         AXIS2_HASH_KEY_STRING, 
-        AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_type_cont_impl->annotated, env));
+        XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(sim_type_cont_impl->annotated, env));
     
-    status = axis2_xml_schema_annotated_resolve_methods(
+    status = xml_schema_annotated_resolve_methods(
             &(sim_type_cont_impl->sim_type_cont.base), env, sim_type_cont_impl->annotated, 
             sim_type_cont_impl->methods);
     
@@ -141,10 +141,10 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_content_free(void *sim_type_cont,
+xml_schema_simple_type_content_free(void *sim_type_cont,
                                     const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_content_impl_t *sim_type_cont_impl = NULL;
+    xml_schema_simple_type_content_impl_t *sim_type_cont_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     sim_type_cont_impl = AXIS2_INTF_TO_IMPL(sim_type_cont);
@@ -162,7 +162,7 @@
 
     if(NULL != sim_type_cont_impl->annotated)
     {
-        AXIS2_XML_SCHEMA_ANNOTATED_FREE(sim_type_cont_impl->annotated, env);
+        XML_SCHEMA_ANNOTATED_FREE(sim_type_cont_impl->annotated, env);
         sim_type_cont_impl->annotated = NULL;
     }
     
@@ -185,34 +185,34 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_simple_type_content_get_base_impl(void *sim_type_cont,
+xml_schema_annotated_t *AXIS2_CALL
+xml_schema_simple_type_content_get_base_impl(void *sim_type_cont,
                                 const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_content_impl_t *sim_type_cont_impl = NULL;
+    xml_schema_simple_type_content_impl_t *sim_type_cont_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     sim_type_cont_impl = AXIS2_INTF_TO_IMPL(sim_type_cont);
     return sim_type_cont_impl->annotated;
 }
 
 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)
 {
-    axis2_xml_schema_simple_type_content_impl_t *sim_type_cont_impl_l = NULL;
+    xml_schema_simple_type_content_impl_t *sim_type_cont_impl_l = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, sim_type_cont_impl, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     
     sim_type_cont_impl_l = 
-        (axis2_xml_schema_simple_type_content_impl_t *) sim_type_cont_impl;
+        (xml_schema_simple_type_content_impl_t *) sim_type_cont_impl;
     
     sim_type_cont->ops = AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_xml_schema_simple_type_content_ops_t));
+            sizeof(xml_schema_simple_type_content_ops_t));
     if(NULL != sim_type_cont->ops)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -226,20 +226,20 @@
     sim_type_cont->ops->super_objs = axis2_hash_get(methods, "super_objs", 
             AXIS2_HASH_KEY_STRING);
 
-    return axis2_xml_schema_annotated_resolve_methods(&(sim_type_cont->base), 
+    return xml_schema_annotated_resolve_methods(&(sim_type_cont->base), 
             env, sim_type_cont_impl_l->annotated, methods);
 }
 
 
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_content_get_type(void *sim_type_cont,
+xml_schema_types_t AXIS2_CALL
+xml_schema_simple_type_content_get_type(void *sim_type_cont,
                                             const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(sim_type_cont)->obj_type;
 }                                            
 
 axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_simple_type_content_super_objs(void *sim_type_cont,
+xml_schema_simple_type_content_super_objs(void *sim_type_cont,
                                                 const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(sim_type_cont)->ht_super;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c?rev=413626&r1=413625&r2=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c Mon Jun 12 03:29:40 2006
@@ -14,84 +14,84 @@
  * limitations under the License.
  */
 
-#include <axis2_xml_schema_simple_type_list.h>
+#include <xml_schema_simple_type_list.h>
 #include <axis2_utils.h>
 
-typedef struct axis2_xml_schema_simple_type_list_impl 
-                    axis2_xml_schema_simple_type_list_impl_t;
+typedef struct xml_schema_simple_type_list_impl 
+                    xml_schema_simple_type_list_impl_t;
 
 /** 
- * @brief axis2_xml_schema_simple_type_list_impl
+ * @brief xml_schema_simple_type_list_impl
  *   
  */ 
-struct axis2_xml_schema_simple_type_list_impl
+struct xml_schema_simple_type_list_impl
 {
-    axis2_xml_schema_simple_type_list_t simple_type_list;
+    xml_schema_simple_type_list_t simple_type_list;
     
-    axis2_xml_schema_simple_type_content_t *sim_type_content;
+    xml_schema_simple_type_content_t *sim_type_content;
     
     axis2_hash_t *methods;
     
-    axis2_xml_schema_types_t obj_type;
+    xml_schema_types_t obj_type;
     
     axis2_hash_t *ht_super;
     
-    axis2_xml_schema_simple_type_t *item_type;
+    xml_schema_simple_type_t *item_type;
     
     axis2_qname_t *item_type_name;
     
 };
 
 #define AXIS2_INTF_TO_IMPL(simple_type_list) \
-        ((axis2_xml_schema_simple_type_list_impl_t *) simple_type_list)
+        ((xml_schema_simple_type_list_impl_t *) simple_type_list)
         
 /*************** function prototypes *****************************************/
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_simple_type_list_free(void *simple_type_list,
+xml_schema_simple_type_list_free(void *simple_type_list,
                         const axis2_env_t *env);
 
-axis2_xml_schema_simple_type_content_t *AXIS2_CALL
-axis2_xml_schema_simple_type_list_get_base_impl(void *simple_type_list,
+xml_schema_simple_type_content_t *AXIS2_CALL
+xml_schema_simple_type_list_get_base_impl(void *simple_type_list,
                                         const axis2_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_simple_type_list_super_objs(void *simple_type_list,
+xml_schema_simple_type_list_super_objs(void *simple_type_list,
                                             const axis2_env_t *env);
                                             
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_list_get_type(void *simple_type_list,
+xml_schema_types_t AXIS2_CALL
+xml_schema_simple_type_list_get_type(void *simple_type_list,
                                        const axis2_env_t *env);                                            
 
-axis2_xml_schema_simple_type_t* AXIS2_CALL
-axis2_xml_schema_simple_type_list_get_item_type(void *simple_type_list,
+xml_schema_simple_type_t* AXIS2_CALL
+xml_schema_simple_type_list_get_item_type(void *simple_type_list,
                                             const axis2_env_t *env);
                                             
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_list_set_item_type(void *simple_type_list,
+xml_schema_simple_type_list_set_item_type(void *simple_type_list,
                                             const axis2_env_t *env,
-                                            axis2_xml_schema_simple_type_t *base_type);
+                                            xml_schema_simple_type_t *base_type);
 
 axis2_qname_t* AXIS2_CALL
-axis2_xml_schema_simple_type_list_get_item_type_name(void *simple_type_list,
+xml_schema_simple_type_list_get_item_type_name(void *simple_type_list,
                                             const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_list_set_item_type_name(void *simple_type_list,
+xml_schema_simple_type_list_set_item_type_name(void *simple_type_list,
                                             const axis2_env_t *env,
                                             axis2_qname_t *base_type_name);
 
 /*************** function prototypes *****************************************/
 
-AXIS2_EXTERN axis2_xml_schema_simple_type_list_t * AXIS2_CALL
-axis2_xml_schema_simple_type_list_create(const axis2_env_t *env)
+AXIS2_EXTERN xml_schema_simple_type_list_t * AXIS2_CALL
+xml_schema_simple_type_list_create(const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_list_impl_t *simple_type_list_impl = NULL;
-    axis2_xml_schema_annotated_t *annotated = NULL;
+    xml_schema_simple_type_list_impl_t *simple_type_list_impl = NULL;
+    xml_schema_annotated_t *annotated = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
     simple_type_list_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_simple_type_list_impl_t));
+                    sizeof(xml_schema_simple_type_list_impl_t));
     
     if(!simple_type_list_impl)
     {
@@ -106,93 +106,93 @@
     simple_type_list_impl->item_type = NULL;
     simple_type_list_impl->item_type_name = NULL;
     simple_type_list_impl->ht_super = NULL;
-    simple_type_list_impl->obj_type = AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST;
+    simple_type_list_impl->obj_type = XML_SCHEMA_SIMPLE_TYPE_LIST;
     
     simple_type_list_impl->simple_type_list.ops = 
         AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_simple_type_list_ops_t));
+                    sizeof(xml_schema_simple_type_list_ops_t));
 
     if(!simple_type_list_impl->simple_type_list.ops)
     {
-        axis2_xml_schema_simple_type_list_free(
+        xml_schema_simple_type_list_free(
             &(simple_type_list_impl->simple_type_list), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
     simple_type_list_impl->simple_type_list.ops->free = 
-            axis2_xml_schema_simple_type_list_free;
+            xml_schema_simple_type_list_free;
     simple_type_list_impl->simple_type_list.ops->get_type =
-            axis2_xml_schema_simple_type_list_get_type;
+            xml_schema_simple_type_list_get_type;
     simple_type_list_impl->simple_type_list.ops->super_objs =
-            axis2_xml_schema_simple_type_list_super_objs;            
+            xml_schema_simple_type_list_super_objs;            
     simple_type_list_impl->simple_type_list.ops->get_base_impl = 
-            axis2_xml_schema_simple_type_list_get_base_impl;
+            xml_schema_simple_type_list_get_base_impl;
     simple_type_list_impl->simple_type_list.ops->get_item_type = 
-            axis2_xml_schema_simple_type_list_get_item_type;
+            xml_schema_simple_type_list_get_item_type;
     simple_type_list_impl->simple_type_list.ops->set_item_type = 
-            axis2_xml_schema_simple_type_list_set_item_type;
+            xml_schema_simple_type_list_set_item_type;
     simple_type_list_impl->simple_type_list.ops->get_item_type_name = 
-            axis2_xml_schema_simple_type_list_get_item_type_name;
+            xml_schema_simple_type_list_get_item_type_name;
     simple_type_list_impl->simple_type_list.ops->set_item_type_name = 
-            axis2_xml_schema_simple_type_list_set_item_type_name;
+            xml_schema_simple_type_list_set_item_type_name;
    
     simple_type_list_impl->methods = axis2_hash_make(env);
     simple_type_list_impl->ht_super = axis2_hash_make(env);
     if(!simple_type_list_impl->methods || !simple_type_list_impl->ht_super)
     {
-        axis2_xml_schema_simple_type_list_free(
+        xml_schema_simple_type_list_free(
             &(simple_type_list_impl->simple_type_list), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     axis2_hash_set(simple_type_list_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_simple_type_list_free);
+            xml_schema_simple_type_list_free);
     axis2_hash_set(simple_type_list_impl->methods, "get_base_type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_list_get_item_type);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_list_get_item_type);
     axis2_hash_set(simple_type_list_impl->methods, "set_base_type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_list_set_item_type);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_list_set_item_type);
     axis2_hash_set(simple_type_list_impl->methods, "get_base_type_name", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_list_get_item_type_name);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_list_get_item_type_name);
     axis2_hash_set(simple_type_list_impl->methods, "set_base_type_name", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_list_set_item_type_name);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_list_set_item_type_name);
     axis2_hash_set(simple_type_list_impl->methods, "get_type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_list_get_type);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_list_get_type);
     axis2_hash_set(simple_type_list_impl->methods, "super_objs", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_list_super_objs);                        
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_list_super_objs);                        
     
     simple_type_list_impl->sim_type_content = 
-        axis2_xml_schema_simple_type_content_create(env);
+        xml_schema_simple_type_content_create(env);
         
     if(!simple_type_list_impl->sim_type_content)
     {
-        axis2_xml_schema_simple_type_list_free(
+        xml_schema_simple_type_list_free(
             &(simple_type_list_impl->simple_type_list), env);
         return NULL;        
     }
     
-    axis2_hash_set(simple_type_list_impl->ht_super, "AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST",
+    axis2_hash_set(simple_type_list_impl->ht_super, "XML_SCHEMA_SIMPLE_TYPE_LIST",
             AXIS2_HASH_KEY_STRING, &(simple_type_list_impl->simple_type_list));              
               
-    axis2_hash_set(simple_type_list_impl->ht_super, "AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT",
+    axis2_hash_set(simple_type_list_impl->ht_super, "XML_SCHEMA_SIMPLE_TYPE_CONTENT",
             AXIS2_HASH_KEY_STRING, &(simple_type_list_impl->sim_type_content));    
             
-    annotated = AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(
+    annotated = XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(
         simple_type_list_impl->sim_type_content, env);            
     if(NULL != annotated)
     {            
         axis2_hash_set(simple_type_list_impl->ht_super, 
-            "AXIS2_XML_SCHEMA_ANNOTATED",
+            "XML_SCHEMA_ANNOTATED",
             AXIS2_HASH_KEY_STRING, annotated);    
      
         axis2_hash_set(simple_type_list_impl->ht_super, 
-            "AXIS2_XML_SCHEMA_OBJ",
+            "XML_SCHEMA_OBJ",
             AXIS2_HASH_KEY_STRING,
-            AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));    
+            XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));    
                       
     }
     
-    status = axis2_xml_schema_simple_type_content_resolve_methods(
+    status = xml_schema_simple_type_content_resolve_methods(
             &(simple_type_list_impl->simple_type_list.base), env,                                  simple_type_list_impl->sim_type_content, 
             simple_type_list_impl->methods);
     
@@ -200,10 +200,10 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_list_free(void *simple_type_list,
+xml_schema_simple_type_list_free(void *simple_type_list,
                                     const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_list_impl_t *simple_type_list_impl = NULL;
+    xml_schema_simple_type_list_impl_t *simple_type_list_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     simple_type_list_impl = AXIS2_INTF_TO_IMPL(simple_type_list);
@@ -220,7 +220,7 @@
     }
     if(NULL != simple_type_list_impl->sim_type_content)
     {
-        AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(
+        XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(
             simple_type_list_impl->sim_type_content , env);
             simple_type_list_impl->sim_type_content = NULL;
     }
@@ -246,11 +246,11 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_xml_schema_simple_type_content_t *AXIS2_CALL
-axis2_xml_schema_simple_type_list_get_base_impl(void *simple_type_list,
+xml_schema_simple_type_content_t *AXIS2_CALL
+xml_schema_simple_type_list_get_base_impl(void *simple_type_list,
                                 const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_list_impl_t *simple_type_list_impl = NULL;
+    xml_schema_simple_type_list_impl_t *simple_type_list_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     simple_type_list_impl = AXIS2_INTF_TO_IMPL(simple_type_list);
@@ -260,23 +260,23 @@
 
 /*
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_list_resolve_methods(
-                    axis2_xml_schema_simple_type_list_t *simple_type_list,
+xml_schema_simple_type_list_resolve_methods(
+                    xml_schema_simple_type_list_t *simple_type_list,
                     const axis2_env_t *env,
-                    axis2_xml_schema_simple_type_list_t *simple_type_list_impl,
+                    xml_schema_simple_type_list_t *simple_type_list_impl,
                     axis2_hash_t *methods)
 {
-    axis2_xml_schema_simple_type_list_impl_t *simple_type_list_impl_l = NULL;
+    xml_schema_simple_type_list_impl_t *simple_type_list_impl_l = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, simple_type_list_impl, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     
     simple_type_list_impl_l = 
-        (axis2_xml_schema_simple_type_list_impl_t *) simple_type_list_impl;
+        (xml_schema_simple_type_list_impl_t *) simple_type_list_impl;
     
     simple_type_list->ops = AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_xml_schema_simple_type_list_ops_t));
+            sizeof(xml_schema_simple_type_list_ops_t));
     if(NULL != simple_type_list->ops)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -299,13 +299,13 @@
     simple_type_list->ops->set_item_type_name = 
             simple_type_list_impl_l->simple_type_list.ops->set_item_type_name;
     
-    return axis2_xml_schema_simple_type_content_resolve_methods(
+    return xml_schema_simple_type_content_resolve_methods(
                 &(simple_type_list->base), env, 
                 simple_type_list_impl_l->sim_type_content, methods);
 }
 */
-axis2_xml_schema_simple_type_t* AXIS2_CALL
-axis2_xml_schema_simple_type_list_get_item_type(void *simple_type_list,
+xml_schema_simple_type_t* AXIS2_CALL
+xml_schema_simple_type_list_get_item_type(void *simple_type_list,
                                             const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -314,16 +314,16 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_list_set_item_type(void *simple_type_list,
+xml_schema_simple_type_list_set_item_type(void *simple_type_list,
                                             const axis2_env_t *env,
-                                            axis2_xml_schema_simple_type_t* item_type)
+                                            xml_schema_simple_type_t* item_type)
 {
-    axis2_xml_schema_simple_type_list_impl_t *sim_type_res_impl = NULL;
+    xml_schema_simple_type_list_impl_t *sim_type_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     sim_type_res_impl = AXIS2_INTF_TO_IMPL(simple_type_list);
     if(NULL != sim_type_res_impl->item_type_name)
     {
-        AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(sim_type_res_impl->item_type, env);
+        XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(sim_type_res_impl->item_type, env);
         sim_type_res_impl->item_type_name = NULL;
     }
     sim_type_res_impl->item_type = item_type;
@@ -331,7 +331,7 @@
 }
 
 axis2_qname_t* AXIS2_CALL
-axis2_xml_schema_simple_type_list_get_item_type_name(void *simple_type_list,
+xml_schema_simple_type_list_get_item_type_name(void *simple_type_list,
                                                             const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -339,11 +339,11 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_list_set_item_type_name(void *simple_type_list,
+xml_schema_simple_type_list_set_item_type_name(void *simple_type_list,
                                                             const axis2_env_t *env,
                                                             axis2_qname_t *item_type_name)
 {
-    axis2_xml_schema_simple_type_list_impl_t *sim_type_res_impl = NULL;
+    xml_schema_simple_type_list_impl_t *sim_type_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, item_type_name, AXIS2_FAILURE);
     
@@ -358,14 +358,14 @@
 }
 
 axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_simple_type_list_super_objs(void *simple_type_list,
+xml_schema_simple_type_list_super_objs(void *simple_type_list,
                                             const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_list)->ht_super;
 }                                            
                                             
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_list_get_type(void *simple_type_list,
+xml_schema_types_t AXIS2_CALL
+xml_schema_simple_type_list_get_type(void *simple_type_list,
                                        const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_list)->obj_type;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c?rev=413626&r1=413625&r2=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c Mon Jun 12 03:29:40 2006
@@ -14,91 +14,91 @@
  * limitations under the License.
  */
 
-#include <axis2_xml_schema_simple_type_restriction.h>
-#include <axis2_xml_schema_obj_collection.h>
+#include <xml_schema_simple_type_restriction.h>
+#include <xml_schema_obj_collection.h>
 #include <axis2_utils.h>
 
-typedef struct axis2_xml_schema_simple_type_restriction_impl 
-                    axis2_xml_schema_simple_type_restriction_impl_t;
+typedef struct xml_schema_simple_type_restriction_impl 
+                    xml_schema_simple_type_restriction_impl_t;
 
 /** 
- * @brief axis2_xml_schema_simple_type_restriction_impl
+ * @brief xml_schema_simple_type_restriction_impl
  * 
  */ 
-struct axis2_xml_schema_simple_type_restriction_impl
+struct xml_schema_simple_type_restriction_impl
 {
-    axis2_xml_schema_simple_type_restriction_t simple_type_restriction;
+    xml_schema_simple_type_restriction_t simple_type_restriction;
     
-    axis2_xml_schema_simple_type_content_t *sim_type_content;
+    xml_schema_simple_type_content_t *sim_type_content;
     
     axis2_hash_t *methods;
     
     axis2_hash_t *ht_super;
     
-    axis2_xml_schema_types_t obj_type;
+    xml_schema_types_t obj_type;
     
-    axis2_xml_schema_simple_type_t *base_type;
+    xml_schema_simple_type_t *base_type;
     
     axis2_qname_t *base_type_name;
     
-    axis2_xml_schema_obj_collection_t *facets;
+    xml_schema_obj_collection_t *facets;
     
 };
 
 #define AXIS2_INTF_TO_IMPL(simple_type_restriction) \
-        ((axis2_xml_schema_simple_type_restriction_impl_t *) simple_type_restriction)
+        ((xml_schema_simple_type_restriction_impl_t *) simple_type_restriction)
         
 /*************** function prototypes *****************************************/
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_simple_type_restriction_free(void *simple_type_restriction,
+xml_schema_simple_type_restriction_free(void *simple_type_restriction,
                         const axis2_env_t *env);
 
-axis2_xml_schema_simple_type_content_t *AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_get_base_impl(void *simple_type_restriction,
+xml_schema_simple_type_content_t *AXIS2_CALL
+xml_schema_simple_type_restriction_get_base_impl(void *simple_type_restriction,
                                         const axis2_env_t *env);
 
-axis2_xml_schema_simple_type_t* AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_get_base_type(void *simple_type_restriction,
+xml_schema_simple_type_t* AXIS2_CALL
+xml_schema_simple_type_restriction_get_base_type(void *simple_type_restriction,
                                             const axis2_env_t *env);
 
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_get_type(void *simple_type_restriction,
+xml_schema_types_t AXIS2_CALL
+xml_schema_simple_type_restriction_get_type(void *simple_type_restriction,
                                             const axis2_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_super_objs(void *simple_type_restriction,
+xml_schema_simple_type_restriction_super_objs(void *simple_type_restriction,
                                                     const axis2_env_t *env);
 
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_set_base_type(void *simple_type_restriction,
+xml_schema_simple_type_restriction_set_base_type(void *simple_type_restriction,
                                             const axis2_env_t *env,
-                                            axis2_xml_schema_simple_type_t *base_type);
+                                            xml_schema_simple_type_t *base_type);
 
 axis2_qname_t* AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_get_base_type_name(void *simple_type_restriction,
+xml_schema_simple_type_restriction_get_base_type_name(void *simple_type_restriction,
                                             const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_set_base_type_name(void *simple_type_restriction,
+xml_schema_simple_type_restriction_set_base_type_name(void *simple_type_restriction,
                                             const axis2_env_t *env,
                                             axis2_qname_t *base_type_name);
                                             
-axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_get_facets(void *simple_type_restriction,
+xml_schema_obj_collection_t* AXIS2_CALL
+xml_schema_simple_type_restriction_get_facets(void *simple_type_restriction,
                                             const axis2_env_t *env);                                       
 /*************** function prototypes *****************************************/
 
-AXIS2_EXTERN axis2_xml_schema_simple_type_restriction_t * AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_create(const axis2_env_t *env)
+AXIS2_EXTERN xml_schema_simple_type_restriction_t * AXIS2_CALL
+xml_schema_simple_type_restriction_create(const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl = NULL;
-    axis2_xml_schema_annotated_t *annotated = NULL;
+    xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl = NULL;
+    xml_schema_annotated_t *annotated = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
     simple_type_restriction_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_simple_type_restriction_impl_t));
+                    sizeof(xml_schema_simple_type_restriction_impl_t));
     
     if(!simple_type_restriction_impl)
     {
@@ -114,96 +114,96 @@
     simple_type_restriction_impl->base_type_name = NULL;
     simple_type_restriction_impl->facets = NULL;
     simple_type_restriction_impl->ht_super = NULL;
-    simple_type_restriction_impl->obj_type = AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION;
+    simple_type_restriction_impl->obj_type = XML_SCHEMA_SIMPLE_TYPE_RESTRICTION;
     
     
     simple_type_restriction_impl->simple_type_restriction.ops = 
         AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_simple_type_restriction_ops_t));
+                    sizeof(xml_schema_simple_type_restriction_ops_t));
 
     if(!simple_type_restriction_impl->simple_type_restriction.ops)
     {
-        axis2_xml_schema_simple_type_restriction_free(
+        xml_schema_simple_type_restriction_free(
             &(simple_type_restriction_impl->simple_type_restriction), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
     simple_type_restriction_impl->simple_type_restriction.ops->free = 
-            axis2_xml_schema_simple_type_restriction_free;
+            xml_schema_simple_type_restriction_free;
     simple_type_restriction_impl->simple_type_restriction.ops->get_base_impl = 
-            axis2_xml_schema_simple_type_restriction_get_base_impl;
+            xml_schema_simple_type_restriction_get_base_impl;
     simple_type_restriction_impl->simple_type_restriction.ops->get_type = 
-            axis2_xml_schema_simple_type_restriction_get_type;
+            xml_schema_simple_type_restriction_get_type;
     simple_type_restriction_impl->simple_type_restriction.ops->super_objs = 
-            axis2_xml_schema_simple_type_restriction_super_objs;
+            xml_schema_simple_type_restriction_super_objs;
     simple_type_restriction_impl->simple_type_restriction.ops->get_base_type = 
-            axis2_xml_schema_simple_type_restriction_get_base_type;
+            xml_schema_simple_type_restriction_get_base_type;
     simple_type_restriction_impl->simple_type_restriction.ops->set_base_type = 
-            axis2_xml_schema_simple_type_restriction_set_base_type;
+            xml_schema_simple_type_restriction_set_base_type;
     simple_type_restriction_impl->simple_type_restriction.ops->get_base_type_name = 
-            axis2_xml_schema_simple_type_restriction_get_base_type_name;
+            xml_schema_simple_type_restriction_get_base_type_name;
     simple_type_restriction_impl->simple_type_restriction.ops->set_base_type_name = 
-            axis2_xml_schema_simple_type_restriction_set_base_type_name;
+            xml_schema_simple_type_restriction_set_base_type_name;
     simple_type_restriction_impl->simple_type_restriction.ops->get_facets =
-            axis2_xml_schema_simple_type_restriction_get_facets;            
+            xml_schema_simple_type_restriction_get_facets;            
             
    
     simple_type_restriction_impl->methods = axis2_hash_make(env);
     simple_type_restriction_impl->ht_super = axis2_hash_make(env);
     if(!simple_type_restriction_impl->methods || !simple_type_restriction_impl->ht_super)
     {
-        axis2_xml_schema_simple_type_restriction_free(&(simple_type_restriction_impl->simple_type_restriction), env);
+        xml_schema_simple_type_restriction_free(&(simple_type_restriction_impl->simple_type_restriction), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     axis2_hash_set(simple_type_restriction_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_simple_type_restriction_free);
+            xml_schema_simple_type_restriction_free);
     axis2_hash_set(simple_type_restriction_impl->methods, "get_base_type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_restriction_get_base_type);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_restriction_get_base_type);
     axis2_hash_set(simple_type_restriction_impl->methods, "get_type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_restriction_get_type);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_restriction_get_type);
     axis2_hash_set(simple_type_restriction_impl->methods, "super_objs", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_restriction_super_objs);            axis2_hash_set(simple_type_restriction_impl->methods, "set_base_type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_restriction_set_base_type);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_restriction_super_objs);            axis2_hash_set(simple_type_restriction_impl->methods, "set_base_type", 
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_restriction_set_base_type);
     axis2_hash_set(simple_type_restriction_impl->methods, "get_base_type_name", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_restriction_get_base_type_name);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_restriction_get_base_type_name);
     axis2_hash_set(simple_type_restriction_impl->methods, "set_base_type_name", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_restriction_set_base_type_name);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_restriction_set_base_type_name);
     
     simple_type_restriction_impl->sim_type_content = 
-        axis2_xml_schema_simple_type_content_create(env);
+        xml_schema_simple_type_content_create(env);
         
-    simple_type_restriction_impl->facets = axis2_xml_schema_obj_collection_create(env);        
+    simple_type_restriction_impl->facets = xml_schema_obj_collection_create(env);        
         
     if(!simple_type_restriction_impl->sim_type_content || 
         !simple_type_restriction_impl->facets)
     {
-        axis2_xml_schema_simple_type_restriction_free(
+        xml_schema_simple_type_restriction_free(
             &(simple_type_restriction_impl->simple_type_restriction), env);
         return NULL;        
     }
     
     axis2_hash_set(simple_type_restriction_impl->methods,
-            "AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION", 
+            "XML_SCHEMA_SIMPLE_TYPE_RESTRICTION", 
             AXIS2_HASH_KEY_STRING, &(simple_type_restriction_impl->simple_type_restriction));                
     axis2_hash_set(simple_type_restriction_impl->methods,
-            "AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT", 
+            "XML_SCHEMA_SIMPLE_TYPE_CONTENT", 
             AXIS2_HASH_KEY_STRING, simple_type_restriction_impl->sim_type_content);               
-    annotated = AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(
+    annotated = XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(
             simple_type_restriction_impl->sim_type_content, env);
             
     if(NULL != annotated)
     {
         axis2_hash_set(simple_type_restriction_impl->methods,
-            "AXIS2_XML_SCHEMA_ANNOTATED", 
+            "XML_SCHEMA_ANNOTATED", 
             AXIS2_HASH_KEY_STRING, annotated);               
         axis2_hash_set(simple_type_restriction_impl->methods,
-            "AXIS2_XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING,              
-            AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
+            "XML_SCHEMA_OBJ", AXIS2_HASH_KEY_STRING,              
+            XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
     }            
   
-    status = axis2_xml_schema_simple_type_content_resolve_methods(
+    status = xml_schema_simple_type_content_resolve_methods(
             &(simple_type_restriction_impl->simple_type_restriction.base), env,                                  simple_type_restriction_impl->sim_type_content, 
             simple_type_restriction_impl->methods);
     
@@ -211,10 +211,10 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_free(void *simple_type_restriction,
+xml_schema_simple_type_restriction_free(void *simple_type_restriction,
                                     const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl = NULL;
+    xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     simple_type_restriction_impl = AXIS2_INTF_TO_IMPL(simple_type_restriction);
@@ -233,7 +233,7 @@
 
     if(NULL != simple_type_restriction_impl->sim_type_content)
     {
-        AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(
+        XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(
             simple_type_restriction_impl->sim_type_content , env);
             simple_type_restriction_impl->sim_type_content = NULL;
     }
@@ -259,11 +259,11 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_xml_schema_simple_type_content_t *AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_get_base_impl(void *simple_type_restriction,
+xml_schema_simple_type_content_t *AXIS2_CALL
+xml_schema_simple_type_restriction_get_base_impl(void *simple_type_restriction,
                                 const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl = NULL;
+    xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     simple_type_restriction_impl = AXIS2_INTF_TO_IMPL(simple_type_restriction);
@@ -273,23 +273,23 @@
 
 /*
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_resolve_methods(
-                    axis2_xml_schema_simple_type_restriction_t *simple_type_restriction,
+xml_schema_simple_type_restriction_resolve_methods(
+                    xml_schema_simple_type_restriction_t *simple_type_restriction,
                     const axis2_env_t *env,
-                    axis2_xml_schema_simple_type_restriction_t *simple_type_restriction_impl,
+                    xml_schema_simple_type_restriction_t *simple_type_restriction_impl,
                     axis2_hash_t *methods)
 {
-    axis2_xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl_l = NULL;
+    xml_schema_simple_type_restriction_impl_t *simple_type_restriction_impl_l = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, simple_type_restriction_impl, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     
     simple_type_restriction_impl_l = 
-        (axis2_xml_schema_simple_type_restriction_impl_t *) simple_type_restriction_impl;
+        (xml_schema_simple_type_restriction_impl_t *) simple_type_restriction_impl;
     
     simple_type_restriction->ops = AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_xml_schema_simple_type_restriction_ops_t));
+            sizeof(xml_schema_simple_type_restriction_ops_t));
     if(NULL != simple_type_restriction->ops)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -315,13 +315,13 @@
     simple_type_restriction->ops->get_facets = 
             simple_type_restriction_impl_l->simple_type_restriction.ops->get_facets;
     
-    return axis2_xml_schema_simple_type_content_resolve_methods(
+    return xml_schema_simple_type_content_resolve_methods(
                 &(simple_type_restriction->base), env, 
                 simple_type_restriction_impl_l->sim_type_content, methods);
 }
 */
-axis2_xml_schema_simple_type_t* AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_get_base_type(void *simple_type_restriction,
+xml_schema_simple_type_t* AXIS2_CALL
+xml_schema_simple_type_restriction_get_base_type(void *simple_type_restriction,
                                             const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -330,16 +330,16 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_set_base_type(void *simple_type_restriction,
+xml_schema_simple_type_restriction_set_base_type(void *simple_type_restriction,
                                             const axis2_env_t *env,
-                                            axis2_xml_schema_simple_type_t* base_type)
+                                            xml_schema_simple_type_t* base_type)
 {
-    axis2_xml_schema_simple_type_restriction_impl_t *sim_type_res_impl = NULL;
+    xml_schema_simple_type_restriction_impl_t *sim_type_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     sim_type_res_impl = AXIS2_INTF_TO_IMPL(simple_type_restriction);
     if(NULL != sim_type_res_impl->base_type_name)
     {
-        AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(sim_type_res_impl->base_type, env);
+        XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(sim_type_res_impl->base_type, env);
         sim_type_res_impl->base_type_name = NULL;
     }
     
@@ -349,7 +349,7 @@
 }
 
 axis2_qname_t* AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_get_base_type_name(void *simple_type_restriction,
+xml_schema_simple_type_restriction_get_base_type_name(void *simple_type_restriction,
                                                             const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -357,11 +357,11 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_set_base_type_name(void *simple_type_restriction,
+xml_schema_simple_type_restriction_set_base_type_name(void *simple_type_restriction,
                                                             const axis2_env_t *env,
                                                             axis2_qname_t *base_type_name)
 {
-    axis2_xml_schema_simple_type_restriction_impl_t *sim_type_res_impl = NULL;
+    xml_schema_simple_type_restriction_impl_t *sim_type_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, base_type_name, AXIS2_FAILURE);
     
@@ -375,25 +375,25 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_get_facets(void *simple_type_restriction,
+xml_schema_obj_collection_t* AXIS2_CALL
+xml_schema_simple_type_restriction_get_facets(void *simple_type_restriction,
                                             const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_restriction_impl_t *sim_type_res_impl = NULL;
+    xml_schema_simple_type_restriction_impl_t *sim_type_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     sim_type_res_impl = AXIS2_INTF_TO_IMPL(simple_type_restriction);
     return sim_type_res_impl->facets;
 }                                            
 
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_get_type(void *simple_type_restriction,
+xml_schema_types_t AXIS2_CALL
+xml_schema_simple_type_restriction_get_type(void *simple_type_restriction,
                                             const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_restriction)->obj_type;
 }                                            
 
 axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_super_objs(void *simple_type_restriction,
+xml_schema_simple_type_restriction_super_objs(void *simple_type_restriction,
                                                     const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_restriction)->ht_super;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c?rev=413626&r1=413625&r2=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c Mon Jun 12 03:29:40 2006
@@ -14,94 +14,94 @@
  * limitations under the License.
  */
 
-#include <axis2_xml_schema_simple_type_union.h>
+#include <xml_schema_simple_type_union.h>
 #include <axis2_utils.h>
 
-typedef struct axis2_xml_schema_simple_type_union_impl 
-                    axis2_xml_schema_simple_type_union_impl_t;
+typedef struct xml_schema_simple_type_union_impl 
+                    xml_schema_simple_type_union_impl_t;
 
 /** 
- * @brief axis2_xml_schema_simple_type_union_impl
+ * @brief xml_schema_simple_type_union_impl
  *   
  */ 
-struct axis2_xml_schema_simple_type_union_impl
+struct xml_schema_simple_type_union_impl
 {
-    axis2_xml_schema_simple_type_union_t simple_type_union;
+    xml_schema_simple_type_union_t simple_type_union;
     
-    axis2_xml_schema_simple_type_content_t *sim_type_content;
+    xml_schema_simple_type_content_t *sim_type_content;
     
     axis2_hash_t *methods;
     
     axis2_hash_t *ht_super;
     
-    axis2_xml_schema_types_t obj_type;
+    xml_schema_types_t obj_type;
     
     axis2_char_t *member_types_source;
     
     axis2_array_list_t *member_types_qnames;
     
-    axis2_xml_schema_obj_collection_t *base_types;
+    xml_schema_obj_collection_t *base_types;
 };
 
 #define AXIS2_INTF_TO_IMPL(simple_type_union) \
-        ((axis2_xml_schema_simple_type_union_impl_t *) simple_type_union)
+        ((xml_schema_simple_type_union_impl_t *) simple_type_union)
         
 /*************** function prototypes *****************************************/
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_simple_type_union_free(void *simple_type_union,
+xml_schema_simple_type_union_free(void *simple_type_union,
                         const axis2_env_t *env);
 
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_union_get_type(void *simple_type_union,
+xml_schema_types_t AXIS2_CALL
+xml_schema_simple_type_union_get_type(void *simple_type_union,
                                         const axis2_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
-axis2_xml_schema_simple_type_union_super_objs(void *simple_type_union,
+xml_schema_simple_type_union_super_objs(void *simple_type_union,
                                         const axis2_env_t *env);
                                         
 
-axis2_xml_schema_simple_type_content_t *AXIS2_CALL
-axis2_xml_schema_simple_type_union_get_base_impl(void *simple_type_union,
+xml_schema_simple_type_content_t *AXIS2_CALL
+xml_schema_simple_type_union_get_base_impl(void *simple_type_union,
                                         const axis2_env_t *env);                                     
                                                                                    
 
-axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_simple_type_union_get_base_types(void *simple_type_union,
+xml_schema_obj_collection_t* AXIS2_CALL
+xml_schema_simple_type_union_get_base_types(void *simple_type_union,
                                             const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_union_set_member_types_source(void *simple_type_union,
+xml_schema_simple_type_union_set_member_types_source(void *simple_type_union,
                              const axis2_env_t *env,
                              axis2_char_t *member_types_source);
 
 axis2_char_t* AXIS2_CALL
-axis2_xml_schema_simple_type_union_get_member_types_source
+xml_schema_simple_type_union_get_member_types_source
                             (void *simple_type_union,
                              const axis2_env_t *env);
 
 axis2_array_list_t* AXIS2_CALL
-axis2_xml_schema_simple_type_union_get_member_types_qnames(
+xml_schema_simple_type_union_get_member_types_qnames(
         void *simple_type_union,
         const axis2_env_t *env);
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_union_set_member_types_qnames(
+xml_schema_simple_type_union_set_member_types_qnames(
         void *simple_type_union,
         const axis2_env_t *env,
         axis2_array_list_t *qns);        
 
 /*************** function prototypes *****************************************/
 
-AXIS2_EXTERN axis2_xml_schema_simple_type_union_t * AXIS2_CALL
-axis2_xml_schema_simple_type_union_create(const axis2_env_t *env)
+AXIS2_EXTERN xml_schema_simple_type_union_t * AXIS2_CALL
+xml_schema_simple_type_union_create(const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_union_impl_t *simple_type_union_impl = NULL;
-    axis2_xml_schema_annotated_t *annotated = NULL;
+    xml_schema_simple_type_union_impl_t *simple_type_union_impl = NULL;
+    xml_schema_annotated_t *annotated = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
     simple_type_union_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_simple_type_union_impl_t));
+                    sizeof(xml_schema_simple_type_union_impl_t));
     
     if(!simple_type_union_impl)
     {
@@ -116,39 +116,39 @@
     simple_type_union_impl->member_types_qnames = NULL;
     simple_type_union_impl->member_types_source = NULL;
     simple_type_union_impl->ht_super = NULL;
-    simple_type_union_impl->obj_type = AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION;
+    simple_type_union_impl->obj_type = XML_SCHEMA_SIMPLE_TYPE_UNION;
     
     
     simple_type_union_impl->simple_type_union.ops = 
         AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_simple_type_union_ops_t));
+                    sizeof(xml_schema_simple_type_union_ops_t));
 
     if(!simple_type_union_impl->simple_type_union.ops)
     {
-        axis2_xml_schema_simple_type_union_free(
+        xml_schema_simple_type_union_free(
             &(simple_type_union_impl->simple_type_union), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
     simple_type_union_impl->simple_type_union.ops->free = 
-            axis2_xml_schema_simple_type_union_free;
+            xml_schema_simple_type_union_free;
     simple_type_union_impl->simple_type_union.ops->get_base_impl = 
-            axis2_xml_schema_simple_type_union_get_base_impl;
+            xml_schema_simple_type_union_get_base_impl;
     simple_type_union_impl->simple_type_union.ops->get_type =
-            axis2_xml_schema_simple_type_union_get_type;
+            xml_schema_simple_type_union_get_type;
     simple_type_union_impl->simple_type_union.ops->super_objs =
-            axis2_xml_schema_simple_type_union_super_objs;
+            xml_schema_simple_type_union_super_objs;
     simple_type_union_impl->simple_type_union.ops->get_base_types = 
-            axis2_xml_schema_simple_type_union_get_base_types;
+            xml_schema_simple_type_union_get_base_types;
     simple_type_union_impl->simple_type_union.ops->set_member_types_source = 
-            axis2_xml_schema_simple_type_union_set_member_types_source;
+            xml_schema_simple_type_union_set_member_types_source;
     simple_type_union_impl->simple_type_union.ops->get_member_types_source = 
-            axis2_xml_schema_simple_type_union_get_member_types_source;
+            xml_schema_simple_type_union_get_member_types_source;
     simple_type_union_impl->simple_type_union.ops->get_member_types_qnames = 
-            axis2_xml_schema_simple_type_union_get_member_types_qnames;
+            xml_schema_simple_type_union_get_member_types_qnames;
     simple_type_union_impl->simple_type_union.ops->set_member_types_qnames =
-            axis2_xml_schema_simple_type_union_set_member_types_qnames;            
+            xml_schema_simple_type_union_set_member_types_qnames;            
             
    
     simple_type_union_impl->methods = axis2_hash_make(env);
@@ -156,66 +156,66 @@
     
     if(!simple_type_union_impl->methods || !simple_type_union_impl->ht_super)
     {
-        axis2_xml_schema_simple_type_union_free(
+        xml_schema_simple_type_union_free(
             &(simple_type_union_impl->simple_type_union), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     axis2_hash_set(simple_type_union_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_simple_type_union_free);
+            xml_schema_simple_type_union_free);
     axis2_hash_set(simple_type_union_impl->methods, "get_base_types", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_union_get_base_types);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_union_get_base_types);
     axis2_hash_set(simple_type_union_impl->methods, "get_type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_union_get_type);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_union_get_type);
     axis2_hash_set(simple_type_union_impl->methods, "super_objs", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_union_super_objs);                 axis2_hash_set(simple_type_union_impl->methods, "set_member_types_source", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_union_set_member_types_source);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_union_super_objs);                 axis2_hash_set(simple_type_union_impl->methods, "set_member_types_source", 
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_union_set_member_types_source);
     axis2_hash_set(simple_type_union_impl->methods, "get_member_types_source", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_union_get_member_types_source);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_union_get_member_types_source);
     axis2_hash_set(simple_type_union_impl->methods, "get_member_types_qnames", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_union_get_member_types_qnames);
+            AXIS2_HASH_KEY_STRING, xml_schema_simple_type_union_get_member_types_qnames);
     
     simple_type_union_impl->sim_type_content = 
-        axis2_xml_schema_simple_type_content_create(env);
+        xml_schema_simple_type_content_create(env);
         
     if(!simple_type_union_impl->sim_type_content)
     {
-        axis2_xml_schema_simple_type_union_free(
+        xml_schema_simple_type_union_free(
             &(simple_type_union_impl->simple_type_union), env);
         return NULL;        
     }
     
     simple_type_union_impl->base_types = 
-        axis2_xml_schema_obj_collection_create(env);
+        xml_schema_obj_collection_create(env);
         
     if(!simple_type_union_impl->base_types)
     {
-        axis2_xml_schema_simple_type_union_free(
+        xml_schema_simple_type_union_free(
             &(simple_type_union_impl->simple_type_union), env);
         return NULL;        
     }
 
     
-    axis2_hash_set(simple_type_union_impl->ht_super, "AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION", 
+    axis2_hash_set(simple_type_union_impl->ht_super, "XML_SCHEMA_SIMPLE_TYPE_UNION", 
             AXIS2_HASH_KEY_STRING, &(simple_type_union_impl->simple_type_union));
 
-    axis2_hash_set(simple_type_union_impl->ht_super, "AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT", 
+    axis2_hash_set(simple_type_union_impl->ht_super, "XML_SCHEMA_SIMPLE_TYPE_CONTENT", 
             AXIS2_HASH_KEY_STRING, simple_type_union_impl->sim_type_content);
     
-    annotated = AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(
+    annotated = XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_BASE_IMPL(
         simple_type_union_impl->sim_type_content, env);
 
     if(NULL != annotated)
     {
-        axis2_hash_set(simple_type_union_impl->ht_super, "AXIS2_XML_SCHEMA_ANNOTATED", 
+        axis2_hash_set(simple_type_union_impl->ht_super, "XML_SCHEMA_ANNOTATED", 
             AXIS2_HASH_KEY_STRING, annotated);
             
-        axis2_hash_set(simple_type_union_impl->ht_super, "AXIS2_XML_SCHEMA_OBJ",
+        axis2_hash_set(simple_type_union_impl->ht_super, "XML_SCHEMA_OBJ",
             AXIS2_HASH_KEY_STRING, 
-            AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
+            XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env));
     }
             
-    status = axis2_xml_schema_simple_type_content_resolve_methods(
+    status = xml_schema_simple_type_content_resolve_methods(
             &(simple_type_union_impl->simple_type_union.base), env,                                  simple_type_union_impl->sim_type_content, 
             simple_type_union_impl->methods);
     
@@ -223,10 +223,10 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_union_free(void *simple_type_union,
+xml_schema_simple_type_union_free(void *simple_type_union,
                                     const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_union_impl_t *simple_type_union_impl = NULL;
+    xml_schema_simple_type_union_impl_t *simple_type_union_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     simple_type_union_impl = AXIS2_INTF_TO_IMPL(simple_type_union);
@@ -243,7 +243,7 @@
     }
     if(NULL != simple_type_union_impl->sim_type_content)
     {
-        AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(
+        XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(
             simple_type_union_impl->sim_type_content , env);
             simple_type_union_impl->sim_type_content = NULL;
     }
@@ -269,11 +269,11 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_xml_schema_simple_type_content_t *AXIS2_CALL
-axis2_xml_schema_simple_type_union_get_base_impl(void *simple_type_union,
+xml_schema_simple_type_content_t *AXIS2_CALL
+xml_schema_simple_type_union_get_base_impl(void *simple_type_union,
                                 const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_union_impl_t *simple_type_union_impl = NULL;
+    xml_schema_simple_type_union_impl_t *simple_type_union_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     simple_type_union_impl = AXIS2_INTF_TO_IMPL(simple_type_union);
@@ -283,23 +283,23 @@
 
 /*
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_union_resolve_methods(
-                    axis2_xml_schema_simple_type_union_t *simple_type_union,
+xml_schema_simple_type_union_resolve_methods(
+                    xml_schema_simple_type_union_t *simple_type_union,
                     const axis2_env_t *env,
-                    axis2_xml_schema_simple_type_union_t *simple_type_union_impl,
+                    xml_schema_simple_type_union_t *simple_type_union_impl,
                     axis2_hash_t *methods)
 {
-    axis2_xml_schema_simple_type_union_impl_t *simple_type_union_impl_l = NULL;
+    xml_schema_simple_type_union_impl_t *simple_type_union_impl_l = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, simple_type_union_impl, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
     
     simple_type_union_impl_l = 
-        (axis2_xml_schema_simple_type_union_impl_t *) simple_type_union_impl;
+        (xml_schema_simple_type_union_impl_t *) simple_type_union_impl;
     
     simple_type_union->ops = AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_xml_schema_simple_type_union_ops_t));
+            sizeof(xml_schema_simple_type_union_ops_t));
     if(NULL != simple_type_union->ops)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -322,14 +322,14 @@
     simple_type_union->ops->set_member_types_source = 
             simple_type_union_impl_l->simple_type_union.ops->set_member_types_source;
     
-    return axis2_xml_schema_simple_type_content_resolve_methods(
+    return xml_schema_simple_type_content_resolve_methods(
                 &(simple_type_union->base), env, 
                 simple_type_union_impl_l->sim_type_content, methods);
 }
 */
 
-axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_simple_type_union_get_base_types(void *simple_type_union,
+xml_schema_obj_collection_t* AXIS2_CALL
+xml_schema_simple_type_union_get_base_types(void *simple_type_union,
                                             const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -338,17 +338,17 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_union_set_member_types_source(void *simple_type_union,
+xml_schema_simple_type_union_set_member_types_source(void *simple_type_union,
                              const axis2_env_t *env,
                              axis2_char_t *member_types_source)
 
 {
-    axis2_xml_schema_simple_type_union_impl_t *sim_type_res_impl = NULL;
+    xml_schema_simple_type_union_impl_t *sim_type_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     sim_type_res_impl = AXIS2_INTF_TO_IMPL(simple_type_union);
     if(NULL != sim_type_res_impl->member_types_source)
     {
-        AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(sim_type_res_impl->member_types_source, env);
+        XML_SCHEMA_SIMPLE_TYPE_CONTENT_FREE(sim_type_res_impl->member_types_source, env);
         sim_type_res_impl->member_types_source = NULL;
     }
     
@@ -358,7 +358,7 @@
 }
 
 axis2_char_t* AXIS2_CALL
-axis2_xml_schema_simple_type_union_get_member_types_source
+xml_schema_simple_type_union_get_member_types_source
                             (void *simple_type_union,
                              const axis2_env_t *env)
 {
@@ -368,35 +368,35 @@
 
 
 axis2_array_list_t* AXIS2_CALL
-axis2_xml_schema_simple_type_union_get_member_types_qnames(void *simple_type_union,
+xml_schema_simple_type_union_get_member_types_qnames(void *simple_type_union,
                                                            const axis2_env_t *env)
 {
-    axis2_xml_schema_simple_type_union_impl_t *sim_type_res_impl = NULL;
+    xml_schema_simple_type_union_impl_t *sim_type_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     return sim_type_res_impl->member_types_qnames;
 }
 
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_union_get_type(void *simple_type_union,
+xml_schema_types_t AXIS2_CALL
+xml_schema_simple_type_union_get_type(void *simple_type_union,
                                         const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_union)->obj_type;
 }                                        
 
 axis2_hash_t *AXIS2_CALL
-axis2_xml_schema_simple_type_union_super_objs(void *simple_type_union,
+xml_schema_simple_type_union_super_objs(void *simple_type_union,
                                         const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type_union)->ht_super;
 }                                        
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_union_set_member_types_qnames(
+xml_schema_simple_type_union_set_member_types_qnames(
         void *simple_type_union,
         const axis2_env_t *env,
         axis2_array_list_t *qns)
 {
-    axis2_xml_schema_simple_type_union_impl_t *sim_type_union_impl = NULL;
+    xml_schema_simple_type_union_impl_t *sim_type_union_impl = NULL;
     AXIS2_PARAM_CHECK(env->error, qns, AXIS2_FAILURE);
     sim_type_union_impl = AXIS2_INTF_TO_IMPL(simple_type_union);
     sim_type_union_impl->member_types_qnames = qns;



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