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 [11/18] - in /webservices/axis2/trunk/c/xml_schema: include/ samples/ src/ test/

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c?rev=413626&r1=413625&r2=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c Mon Jun 12 03:29:40 2006
@@ -14,115 +14,115 @@
  * limitations under the License.
  */
 
-#include <axis2_xml_schema_complex_content_restriction.h>
+#include <xml_schema_complex_content_restriction.h>
 #include <axis2_utils.h>
 
-typedef struct axis2_xml_schema_complex_content_restriction_impl 
-                    axis2_xml_schema_complex_content_restriction_impl_t;
+typedef struct xml_schema_complex_content_restriction_impl 
+                    xml_schema_complex_content_restriction_impl_t;
 
 /** 
  * @brief Other Extension Struct Impl
  *   Axis2 Other Extension  
  */ 
-struct axis2_xml_schema_complex_content_restriction_impl
+struct xml_schema_complex_content_restriction_impl
 {
-    axis2_xml_schema_complex_content_restriction_t cmp_content_res;
+    xml_schema_complex_content_restriction_t cmp_content_res;
     
-    axis2_xml_schema_annotated_t *annotated;
+    xml_schema_annotated_t *annotated;
     
-    axis2_xml_schema_obj_collection_t *attributes;
+    xml_schema_obj_collection_t *attributes;
     
-    axis2_xml_schema_any_attribute_t *any_attribute;
+    xml_schema_any_attribute_t *any_attribute;
     
     axis2_qname_t *base_type_name;
     
-    axis2_xml_schema_particle_t *particle;
+    xml_schema_particle_t *particle;
     
     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(cmp_content_res) \
-        ((axis2_xml_schema_complex_content_restriction_impl_t *) cmp_content_res)
+        ((xml_schema_complex_content_restriction_impl_t *) cmp_content_res)
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_complex_content_restriction_free(
+xml_schema_complex_content_restriction_free(
         void *cmp_content_res,
         const axis2_env_t *env);
 
-axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_base_impl(
+xml_schema_annotated_t *AXIS2_CALL
+xml_schema_complex_content_restriction_get_base_impl(
         void *cmp_content_res,
         const axis2_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_super_objs(
+xml_schema_complex_content_restriction_super_objs(
         void *cmp_content_res,
         const axis2_env_t *env);
 
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_type(
+xml_schema_types_t AXIS2_CALL
+xml_schema_complex_content_restriction_get_type(
         void *cmp_content_res,
         const axis2_env_t *env);
 
-axis2_xml_schema_any_attribute_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_any_attribute(
+xml_schema_any_attribute_t* AXIS2_CALL
+xml_schema_complex_content_restriction_get_any_attribute(
         void *cmp_content_res,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_set_any_attribute(
+xml_schema_complex_content_restriction_set_any_attribute(
         void *cmp_content_res,
         const axis2_env_t *env,
-        axis2_xml_schema_any_attribute_t *any_attr);
+        xml_schema_any_attribute_t *any_attr);
 
-axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_attributes(
+xml_schema_obj_collection_t* AXIS2_CALL
+xml_schema_complex_content_restriction_get_attributes(
         void *cmp_content_res,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_set_base_type_name(
+xml_schema_complex_content_restriction_set_base_type_name(
         void *cmp_content_res,
         const axis2_env_t *env,
         axis2_qname_t *base_type_name);
                                           
 axis2_qname_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_base_type_name(
+xml_schema_complex_content_restriction_get_base_type_name(
         void *cmp_content_res,
         const axis2_env_t *env);
                                           
 axis2_char_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_to_string(
+xml_schema_complex_content_restriction_to_string(
         void *cmp_cnt_res,
         const axis2_env_t *env,
         axis2_char_t *prefix,
         int tab);  
                                         
-axis2_xml_schema_particle_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_particle(
+xml_schema_particle_t* AXIS2_CALL
+xml_schema_complex_content_restriction_get_particle(
         void *cmp_cnt_res,
         const axis2_env_t *env);
                                         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_set_particle(
+xml_schema_complex_content_restriction_set_particle(
         void *cmp_content,
         const axis2_env_t *env,
-        axis2_xml_schema_particle_t *particle);
+        xml_schema_particle_t *particle);
                                                                          
                                           
 /*****************************************************************************/                                          
-AXIS2_EXTERN axis2_xml_schema_complex_content_restriction_t * AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_create(const axis2_env_t *env)
+AXIS2_EXTERN xml_schema_complex_content_restriction_t * AXIS2_CALL
+xml_schema_complex_content_restriction_create(const axis2_env_t *env)
 {
-    axis2_xml_schema_complex_content_restriction_impl_t *cmp_content_res_impl = NULL;
+    xml_schema_complex_content_restriction_impl_t *cmp_content_res_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
-    cmp_content_res_impl = (axis2_xml_schema_complex_content_restriction_impl_t*)
-        AXIS2_MALLOC(env->allocator, sizeof(axis2_xml_schema_complex_content_restriction_impl_t));
+    cmp_content_res_impl = (xml_schema_complex_content_restriction_impl_t*)
+        AXIS2_MALLOC(env->allocator, sizeof(xml_schema_complex_content_restriction_impl_t));
         
     if(!cmp_content_res_impl)
     {
@@ -139,14 +139,14 @@
     cmp_content_res_impl->particle = NULL;
     cmp_content_res_impl->methods = NULL;
     cmp_content_res_impl->ht_super = NULL;
-    cmp_content_res_impl->obj_type = AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION;
+    cmp_content_res_impl->obj_type = XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION;
     
         
     cmp_content_res_impl->cmp_content_res.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_complex_content_restriction_ops_t));
+                    sizeof(xml_schema_complex_content_restriction_ops_t));
     if(!cmp_content_res_impl->cmp_content_res.ops)
     {
-        axis2_xml_schema_complex_content_restriction_free(
+        xml_schema_complex_content_restriction_free(
             &(cmp_content_res_impl->cmp_content_res), env);
         AXIS2_ERROR_SET(env->error, 
             AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -155,124 +155,124 @@
 
 
     cmp_content_res_impl->cmp_content_res.ops->free = 
-            axis2_xml_schema_complex_content_restriction_free;
+            xml_schema_complex_content_restriction_free;
             
     cmp_content_res_impl->cmp_content_res.ops->get_type = 
-            axis2_xml_schema_complex_content_restriction_get_type;
+            xml_schema_complex_content_restriction_get_type;
             
     cmp_content_res_impl->cmp_content_res.ops->super_objs = 
-            axis2_xml_schema_complex_content_restriction_super_objs;                        
+            xml_schema_complex_content_restriction_super_objs;                        
             
     cmp_content_res_impl->cmp_content_res.ops->get_base_impl = 
-            axis2_xml_schema_complex_content_restriction_get_base_impl;
+            xml_schema_complex_content_restriction_get_base_impl;
             
     cmp_content_res_impl->cmp_content_res.ops->get_any_attribute = 
-            axis2_xml_schema_complex_content_restriction_get_any_attribute;
+            xml_schema_complex_content_restriction_get_any_attribute;
             
     cmp_content_res_impl->cmp_content_res.ops->set_any_attribute = 
-            axis2_xml_schema_complex_content_restriction_set_any_attribute;
+            xml_schema_complex_content_restriction_set_any_attribute;
             
     cmp_content_res_impl->cmp_content_res.ops->get_attributes = 
-            axis2_xml_schema_complex_content_restriction_get_attributes;
+            xml_schema_complex_content_restriction_get_attributes;
             
     cmp_content_res_impl->cmp_content_res.ops->get_base_type_name = 
-            axis2_xml_schema_complex_content_restriction_get_base_type_name;
+            xml_schema_complex_content_restriction_get_base_type_name;
             
     cmp_content_res_impl->cmp_content_res.ops->set_base_type_name =
-            axis2_xml_schema_complex_content_restriction_set_base_type_name; 
+            xml_schema_complex_content_restriction_set_base_type_name; 
             
     cmp_content_res_impl->cmp_content_res.ops->get_particle =
-            axis2_xml_schema_complex_content_restriction_get_particle;             
+            xml_schema_complex_content_restriction_get_particle;             
             
     cmp_content_res_impl->cmp_content_res.ops->set_particle =
-            axis2_xml_schema_complex_content_restriction_set_particle;
+            xml_schema_complex_content_restriction_set_particle;
             
     cmp_content_res_impl->cmp_content_res.ops->to_string =
-            axis2_xml_schema_complex_content_restriction_to_string;
+            xml_schema_complex_content_restriction_to_string;
             
             
     cmp_content_res_impl->methods = axis2_hash_make(env);
     cmp_content_res_impl->ht_super = axis2_hash_make(env);
     if(!cmp_content_res_impl->methods || !cmp_content_res_impl->ht_super)
     {
-        axis2_xml_schema_complex_content_restriction_free(
+        xml_schema_complex_content_restriction_free(
                 &(cmp_content_res_impl->cmp_content_res), env);
         return NULL;
     }
     
     axis2_hash_set(cmp_content_res_impl->methods,"free", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_free);
+            xml_schema_complex_content_restriction_free);
             
     axis2_hash_set(cmp_content_res_impl->methods,"get_type", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_get_type);
+            xml_schema_complex_content_restriction_get_type);
             
     axis2_hash_set(cmp_content_res_impl->methods,"super_objs", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_super_objs);                        
+            xml_schema_complex_content_restriction_super_objs);                        
             
     axis2_hash_set(cmp_content_res_impl->methods,"get_any_attribute", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_get_any_attribute);
+            xml_schema_complex_content_restriction_get_any_attribute);
             
     axis2_hash_set(cmp_content_res_impl->methods,"set_any_attribute", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_set_any_attribute);
+            xml_schema_complex_content_restriction_set_any_attribute);
             
     axis2_hash_set(cmp_content_res_impl->methods,"get_attributes", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_get_attributes);
+            xml_schema_complex_content_restriction_get_attributes);
             
     axis2_hash_set(cmp_content_res_impl->methods,"get_base_type_name", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_get_base_type_name);
+            xml_schema_complex_content_restriction_get_base_type_name);
             
     axis2_hash_set(cmp_content_res_impl->methods,"set_base_type_name", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_set_base_type_name); 
+            xml_schema_complex_content_restriction_set_base_type_name); 
             
     axis2_hash_set(cmp_content_res_impl->methods,"get_particle", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_get_particle);             
+            xml_schema_complex_content_restriction_get_particle);             
             
     axis2_hash_set(cmp_content_res_impl->methods,"set_particle", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_set_particle);
+            xml_schema_complex_content_restriction_set_particle);
             
     axis2_hash_set(cmp_content_res_impl->methods,"to_string", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_to_string);                                        
+            xml_schema_complex_content_restriction_to_string);                                        
             
-    cmp_content_res_impl->annotated = axis2_xml_schema_annotated_create(env);
+    cmp_content_res_impl->annotated = xml_schema_annotated_create(env);
     if(!cmp_content_res_impl->annotated)
     {
-        axis2_xml_schema_complex_content_restriction_free(
+        xml_schema_complex_content_restriction_free(
                 &(cmp_content_res_impl->cmp_content_res), env);
         return NULL;
     }
-    cmp_content_res_impl->attributes = axis2_xml_schema_obj_collection_create(env);
+    cmp_content_res_impl->attributes = xml_schema_obj_collection_create(env);
     if(!cmp_content_res_impl->attributes)
     {
-        axis2_xml_schema_complex_content_restriction_free(
+        xml_schema_complex_content_restriction_free(
             &(cmp_content_res_impl->cmp_content_res), env);
         return NULL;            
     }
      
-    axis2_hash_set(cmp_content_res_impl->methods,"AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION",
+    axis2_hash_set(cmp_content_res_impl->methods,"XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION",
         AXIS2_HASH_KEY_STRING, &(cmp_content_res_impl->cmp_content_res));                                  
-    axis2_hash_set(cmp_content_res_impl->methods,"AXIS2_XML_SCHEMA_ANNOTATED",
+    axis2_hash_set(cmp_content_res_impl->methods,"XML_SCHEMA_ANNOTATED",
         AXIS2_HASH_KEY_STRING, cmp_content_res_impl->annotated);                              
-    axis2_hash_set(cmp_content_res_impl->methods,"AXIS2_XML_SCHEMA_OBJ",
+    axis2_hash_set(cmp_content_res_impl->methods,"XML_SCHEMA_OBJ",
         AXIS2_HASH_KEY_STRING, 
-        AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(cmp_content_res_impl->annotated, env));                              
-    axis2_xml_schema_annotated_resolve_methods(&(cmp_content_res_impl->cmp_content_res.base),
+        XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(cmp_content_res_impl->annotated, env));                              
+    xml_schema_annotated_resolve_methods(&(cmp_content_res_impl->cmp_content_res.base),
         env, cmp_content_res_impl->annotated, cmp_content_res_impl->methods);
                 
     return &(cmp_content_res_impl->cmp_content_res);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_free(
+xml_schema_complex_content_restriction_free(
         void *cmp_content_res,
         const axis2_env_t *env)
 {
-    axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
+    xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     content_res_impl = AXIS2_INTF_TO_IMPL(cmp_content_res);
     if(NULL != content_res_impl->any_attribute)
     {
-        AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_res_impl->any_attribute, env);
+        XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_res_impl->any_attribute, env);
         content_res_impl->any_attribute = NULL;
     }
     if(NULL != content_res_impl->attributes)
@@ -288,7 +288,7 @@
    
     if(NULL != content_res_impl->annotated)
     {
-        AXIS2_XML_SCHEMA_ANNOTATED_FREE(content_res_impl->annotated, env);
+        XML_SCHEMA_ANNOTATED_FREE(content_res_impl->annotated, env);
         content_res_impl->annotated = NULL;
     }
       if(NULL != content_res_impl->cmp_content_res.base.ops)
@@ -307,12 +307,12 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_base_impl(
+xml_schema_annotated_t *AXIS2_CALL
+xml_schema_complex_content_restriction_get_base_impl(
         void *cmp_content_res,
         const axis2_env_t *env)
 {
-    axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
+    xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     content_res_impl = AXIS2_INTF_TO_IMPL(cmp_content_res);
     return content_res_impl->annotated;
@@ -320,30 +320,30 @@
 
 
 
-axis2_xml_schema_any_attribute_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_any_attribute(
+xml_schema_any_attribute_t* AXIS2_CALL
+xml_schema_complex_content_restriction_get_any_attribute(
         void *cmp_content_res,
         const axis2_env_t *env)
 {
-    axis2_xml_schema_complex_content_restriction_impl_t *cnt_res_impl = NULL;
+    xml_schema_complex_content_restriction_impl_t *cnt_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     cnt_res_impl = AXIS2_INTF_TO_IMPL(cmp_content_res);
     return cnt_res_impl->any_attribute;    
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_set_any_attribute(
+xml_schema_complex_content_restriction_set_any_attribute(
         void *cmp_content_res,
         const axis2_env_t *env,
-        axis2_xml_schema_any_attribute_t *any_attr)
+        xml_schema_any_attribute_t *any_attr)
 {
-    axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
+    xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, any_attr, AXIS2_FAILURE);
     if(NULL != content_res_impl->any_attribute)
     {
-        AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_res_impl->any_attribute, env);
+        XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_res_impl->any_attribute, env);
         content_res_impl->any_attribute = NULL;
     }
     
@@ -351,35 +351,35 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_attributes(
+xml_schema_obj_collection_t* AXIS2_CALL
+xml_schema_complex_content_restriction_get_attributes(
         void *cmp_content,
         const axis2_env_t *env)
 {
-    axis2_xml_schema_complex_content_restriction_impl_t *cnt_res_impl = NULL;
+    xml_schema_complex_content_restriction_impl_t *cnt_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     cnt_res_impl = AXIS2_INTF_TO_IMPL(cmp_content);
     return cnt_res_impl->attributes;
 }
 
 axis2_qname_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_base_type_name(
+xml_schema_complex_content_restriction_get_base_type_name(
         void *cmp_content,
         const axis2_env_t *env)
 {
-    axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
+    xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     content_res_impl = AXIS2_INTF_TO_IMPL(cmp_content);
     return content_res_impl->base_type_name;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_set_base_type_name(
+xml_schema_complex_content_restriction_set_base_type_name(
         void *cmp_content,
         const axis2_env_t *env,
         axis2_qname_t *base_type_name)
 {
-    axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
+    xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     content_res_impl = AXIS2_INTF_TO_IMPL(cmp_content);
     if(NULL != content_res_impl->base_type_name)
@@ -392,18 +392,18 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_set_particle(
+xml_schema_complex_content_restriction_set_particle(
         void *cmp_content,
         const axis2_env_t *env,
-        axis2_xml_schema_particle_t *particle)
+        xml_schema_particle_t *particle)
 {
-    axis2_xml_schema_complex_content_restriction_impl_t *cmp_cnt_res_impl = NULL;
+    xml_schema_complex_content_restriction_impl_t *cmp_cnt_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, particle, AXIS2_FAILURE);
     
     if(NULL != cmp_cnt_res_impl->particle)
     {
-        AXIS2_XML_SCHEMA_PARTICLE_FREE(cmp_cnt_res_impl->particle, env);
+        XML_SCHEMA_PARTICLE_FREE(cmp_cnt_res_impl->particle, env);
         cmp_cnt_res_impl->particle = NULL;
     }
 
@@ -411,8 +411,8 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_xml_schema_particle_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_particle(
+xml_schema_particle_t* AXIS2_CALL
+xml_schema_complex_content_restriction_get_particle(
         void *cmp_cnt_res,
         const axis2_env_t *env)
 {
@@ -420,7 +420,7 @@
 }
                                                                                   
 axis2_char_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_to_string(
+xml_schema_complex_content_restriction_to_string(
         void *cmp_cnt_res,
         const axis2_env_t *env,
         axis2_char_t *prefix,
@@ -431,15 +431,15 @@
 }         
 
 axis2_hash_t *AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_super_objs(
+xml_schema_complex_content_restriction_super_objs(
         void *cmp_content_res,
         const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_content_res)->ht_super;
 }        
 
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_type(
+xml_schema_types_t AXIS2_CALL
+xml_schema_complex_content_restriction_get_type(
         void *cmp_content_res,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c?rev=413626&r1=413625&r2=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c Mon Jun 12 03:29:40 2006
@@ -14,46 +14,46 @@
  * limitations under the License.
  */
  
-#include <axis2_xml_schema.h>
-#include <axis2_xml_schema_constants.h>
-#include <axis2_xml_schema_complex_type.h>
-#include <axis2_xml_schema_data_type.h>
-#include <axis2_xml_schema_derivation_method.h>
+#include <xml_schema.h>
+#include <xml_schema_constants.h>
+#include <xml_schema_complex_type.h>
+#include <xml_schema_data_type.h>
+#include <xml_schema_derivation_method.h>
 #include <axis2_qname.h>
 
-typedef struct axis2_xml_schema_complex_type_impl 
-                axis2_xml_schema_complex_type_impl_t;
+typedef struct xml_schema_complex_type_impl 
+                xml_schema_complex_type_impl_t;
 
 /** 
  * @brief Other Extension Struct Impl
  *   Axis2 Other Extension  
  */ 
-struct axis2_xml_schema_complex_type_impl
+struct xml_schema_complex_type_impl
 {
-    axis2_xml_schema_complex_type_t complex_type;
+    xml_schema_complex_type_t complex_type;
 
     /** parent type */
-    axis2_xml_schema_type_t *schema_type;    
+    xml_schema_type_t *schema_type;    
     
-    axis2_xml_schema_any_attribute_t *any_attr, *attr_wildcard;
+    xml_schema_any_attribute_t *any_attr, *attr_wildcard;
     
-    axis2_xml_schema_obj_collection_t *attributes;
+    xml_schema_obj_collection_t *attributes;
     
-    axis2_xml_schema_obj_table_t *attr_uses;
+    xml_schema_obj_table_t *attr_uses;
     
-    axis2_xml_schema_derivation_method_t *block, *block_resolved;
+    xml_schema_derivation_method_t *block, *block_resolved;
     
     /** type stores the type of model stored in content_model */    
     void *content_model;        
     
-    axis2_xml_schema_content_type_t *content_type;
+    xml_schema_content_type_t *content_type;
     
     void *particle_type;
     void *particle;
     
     axis2_bool_t is_abstract, is_mixed;
     
-    axis2_xml_schema_types_t obj_type;
+    xml_schema_types_t obj_type;
     
     axis2_hash_t *ht_super;
     
@@ -62,135 +62,135 @@
 };
 
 #define AXIS2_INTF_TO_IMPL(complex_type) \
-        ((axis2_xml_schema_complex_type_impl_t *) complex_type)
+        ((xml_schema_complex_type_impl_t *) complex_type)
 
 /************************** function prototypes ******************************/
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_complex_type_free(
+xml_schema_complex_type_free(
         void *complex_type,
         const axis2_env_t *env);
         
 
-axis2_xml_schema_type_t* AXIS2_CALL
-axis2_xml_schema_complex_type_get_base_impl(
+xml_schema_type_t* AXIS2_CALL
+xml_schema_complex_type_get_base_impl(
         void *complex_type,
         const axis2_env_t *env);
         
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_type_get_type(
+xml_schema_types_t AXIS2_CALL
+xml_schema_complex_type_get_type(
         void *complex_type,
         const axis2_env_t *env);
         
 axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_complex_type_super_objs(
+xml_schema_complex_type_super_objs(
         void *complex_type,
         const axis2_env_t *env);                
         
-axis2_xml_schema_any_attribute_t* AXIS2_CALL 
-axis2_xml_schema_complex_type_get_any_attribute(
+xml_schema_any_attribute_t* AXIS2_CALL 
+xml_schema_complex_type_get_any_attribute(
         void *cmp_type,
         const axis2_env_t *env);
         
 axis2_status_t  AXIS2_CALL 
-axis2_xml_schema_complex_type_set_any_attribute(
+xml_schema_complex_type_set_any_attribute(
         void *cmp_type,
         const axis2_env_t *env,
-        axis2_xml_schema_any_attribute_t *any_attr);
+        xml_schema_any_attribute_t *any_attr);
         
-axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_complex_type_get_attributes(
+xml_schema_obj_collection_t* AXIS2_CALL
+xml_schema_complex_type_get_attributes(
         void *cmp_type,
         const axis2_env_t *env);
         
-axis2_xml_schema_obj_table_t* AXIS2_CALL
-axis2_xml_schema_complex_type_get_attribute_use(
+xml_schema_obj_table_t* AXIS2_CALL
+xml_schema_complex_type_get_attribute_use(
         void *cmp_type,
         const axis2_env_t *env);
 
-axis2_xml_schema_any_attribute_t* AXIS2_CALL
-axis2_xml_schema_complex_type_get_attribute_wildcard(
+xml_schema_any_attribute_t* AXIS2_CALL
+xml_schema_complex_type_get_attribute_wildcard(
         void *cmp_type,
         const axis2_env_t *env);
         
-axis2_xml_schema_derivation_method_t* AXIS2_CALL
-axis2_xml_schema_complex_type_get_block(
+xml_schema_derivation_method_t* AXIS2_CALL
+xml_schema_complex_type_get_block(
         void *cmp_type,
         const axis2_env_t *env);
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_block(
+xml_schema_complex_type_set_block(
         void *cmp_type,
         const axis2_env_t *env,
-        axis2_xml_schema_derivation_method_t *block);
+        xml_schema_derivation_method_t *block);
         
-axis2_xml_schema_derivation_method_t* AXIS2_CALL
-axis2_xml_schema_complex_type_get_block_resolved(
+xml_schema_derivation_method_t* AXIS2_CALL
+xml_schema_complex_type_get_block_resolved(
         void *cmp_type,
         const axis2_env_t *env);
         
 void* AXIS2_CALL
-axis2_xml_schema_complex_type_get_content_model(
+xml_schema_complex_type_get_content_model(
         void *cmp_type,
         const axis2_env_t *env);
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_content_model(
+xml_schema_complex_type_set_content_model(
         void *cmp_type,
         const axis2_env_t *env,
         void *content_model);
         
-axis2_xml_schema_content_type_t* AXIS2_CALL 
-axis2_xml_schema_complex_type_get_content_type(
+xml_schema_content_type_t* AXIS2_CALL 
+xml_schema_complex_type_get_content_type(
         void *cmp_type,
         const axis2_env_t *env);
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_content_type(
+xml_schema_complex_type_set_content_type(
         void *cmp_type,
         const axis2_env_t *env,
-        axis2_xml_schema_content_type_t *content_type);    
+        xml_schema_content_type_t *content_type);    
         
-axis2_xml_schema_particle_t * AXIS2_CALL
-axis2_xml_schema_complex_type_get_content_type_particle(
+xml_schema_particle_t * AXIS2_CALL
+xml_schema_complex_type_get_content_type_particle(
         void *cmp_type,
         const axis2_env_t *env);                    
                                             
 axis2_bool_t AXIS2_CALL
-axis2_xml_schema_complex_type_is_abstract(
+xml_schema_complex_type_is_abstract(
         void *cmp_type,
         const axis2_env_t *env);
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_abstract(
+xml_schema_complex_type_set_abstract(
         void *cmp_type,
         const axis2_env_t *env,
         axis2_bool_t b);
         
 axis2_bool_t AXIS2_CALL
-axis2_xml_schema_complex_type_is_mixed(
+xml_schema_complex_type_is_mixed(
         void *cmp_type,
         const axis2_env_t *env);
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_mixed(
+xml_schema_complex_type_set_mixed(
         void *cmp_type,
         const axis2_env_t *env,
         axis2_bool_t b);
         
 void* AXIS2_CALL
-axis2_xml_schema_complex_type_get_particle(
+xml_schema_complex_type_get_particle(
         void *cmp_type,
         const axis2_env_t *env);
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_particle(
+xml_schema_complex_type_set_particle(
         void *cmp_type,
         const axis2_env_t *env,
         void *particle);
                     
 axis2_char_t* AXIS2_CALL
-axis2_xml_schema_complex_type_to_string(
+xml_schema_complex_type_to_string(
         void *cmp_type,
         const axis2_env_t *env,
         axis2_char_t *prefix,
@@ -199,16 +199,16 @@
                                 
 /************************** end ***********************************************/                                
 
-AXIS2_EXTERN axis2_xml_schema_complex_type_t * AXIS2_CALL
-axis2_xml_schema_complex_type_create(
+AXIS2_EXTERN xml_schema_complex_type_t * AXIS2_CALL
+xml_schema_complex_type_create(
         const axis2_env_t *env,
-        axis2_xml_schema_t *schema)
+        xml_schema_t *schema)
 {
-    axis2_xml_schema_complex_type_impl_t *complex_type_impl = NULL;
-    axis2_xml_schema_annotated_t *annotated = NULL;
+    xml_schema_complex_type_impl_t *complex_type_impl = NULL;
+    xml_schema_annotated_t *annotated = NULL;
 
     complex_type_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_complex_type_impl_t));
+                    sizeof(xml_schema_complex_type_impl_t));
     if(!complex_type_impl)
     {
         AXIS2_ERROR_SET(env->error,
@@ -230,184 +230,184 @@
     complex_type_impl->is_mixed = AXIS2_FALSE;
     complex_type_impl->is_abstract = AXIS2_FALSE;
     complex_type_impl->ht_super = NULL;
-    complex_type_impl->obj_type = AXIS2_XML_SCHEMA_COMPLEX_TYPE;
+    complex_type_impl->obj_type = XML_SCHEMA_COMPLEX_TYPE;
     complex_type_impl->methods = NULL;
     
     complex_type_impl->complex_type.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_complex_type_ops_t));
+                    sizeof(xml_schema_complex_type_ops_t));
     if(!complex_type_impl->complex_type.ops)
     {
-        axis2_xml_schema_complex_type_free(&(complex_type_impl->complex_type), env);
+        xml_schema_complex_type_free(&(complex_type_impl->complex_type), env);
         AXIS2_ERROR_SET(env->error,
             AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
 
-    complex_type_impl->schema_type = axis2_xml_schema_type_create(env, schema);
+    complex_type_impl->schema_type = xml_schema_type_create(env, schema);
     if(!complex_type_impl->schema_type)
     {
-        axis2_xml_schema_complex_type_free(&(complex_type_impl->complex_type), env);
+        xml_schema_complex_type_free(&(complex_type_impl->complex_type), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
-    complex_type_impl->attributes = axis2_xml_schema_obj_collection_create(env);
+    complex_type_impl->attributes = xml_schema_obj_collection_create(env);
     
     if(!complex_type_impl->attributes)
     {
-        axis2_xml_schema_complex_type_free(&(complex_type_impl->complex_type), env);
+        xml_schema_complex_type_free(&(complex_type_impl->complex_type), env);
         return NULL;
     }
     
-    complex_type_impl->block = axis2_xml_schema_derivation_method_create(env, "none");
+    complex_type_impl->block = xml_schema_derivation_method_create(env, "none");
     if(!complex_type_impl->block)
     {
-        axis2_xml_schema_complex_type_free(&(complex_type_impl->complex_type), env);
+        xml_schema_complex_type_free(&(complex_type_impl->complex_type), env);
         return NULL;
     }    
     
     complex_type_impl->complex_type.ops->free = 
-        axis2_xml_schema_complex_type_free;
+        xml_schema_complex_type_free;
     complex_type_impl->complex_type.ops->get_type =
-        axis2_xml_schema_complex_type_get_type;
+        xml_schema_complex_type_get_type;
     complex_type_impl->complex_type.ops->super_objs =
-        axis2_xml_schema_complex_type_super_objs;            
+        xml_schema_complex_type_super_objs;            
     complex_type_impl->complex_type.ops->get_base_impl = 
-        axis2_xml_schema_complex_type_get_base_impl;
+        xml_schema_complex_type_get_base_impl;
     complex_type_impl->complex_type.ops->get_any_attribute =
-        axis2_xml_schema_complex_type_get_any_attribute;
+        xml_schema_complex_type_get_any_attribute;
     complex_type_impl->complex_type.ops->set_any_attribute =
-        axis2_xml_schema_complex_type_set_any_attribute;
+        xml_schema_complex_type_set_any_attribute;
     complex_type_impl->complex_type.ops->get_attributes =
-        axis2_xml_schema_complex_type_get_attributes;
+        xml_schema_complex_type_get_attributes;
     complex_type_impl->complex_type.ops->get_attribute_use =
-        axis2_xml_schema_complex_type_get_attribute_use;
+        xml_schema_complex_type_get_attribute_use;
     complex_type_impl->complex_type.ops->get_attribute_wildcard =
-        axis2_xml_schema_complex_type_get_attribute_wildcard;
+        xml_schema_complex_type_get_attribute_wildcard;
     complex_type_impl->complex_type.ops->get_block =
-        axis2_xml_schema_complex_type_get_block;
+        xml_schema_complex_type_get_block;
     complex_type_impl->complex_type.ops->set_block =
-        axis2_xml_schema_complex_type_set_block;
+        xml_schema_complex_type_set_block;
     complex_type_impl->complex_type.ops->get_block_resolved =
-        axis2_xml_schema_complex_type_get_block_resolved;
+        xml_schema_complex_type_get_block_resolved;
     complex_type_impl->complex_type.ops->get_content_model =
-        axis2_xml_schema_complex_type_get_content_model;
+        xml_schema_complex_type_get_content_model;
     complex_type_impl->complex_type.ops->set_content_model =
-        axis2_xml_schema_complex_type_set_content_model;
+        xml_schema_complex_type_set_content_model;
     complex_type_impl->complex_type.ops->get_content_type =
-        axis2_xml_schema_complex_type_get_content_type;
+        xml_schema_complex_type_get_content_type;
     complex_type_impl->complex_type.ops->set_content_type =
-        axis2_xml_schema_complex_type_set_content_type;                          
+        xml_schema_complex_type_set_content_type;                          
     complex_type_impl->complex_type.ops->get_content_type_particle =
-        axis2_xml_schema_complex_type_get_content_type_particle;
+        xml_schema_complex_type_get_content_type_particle;
     complex_type_impl->complex_type.ops->is_abstract =
-        axis2_xml_schema_complex_type_is_abstract;
+        xml_schema_complex_type_is_abstract;
     complex_type_impl->complex_type.ops->set_abstract =
-        axis2_xml_schema_complex_type_set_abstract;
+        xml_schema_complex_type_set_abstract;
     complex_type_impl->complex_type.ops->is_mixed =
-        axis2_xml_schema_complex_type_is_mixed;         
+        xml_schema_complex_type_is_mixed;         
     complex_type_impl->complex_type.ops->set_mixed =
-        axis2_xml_schema_complex_type_set_mixed;
+        xml_schema_complex_type_set_mixed;
     complex_type_impl->complex_type.ops->get_particle =
-        axis2_xml_schema_complex_type_get_particle;
+        xml_schema_complex_type_get_particle;
     complex_type_impl->complex_type.ops->set_particle =
-        axis2_xml_schema_complex_type_set_particle;
+        xml_schema_complex_type_set_particle;
     complex_type_impl->complex_type.ops->to_string =
-        axis2_xml_schema_complex_type_to_string;          
+        xml_schema_complex_type_to_string;          
     
     complex_type_impl->methods = axis2_hash_make(env);
     complex_type_impl->ht_super = axis2_hash_make(env);
     
     if(!complex_type_impl->methods || !complex_type_impl->ht_super)
     {
-        axis2_xml_schema_complex_type_free(&(complex_type_impl->complex_type), env);    
+        xml_schema_complex_type_free(&(complex_type_impl->complex_type), env);    
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     axis2_hash_set(complex_type_impl->methods, "free", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_free);
+        xml_schema_complex_type_free);
   axis2_hash_set(complex_type_impl->methods, "get_type", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_get_type);
+        xml_schema_complex_type_get_type);
     axis2_hash_set(complex_type_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_super_objs);            
+        xml_schema_complex_type_super_objs);            
     axis2_hash_set(complex_type_impl->methods, "get_any_attribute", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_get_any_attribute);
+        xml_schema_complex_type_get_any_attribute);
     axis2_hash_set(complex_type_impl->methods, "set_any_attribute", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_set_any_attribute);
+        xml_schema_complex_type_set_any_attribute);
     axis2_hash_set(complex_type_impl->methods, "get_attributes", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_get_attributes);
+        xml_schema_complex_type_get_attributes);
     axis2_hash_set(complex_type_impl->methods, "get_attribute_use", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_get_attribute_use);
+        xml_schema_complex_type_get_attribute_use);
     axis2_hash_set(complex_type_impl->methods, "get_attribute_wildcare", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_get_attribute_wildcard);
+        xml_schema_complex_type_get_attribute_wildcard);
     axis2_hash_set(complex_type_impl->methods, "get_block", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_get_block);
+        xml_schema_complex_type_get_block);
     axis2_hash_set(complex_type_impl->methods, "set_block", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_set_block);
+        xml_schema_complex_type_set_block);
     axis2_hash_set(complex_type_impl->methods, "get_block_resolved", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_get_block_resolved);
+        xml_schema_complex_type_get_block_resolved);
     axis2_hash_set(complex_type_impl->methods, "get_content_model", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_get_content_model);
+        xml_schema_complex_type_get_content_model);
     axis2_hash_set(complex_type_impl->methods, "set_content_model", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_set_content_model);
+        xml_schema_complex_type_set_content_model);
     axis2_hash_set(complex_type_impl->methods, "get_content_type", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_get_content_type);
+        xml_schema_complex_type_get_content_type);
     axis2_hash_set(complex_type_impl->methods, "set_content_type", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_set_content_type);                          
+        xml_schema_complex_type_set_content_type);                          
     axis2_hash_set(complex_type_impl->methods, "get_content_type_particle",
-        AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_type_get_content_type_particle);
+        AXIS2_HASH_KEY_STRING, xml_schema_complex_type_get_content_type_particle);
     axis2_hash_set(complex_type_impl->methods, "is_abstract", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_is_abstract);
+        xml_schema_complex_type_is_abstract);
     axis2_hash_set(complex_type_impl->methods, "set_abstract", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_set_abstract);
+        xml_schema_complex_type_set_abstract);
     axis2_hash_set(complex_type_impl->methods, "is_mixed", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_is_mixed);         
+        xml_schema_complex_type_is_mixed);         
     axis2_hash_set(complex_type_impl->methods, "set_mixed", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_set_mixed);
+        xml_schema_complex_type_set_mixed);
     axis2_hash_set(complex_type_impl->methods, "get_particle", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_get_particle);
+        xml_schema_complex_type_get_particle);
     axis2_hash_set(complex_type_impl->methods, "set_particle", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_set_particle);
+        xml_schema_complex_type_set_particle);
     axis2_hash_set(complex_type_impl->methods, "to_string", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_to_string);
+        xml_schema_complex_type_to_string);
                 
-    axis2_hash_set(complex_type_impl->ht_super, "AXIS2_XML_SCHEMA_COMPLEX_TYPE",
+    axis2_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_COMPLEX_TYPE",
         AXIS2_HASH_KEY_STRING, &(complex_type_impl->complex_type));
-    axis2_hash_set(complex_type_impl->ht_super, "AXIS2_XML_SCHEMA_TYPE",
+    axis2_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_TYPE",
         AXIS2_HASH_KEY_STRING, complex_type_impl->schema_type);
         
     annotated = 
-        AXIS2_XML_SCHEMA_TYPE_GET_BASE_IMPL(complex_type_impl->schema_type, env);         
+        XML_SCHEMA_TYPE_GET_BASE_IMPL(complex_type_impl->schema_type, env);         
     if(NULL != annotated)
     {
-        axis2_hash_set(complex_type_impl->ht_super, "AXIS2_XML_SCHEMA_ANNOTATED",
+        axis2_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_ANNOTATED",
            AXIS2_HASH_KEY_STRING, annotated);
-        axis2_hash_set(complex_type_impl->ht_super, "AXIS2_XML_SCHEMA_OBJ",
+        axis2_hash_set(complex_type_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));
     }        
         
-    axis2_hash_set(complex_type_impl->ht_super, "AXIS2_XML_SCHEMA_COMPLEX_TYPE",
+    axis2_hash_set(complex_type_impl->ht_super, "XML_SCHEMA_COMPLEX_TYPE",
         AXIS2_HASH_KEY_STRING, &(complex_type_impl->complex_type));
                 
-    axis2_xml_schema_type_resolve_methods(&(complex_type_impl->complex_type.base), env,
+    xml_schema_type_resolve_methods(&(complex_type_impl->complex_type.base), env,
         complex_type_impl->schema_type, complex_type_impl->methods);
             
     return &(complex_type_impl->complex_type);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_free(void *complex_type,
+xml_schema_complex_type_free(void *complex_type,
                                     const axis2_env_t *env)
 {
-    axis2_xml_schema_complex_type_impl_t *complex_type_impl = NULL;
+    xml_schema_complex_type_impl_t *complex_type_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     complex_type_impl = AXIS2_INTF_TO_IMPL(complex_type);
 
     if(NULL != complex_type_impl->schema_type)
     {
-        AXIS2_XML_SCHEMA_TYPE_FREE(complex_type_impl->schema_type, env);
+        XML_SCHEMA_TYPE_FREE(complex_type_impl->schema_type, env);
         complex_type_impl->schema_type = NULL;
     }
     if(NULL != complex_type_impl->complex_type.base.ops)
@@ -426,12 +426,12 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_xml_schema_type_t *AXIS2_CALL
-axis2_xml_schema_complex_type_get_base_impl(
+xml_schema_type_t *AXIS2_CALL
+xml_schema_complex_type_get_base_impl(
         void *complex_type,
         const axis2_env_t *env)
 {
-    axis2_xml_schema_complex_type_impl_t *complex_type_impl = NULL;
+    xml_schema_complex_type_impl_t *complex_type_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     complex_type_impl = AXIS2_INTF_TO_IMPL(complex_type);
@@ -439,8 +439,8 @@
     
 }
 
-axis2_xml_schema_any_attribute_t* AXIS2_CALL 
-axis2_xml_schema_complex_type_get_any_attribute(
+xml_schema_any_attribute_t* AXIS2_CALL 
+xml_schema_complex_type_get_any_attribute(
         void *cmp_type,
         const axis2_env_t *env)
 {
@@ -448,12 +448,12 @@
 }
         
 axis2_status_t  AXIS2_CALL 
-axis2_xml_schema_complex_type_set_any_attribute(
+xml_schema_complex_type_set_any_attribute(
         void *cmp_type,
         const axis2_env_t *env,
-        axis2_xml_schema_any_attribute_t *any_attr)
+        xml_schema_any_attribute_t *any_attr)
 {
-    axis2_xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
+    xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
 
     cmp_type_impl = AXIS2_INTF_TO_IMPL(cmp_type);
     if(NULL != cmp_type_impl->any_attr)
@@ -464,32 +464,32 @@
     return AXIS2_SUCCESS;
 }
         
-axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_complex_type_get_attributes(
+xml_schema_obj_collection_t* AXIS2_CALL
+xml_schema_complex_type_get_attributes(
         void *cmp_type,
         const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->attributes;
 }
         
-axis2_xml_schema_obj_table_t* AXIS2_CALL
-axis2_xml_schema_complex_type_get_attribute_use(
+xml_schema_obj_table_t* AXIS2_CALL
+xml_schema_complex_type_get_attribute_use(
         void *cmp_type,
         const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->attr_uses;
 }
 
-axis2_xml_schema_any_attribute_t* AXIS2_CALL
-axis2_xml_schema_complex_type_get_attribute_wildcard(
+xml_schema_any_attribute_t* AXIS2_CALL
+xml_schema_complex_type_get_attribute_wildcard(
         void *cmp_type,
         const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(cmp_type)->attr_wildcard;
 }
         
-axis2_xml_schema_derivation_method_t* AXIS2_CALL
-axis2_xml_schema_complex_type_get_block(
+xml_schema_derivation_method_t* AXIS2_CALL
+xml_schema_complex_type_get_block(
         void *cmp_type,
         const axis2_env_t *env)
 {
@@ -497,12 +497,12 @@
 }
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_block(
+xml_schema_complex_type_set_block(
         void *cmp_type,
         const axis2_env_t *env,
-        axis2_xml_schema_derivation_method_t *block)
+        xml_schema_derivation_method_t *block)
 {
-    axis2_xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
+    xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
     cmp_type_impl = AXIS2_INTF_TO_IMPL(cmp_type);
     if(NULL != cmp_type_impl->block)
     {
@@ -513,8 +513,8 @@
     return AXIS2_SUCCESS;
 }
         
-axis2_xml_schema_derivation_method_t* AXIS2_CALL
-axis2_xml_schema_complex_type_get_block_resolved(
+xml_schema_derivation_method_t* AXIS2_CALL
+xml_schema_complex_type_get_block_resolved(
         void *cmp_type,
         const axis2_env_t *env)
 {
@@ -523,7 +523,7 @@
 }
         
 void* AXIS2_CALL
-axis2_xml_schema_complex_type_get_content_model(
+xml_schema_complex_type_get_content_model(
         void *cmp_type,
         const axis2_env_t *env)
 {
@@ -532,12 +532,12 @@
 }
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_content_model(
+xml_schema_complex_type_set_content_model(
         void *cmp_type,
         const axis2_env_t *env,
         void *content_model)
 {
-    axis2_xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
+    xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
     cmp_type_impl = AXIS2_INTF_TO_IMPL(cmp_type);
     
     if(NULL != cmp_type_impl->content_model)
@@ -548,8 +548,8 @@
     return AXIS2_SUCCESS;
 }
         
-axis2_xml_schema_content_type_t* AXIS2_CALL 
-axis2_xml_schema_complex_type_get_content_type(
+xml_schema_content_type_t* AXIS2_CALL 
+xml_schema_complex_type_get_content_type(
         void *cmp_type,
         const axis2_env_t *env)
 {
@@ -557,12 +557,12 @@
 }
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_content_type(
+xml_schema_complex_type_set_content_type(
         void *cmp_type,
         const axis2_env_t *env,
-        axis2_xml_schema_content_type_t *content_type)
+        xml_schema_content_type_t *content_type)
 {
-    axis2_xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
+    xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
     
     cmp_type_impl = AXIS2_INTF_TO_IMPL(cmp_type);
     if(NULL != cmp_type_impl->content_type)
@@ -573,8 +573,8 @@
     return AXIS2_SUCCESS;
 }    
         
-axis2_xml_schema_particle_t * AXIS2_CALL
-axis2_xml_schema_complex_type_get_content_type_particle(
+xml_schema_particle_t * AXIS2_CALL
+xml_schema_complex_type_get_content_type_particle(
         void *cmp_type,
         const axis2_env_t *env)
 {
@@ -582,7 +582,7 @@
 }                    
                                             
 axis2_bool_t AXIS2_CALL
-axis2_xml_schema_complex_type_is_abstract(
+xml_schema_complex_type_is_abstract(
         void *cmp_type,
         const axis2_env_t *env)
 {
@@ -590,7 +590,7 @@
 }
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_abstract(
+xml_schema_complex_type_set_abstract(
         void *cmp_type,
         const axis2_env_t *env,
         axis2_bool_t b)
@@ -600,7 +600,7 @@
 }
         
 axis2_bool_t AXIS2_CALL
-axis2_xml_schema_complex_type_is_mixed(
+xml_schema_complex_type_is_mixed(
         void *cmp_type,
         const axis2_env_t *env)
 {
@@ -608,7 +608,7 @@
 }
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_mixed(
+xml_schema_complex_type_set_mixed(
         void *cmp_type,
         const axis2_env_t *env,
         axis2_bool_t b)
@@ -618,7 +618,7 @@
 }
         
 void* AXIS2_CALL
-axis2_xml_schema_complex_type_get_particle(
+xml_schema_complex_type_get_particle(
         void *cmp_type,
         const axis2_env_t *env)
 {
@@ -626,12 +626,12 @@
 }
         
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_type_set_particle(
+xml_schema_complex_type_set_particle(
         void *cmp_type,
         const axis2_env_t *env,
         void *particle)
 {
-    axis2_xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
+    xml_schema_complex_type_impl_t *cmp_type_impl = NULL;
     cmp_type_impl = AXIS2_INTF_TO_IMPL(cmp_type);
     if(NULL != cmp_type_impl->particle)
     {
@@ -644,21 +644,21 @@
 
 
 axis2_char_t* AXIS2_CALL
-axis2_xml_schema_complex_type_to_string(
+xml_schema_complex_type_to_string(
         void *complex_type,
         const axis2_env_t *env,
         axis2_char_t *prefix,
         int tab)
 {
-    axis2_xml_schema_complex_type_impl_t *complex_type_impl = NULL;
+    xml_schema_complex_type_impl_t *complex_type_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     complex_type_impl = AXIS2_INTF_TO_IMPL(complex_type);
     /** TODO implement the method */
     return NULL;
 }
 
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_type_get_type(
+xml_schema_types_t AXIS2_CALL
+xml_schema_complex_type_get_type(
         void *complex_type,
         const axis2_env_t *env)
 {
@@ -666,7 +666,7 @@
 }        
         
 axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_complex_type_super_objs(
+xml_schema_complex_type_super_objs(
         void *complex_type,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c?rev=413626&r1=413625&r2=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c Mon Jun 12 03:29:40 2006
@@ -14,24 +14,24 @@
  * limitations under the License.
  */
 
-#include <axis2_xml_schema_content_processing.h>
-#include <axis2_xml_schema_use.h>
+#include <xml_schema_content_processing.h>
+#include <xml_schema_use.h>
 #include <axis2_utils.h>
 
-typedef struct axis2_xml_schema_content_processing_impl 
-        axis2_xml_schema_content_processing_impl_t;
+typedef struct xml_schema_content_processing_impl 
+        xml_schema_content_processing_impl_t;
 
 /** 
  * @brief Other Extension Struct Impl
  *   Axis2 Other Extension  
  */ 
-struct axis2_xml_schema_content_processing_impl
+struct xml_schema_content_processing_impl
 {
-    axis2_xml_schema_content_processing_t content_processing;
+    xml_schema_content_processing_t content_processing;
     
-    axis2_xml_schema_enum_t *schema_enum;
+    xml_schema_enum_t *schema_enum;
     
-    axis2_xml_schema_types_t obj_type;
+    xml_schema_types_t obj_type;
     
     axis2_hash_t *ht_super;
     
@@ -41,41 +41,41 @@
 };
 
 #define AXIS2_INTF_TO_IMPL(content_processing) \
-        ((axis2_xml_schema_content_processing_impl_t *) content_processing)
+        ((xml_schema_content_processing_impl_t *) content_processing)
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_content_processing_free(
+xml_schema_content_processing_free(
         void *content_processing,
         const axis2_env_t *env);
 
 axis2_hash_t *AXIS2_CALL 
-axis2_xml_schema_content_processing_super_objs(
+xml_schema_content_processing_super_objs(
         void *content_processing,
         const axis2_env_t *env);
 
-axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_content_processing_get_type(
+xml_schema_types_t AXIS2_CALL 
+xml_schema_content_processing_get_type(
         void *content_processing,
         const axis2_env_t *env);
 
-axis2_xml_schema_enum_t *AXIS2_CALL
-axis2_xml_schema_content_processing_get_base_impl(void *content_processing,
+xml_schema_enum_t *AXIS2_CALL
+xml_schema_content_processing_get_base_impl(void *content_processing,
                                                     const axis2_env_t *env);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_xml_schema_content_processing_get_values(void *content_processing,
+xml_schema_content_processing_get_values(void *content_processing,
                         const axis2_env_t *env);
 
 
-AXIS2_EXTERN axis2_xml_schema_content_processing_t * AXIS2_CALL
-axis2_xml_schema_content_processing_create(const axis2_env_t *env,
+AXIS2_EXTERN xml_schema_content_processing_t * AXIS2_CALL
+xml_schema_content_processing_create(const axis2_env_t *env,
                             axis2_char_t *value)
 {
-    axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
+    xml_schema_content_processing_impl_t *content_processing_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     
     content_processing_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_content_processing_impl_t));
+                    sizeof(xml_schema_content_processing_impl_t));
     if(!content_processing_impl)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -84,7 +84,7 @@
     
     content_processing_impl->schema_enum = NULL;
     content_processing_impl->content_processing.base.ops = NULL;
-    content_processing_impl->obj_type = AXIS2_XML_SCHEMA_CONTENT_PROCESSING;
+    content_processing_impl->obj_type = XML_SCHEMA_CONTENT_PROCESSING;
     content_processing_impl->ht_super = NULL;
     content_processing_impl->methods = NULL;
     content_processing_impl->members = NULL;
@@ -92,81 +92,81 @@
     
     content_processing_impl->content_processing.ops = 
             AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_content_processing_ops_t));
+                    sizeof(xml_schema_content_processing_ops_t));
     if(!content_processing_impl->content_processing.ops)
     {
-        axis2_xml_schema_content_processing_free(
+        xml_schema_content_processing_free(
             &(content_processing_impl->content_processing), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;            
     }
     
     content_processing_impl->content_processing.ops->free = 
-            axis2_xml_schema_content_processing_free;
+            xml_schema_content_processing_free;
     content_processing_impl->content_processing.ops->super_objs = 
-            axis2_xml_schema_content_processing_super_objs;
+            xml_schema_content_processing_super_objs;
     content_processing_impl->content_processing.ops->get_type = 
-            axis2_xml_schema_content_processing_get_type;
+            xml_schema_content_processing_get_type;
     content_processing_impl->content_processing.ops->get_base_impl = 
-            axis2_xml_schema_content_processing_get_base_impl;
+            xml_schema_content_processing_get_base_impl;
     content_processing_impl->content_processing.ops->get_values = 
-            axis2_xml_schema_content_processing_get_values;
+            xml_schema_content_processing_get_values;
    
     content_processing_impl->members = axis2_array_list_create(env, 0);
 
     if(!content_processing_impl->members)
     {
-         axis2_xml_schema_content_processing_free(
+         xml_schema_content_processing_free(
             &(content_processing_impl->content_processing), env);
         return NULL;
     }   
 
     AXIS2_ARRAY_LIST_ADD(content_processing_impl->members, env, 
-        AXIS2_STRDUP(AXIS2_XML_SCHEMA_CONST_LAX, env));
+        AXIS2_STRDUP(XML_SCHEMA_CONST_LAX, env));
     AXIS2_ARRAY_LIST_ADD(content_processing_impl->members, env,
-        AXIS2_STRDUP(AXIS2_XML_SCHEMA_CONST_NONE, env));
+        AXIS2_STRDUP(XML_SCHEMA_CONST_NONE, env));
     AXIS2_ARRAY_LIST_ADD(content_processing_impl->members, env, 
-        AXIS2_STRDUP(AXIS2_XML_SCHEMA_CONST_SKIP, env));
+        AXIS2_STRDUP(XML_SCHEMA_CONST_SKIP, env));
     AXIS2_ARRAY_LIST_ADD(content_processing_impl->members, env,
-        AXIS2_STRDUP(AXIS2_XML_SCHEMA_CONST_STRICT, env));
+        AXIS2_STRDUP(XML_SCHEMA_CONST_STRICT, env));
     
     content_processing_impl->methods = axis2_hash_make(env);
     if(!content_processing_impl->methods)
     {
-         axis2_xml_schema_content_processing_free(
+         xml_schema_content_processing_free(
             &(content_processing_impl->content_processing), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
 
     axis2_hash_set(content_processing_impl->methods, "free", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_content_processing_free);
+            AXIS2_HASH_KEY_STRING, xml_schema_content_processing_free);
     axis2_hash_set(content_processing_impl->methods, "super_objs", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_content_processing_super_objs);
+            AXIS2_HASH_KEY_STRING, xml_schema_content_processing_super_objs);
     axis2_hash_set(content_processing_impl->methods, "get_type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_content_processing_get_type);
+            AXIS2_HASH_KEY_STRING, xml_schema_content_processing_get_type);
             
     axis2_hash_set(content_processing_impl->methods, "get_values", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_content_processing_get_values);
+            AXIS2_HASH_KEY_STRING, xml_schema_content_processing_get_values);
     
-    content_processing_impl->schema_enum = axis2_xml_schema_enum_create(env, value);
+    content_processing_impl->schema_enum = xml_schema_enum_create(env, value);
     
     content_processing_impl->ht_super = axis2_hash_make(env);
     if(!content_processing_impl->ht_super)
     {
-         axis2_xml_schema_content_processing_free(
+         xml_schema_content_processing_free(
             &(content_processing_impl->content_processing), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
 
-    axis2_hash_set(content_processing_impl->ht_super, "AXIS2_XML_SCHEMA_CONTENT_PROCESSING", 
+    axis2_hash_set(content_processing_impl->ht_super, "XML_SCHEMA_CONTENT_PROCESSING", 
             AXIS2_HASH_KEY_STRING, &(content_processing_impl->content_processing));
     
-    axis2_hash_set(content_processing_impl->ht_super, "AXIS2_XML_SCHEMA_ENUM", 
+    axis2_hash_set(content_processing_impl->ht_super, "XML_SCHEMA_ENUM", 
             AXIS2_HASH_KEY_STRING, content_processing_impl->schema_enum);
 
-    status = axis2_xml_schema_enum_resolve_methods(
+    status = xml_schema_enum_resolve_methods(
             &(content_processing_impl->content_processing.base), env, 
             content_processing_impl->schema_enum, 
             content_processing_impl->methods);
@@ -175,10 +175,10 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_content_processing_free(void *content_processing,
+xml_schema_content_processing_free(void *content_processing,
                                     const axis2_env_t *env)
 {
-    axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
+    xml_schema_content_processing_impl_t *content_processing_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     content_processing_impl = AXIS2_INTF_TO_IMPL(content_processing);
@@ -217,7 +217,7 @@
 
     if(NULL != content_processing_impl->schema_enum)
     {
-        AXIS2_XML_SCHEMA_ENUM_FREE(content_processing_impl->schema_enum, env);
+        XML_SCHEMA_ENUM_FREE(content_processing_impl->schema_enum, env);
         content_processing_impl->schema_enum = NULL;
     }
     
@@ -240,11 +240,11 @@
 }
 
 axis2_hash_t *AXIS2_CALL
-axis2_xml_schema_content_processing_super_objs(
+xml_schema_content_processing_super_objs(
         void *content_processing,
         const axis2_env_t *env)
 {
-    axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
+    xml_schema_content_processing_impl_t *content_processing_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     content_processing_impl = AXIS2_INTF_TO_IMPL(content_processing);
@@ -252,12 +252,12 @@
     return content_processing_impl->ht_super;
 }
 
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_content_processing_get_type(
+xml_schema_types_t AXIS2_CALL
+xml_schema_content_processing_get_type(
         void *content_processing,
         const axis2_env_t *env)
 {
-    axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
+    xml_schema_content_processing_impl_t *content_processing_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     content_processing_impl = AXIS2_INTF_TO_IMPL(content_processing);
@@ -265,12 +265,12 @@
     return content_processing_impl->obj_type;
 }
 
-axis2_xml_schema_enum_t *AXIS2_CALL
-axis2_xml_schema_content_processing_get_base_impl(
+xml_schema_enum_t *AXIS2_CALL
+xml_schema_content_processing_get_base_impl(
         void *content_processing,
         const axis2_env_t *env)
 {
-    axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
+    xml_schema_content_processing_impl_t *content_processing_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     content_processing_impl = AXIS2_INTF_TO_IMPL(content_processing);
@@ -279,15 +279,15 @@
 }
 
 axis2_array_list_t *AXIS2_CALL
-axis2_xml_schema_content_processing_get_values(void *content_processing,
+xml_schema_content_processing_get_values(void *content_processing,
                                         const axis2_env_t *env)
 {
-    axis2_xml_schema_content_processing_impl_t *content_processing_impl = NULL;
+    xml_schema_content_processing_impl_t *content_processing_impl = NULL;
     axis2_hash_t *super = NULL;
 
-    super = AXIS2_XML_SCHEMA_USE_SUPER_OBJS(content_processing, env);
+    super = XML_SCHEMA_USE_SUPER_OBJS(content_processing, env);
     content_processing_impl = AXIS2_INTF_TO_IMPL(axis2_hash_get(super, 
-                "AXIS2_XML_SCHEMA_CONTENT_PROCESSING", AXIS2_HASH_KEY_STRING));
+                "XML_SCHEMA_CONTENT_PROCESSING", AXIS2_HASH_KEY_STRING));
 
     return content_processing_impl->members;
 }

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c?rev=413626&r1=413625&r2=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c Mon Jun 12 03:29:40 2006
@@ -13,28 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <axis2_xml_schema_defines.h>
-#include <axis2_xml_schema_content_type.h>
+#include <xml_schema_defines.h>
+#include <xml_schema_content_type.h>
 #include <axis2_utils.h>
 
 #include <axis2_string.h>
 
-typedef struct axis2_xml_schema_content_type_impl 
-                axis2_xml_schema_content_type_impl_t;
+typedef struct xml_schema_content_type_impl 
+                xml_schema_content_type_impl_t;
 
 /** 
  * @brief Other Extension Struct Impl
  *   Axis2 Other Extension  
  */ 
-struct axis2_xml_schema_content_type_impl
+struct xml_schema_content_type_impl
 {
-    axis2_xml_schema_content_type_t content_type;
+    xml_schema_content_type_t content_type;
     
-    axis2_xml_schema_enum_t *schema_enum;
+    xml_schema_enum_t *schema_enum;
 
     axis2_hash_t *methods;
     
-    axis2_xml_schema_types_t obj_type;
+    xml_schema_types_t obj_type;
 
     axis2_array_list_t *members;
 
@@ -42,40 +42,40 @@
 };
 
 #define AXIS2_INTF_TO_IMPL(content_type) \
-        ((axis2_xml_schema_content_type_impl_t *) content_type)
+        ((xml_schema_content_type_impl_t *) content_type)
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_content_type_free(void *content_type,
+xml_schema_content_type_free(void *content_type,
                         const axis2_env_t *env);
 
-axis2_xml_schema_enum_t *AXIS2_CALL
-axis2_xml_schema_content_type_get_base_impl(void *content_type,
+xml_schema_enum_t *AXIS2_CALL
+xml_schema_content_type_get_base_impl(void *content_type,
                                 const axis2_env_t *env);
 
 axis2_array_list_t *AXIS2_CALL
-axis2_xml_schema_content_type_get_values(void *content_type,
+xml_schema_content_type_get_values(void *content_type,
                         const axis2_env_t *env);
                         
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_content_type_get_type(void *content_type,
+xml_schema_types_t AXIS2_CALL
+xml_schema_content_type_get_type(void *content_type,
                                    const axis2_env_t *env);
                                    
 axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_content_type_super_objs(void *content_type, 
+xml_schema_content_type_super_objs(void *content_type, 
                                          const axis2_env_t *env);
                                          
                                                                             
 
 
-AXIS2_EXTERN axis2_xml_schema_content_type_t * AXIS2_CALL
-axis2_xml_schema_content_type_create(const axis2_env_t *env,
+AXIS2_EXTERN xml_schema_content_type_t * AXIS2_CALL
+xml_schema_content_type_create(const axis2_env_t *env,
                             axis2_char_t *value)
 {
-    axis2_xml_schema_content_type_impl_t *content_type_impl = NULL;
+    xml_schema_content_type_impl_t *content_type_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     
     content_type_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_content_type_impl_t));
+                    sizeof(xml_schema_content_type_impl_t));
     if(!content_type_impl)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -85,86 +85,86 @@
     content_type_impl->schema_enum = NULL;
     content_type_impl->methods = NULL;
     content_type_impl->members = NULL;
-    content_type_impl->obj_type = AXIS2_XML_SCHEMA_CONTENT_TYPE;
+    content_type_impl->obj_type = XML_SCHEMA_CONTENT_TYPE;
     content_type_impl->ht_super = NULL;
     
     content_type_impl->content_type.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_content_type_ops_t));
+                    sizeof(xml_schema_content_type_ops_t));
     if(!content_type_impl->content_type.ops)
     {
-        axis2_xml_schema_content_type_free(&(content_type_impl->content_type), env);
+        xml_schema_content_type_free(&(content_type_impl->content_type), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
                         
     content_type_impl->content_type.ops->free = 
-            axis2_xml_schema_content_type_free;
+            xml_schema_content_type_free;
     content_type_impl->content_type.ops->get_base_impl = 
-            axis2_xml_schema_content_type_get_base_impl;
+            xml_schema_content_type_get_base_impl;
     content_type_impl->content_type.ops->get_values = 
-            axis2_xml_schema_content_type_get_values;
+            xml_schema_content_type_get_values;
     content_type_impl->content_type.ops->get_type =
-            axis2_xml_schema_content_type_get_type;
+            xml_schema_content_type_get_type;
     content_type_impl->content_type.ops->super_objs =
-            axis2_xml_schema_content_type_super_objs;                
+            xml_schema_content_type_super_objs;                
                 
     content_type_impl->members = axis2_array_list_create(env, 0);
     if(!content_type_impl->members)
     {    
-        axis2_xml_schema_content_type_free(&(content_type_impl->content_type), env);
+        xml_schema_content_type_free(&(content_type_impl->content_type), env);
         return NULL;
     }       
 
     AXIS2_ARRAY_LIST_ADD(content_type_impl->members, env, 
-        AXIS2_STRDUP(AXIS2_XML_SCHEMA_CONST_ELEMENT_ONLY, env));
+        AXIS2_STRDUP(XML_SCHEMA_CONST_ELEMENT_ONLY, env));
     AXIS2_ARRAY_LIST_ADD(content_type_impl->members, env,
-        AXIS2_STRDUP(AXIS2_XML_SCHEMA_CONST_EMPTY, env));
+        AXIS2_STRDUP(XML_SCHEMA_CONST_EMPTY, env));
         
     AXIS2_ARRAY_LIST_ADD(content_type_impl->members, env,
-        AXIS2_STRDUP(AXIS2_XML_SCHEMA_CONST_MIXED, env));
+        AXIS2_STRDUP(XML_SCHEMA_CONST_MIXED, env));
 
     AXIS2_ARRAY_LIST_ADD(content_type_impl->members, env,
-        AXIS2_STRDUP(AXIS2_XML_SCHEMA_CONST_TEXT_ONLY, env));        
+        AXIS2_STRDUP(XML_SCHEMA_CONST_TEXT_ONLY, env));        
 
     content_type_impl->methods = axis2_hash_make(env);
     if(!content_type_impl->methods)
     {
-        axis2_xml_schema_content_type_free(&(content_type_impl->content_type), env);
+        xml_schema_content_type_free(&(content_type_impl->content_type), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
 
     axis2_hash_set(content_type_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_content_type_free);
+            xml_schema_content_type_free);
     axis2_hash_set(content_type_impl->methods, "get_values", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_content_type_get_values);
+            xml_schema_content_type_get_values);
     axis2_hash_set(content_type_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_content_type_get_type);
+            xml_schema_content_type_get_type);
     axis2_hash_set(content_type_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_content_type_super_objs);                        
+            xml_schema_content_type_super_objs);                        
             
-    content_type_impl->schema_enum = axis2_xml_schema_enum_create(env, value);
+    content_type_impl->schema_enum = xml_schema_enum_create(env, value);
     if(!content_type_impl->schema_enum)
     {
-        axis2_xml_schema_content_type_free(&(content_type_impl->content_type), env);
+        xml_schema_content_type_free(&(content_type_impl->content_type), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     content_type_impl->ht_super = axis2_hash_make(env);
      if(!content_type_impl->ht_super)
     {
-        axis2_xml_schema_content_type_free(&(content_type_impl->content_type), env);
+        xml_schema_content_type_free(&(content_type_impl->content_type), env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
-    axis2_hash_set(content_type_impl->ht_super, "AXIS2_XML_SCHEMA_CONTENT_TYPE",
+    axis2_hash_set(content_type_impl->ht_super, "XML_SCHEMA_CONTENT_TYPE",
          AXIS2_HASH_KEY_STRING, &(content_type_impl->content_type));
-    axis2_hash_set(content_type_impl->ht_super, "AXIS2_XML_SCHEMA_ENUM", AXIS2_HASH_KEY_STRING, 
+    axis2_hash_set(content_type_impl->ht_super, "XML_SCHEMA_ENUM", AXIS2_HASH_KEY_STRING, 
             content_type_impl->schema_enum);
     
-    status = axis2_xml_schema_enum_resolve_methods(
+    status = xml_schema_enum_resolve_methods(
             &(content_type_impl->content_type.base), env, content_type_impl->schema_enum, 
             content_type_impl->methods); 
 
@@ -172,10 +172,10 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_content_type_free(void *content_type,
+xml_schema_content_type_free(void *content_type,
                                     const axis2_env_t *env)
 {
-    axis2_xml_schema_content_type_impl_t *content_type_impl = NULL;
+    xml_schema_content_type_impl_t *content_type_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     content_type_impl = AXIS2_INTF_TO_IMPL(content_type);
@@ -201,7 +201,7 @@
     
     if(content_type_impl->schema_enum)
     {
-        AXIS2_XML_SCHEMA_ENUM_FREE(content_type_impl->schema_enum, env);
+        XML_SCHEMA_ENUM_FREE(content_type_impl->schema_enum, env);
         content_type_impl->schema_enum = NULL;
     }
     
@@ -219,11 +219,11 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_xml_schema_enum_t *AXIS2_CALL
-axis2_xml_schema_content_type_get_base_impl(void *content_type,
+xml_schema_enum_t *AXIS2_CALL
+xml_schema_content_type_get_base_impl(void *content_type,
                                 const axis2_env_t *env)
 {
-    axis2_xml_schema_content_type_impl_t *content_type_impl = NULL;
+    xml_schema_content_type_impl_t *content_type_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     content_type_impl = AXIS2_INTF_TO_IMPL(content_type);
@@ -231,21 +231,21 @@
 }
 
 axis2_array_list_t* AXIS2_CALL
-axis2_xml_schema_content_type_get_values(void *content_type,
+xml_schema_content_type_get_values(void *content_type,
                                 const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(content_type)->members;
 }
 
-axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_content_type_get_type(void *content_type,
+xml_schema_types_t AXIS2_CALL
+xml_schema_content_type_get_type(void *content_type,
                                    const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(content_type)->obj_type;
 }                                   
                                    
 axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_content_type_super_objs(void *content_type, 
+xml_schema_content_type_super_objs(void *content_type, 
                                          const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(content_type)->ht_super;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c?rev=413626&r1=413625&r2=413626&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c Mon Jun 12 03:29:40 2006
@@ -14,56 +14,56 @@
  * limitations under the License.
  */
  
-#include <axis2_xml_schema_data_type.h>
-#include <axis2_xml_tokenized_type.h>
+#include <xml_schema_data_type.h>
+#include <xml_schema_tokenized_type.h>
 #include <axis2_hash.h>
 #include <axis2_utils.h>
 
-typedef struct axis2_xml_schema_data_type_impl 
-            axis2_xml_schema_data_type_impl_t;
+typedef struct xml_schema_data_type_impl 
+            xml_schema_data_type_impl_t;
 
 /** 
  * @brief Xml Schema Data Type Struct Impl
  *   Axis2 Xml Schema Data Type  
  */ 
-struct axis2_xml_schema_data_type_impl
+struct xml_schema_data_type_impl
 {
-    axis2_xml_schema_data_type_t data_type;
+    xml_schema_data_type_t data_type;
 };
 
 #define AXIS2_INTF_TO_IMPL(data_type) \
-        ((axis2_xml_schema_data_type_impl_t *) data_type)
+        ((xml_schema_data_type_impl_t *) data_type)
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_data_type_free(void *data_type,
+xml_schema_data_type_free(void *data_type,
                 const axis2_env_t *env);
 
 void * AXIS2_CALL
-axis2_xml_schema_data_type_parse_value(void *data_type,
+xml_schema_data_type_parse_value(void *data_type,
                         const axis2_env_t *env,
                         void *input);
 
 void *AXIS2_CALL
-axis2_xml_schema_data_type_value_type(void *data_type,
+xml_schema_data_type_value_type(void *data_type,
                         const axis2_env_t *env);
 
-axis2_xml_tokenized_type_t *AXIS2_CALL
-axis2_xml_schema_data_type_tokenized_type(void *data_type,
+xml_schema_tokenized_type_t *AXIS2_CALL
+xml_schema_data_type_tokenized_type(void *data_type,
                                             const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_xml_schema_data_type_t * AXIS2_CALL
-axis2_xml_schema_data_type_create(const axis2_env_t *env)
+AXIS2_EXTERN xml_schema_data_type_t * AXIS2_CALL
+xml_schema_data_type_create(const axis2_env_t *env)
 {
-    axis2_xml_schema_data_type_impl_t *data_type_impl = NULL;
+    xml_schema_data_type_impl_t *data_type_impl = NULL;
     
     data_type_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_data_type_impl_t));
+                    sizeof(xml_schema_data_type_impl_t));
     if(NULL != data_type_impl)
     {
         return NULL;
     }
     data_type_impl->data_type.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_xml_schema_data_type_ops_t)); 
+                    sizeof(xml_schema_data_type_ops_t)); 
      if(NULL != data_type_impl->data_type.ops)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -71,23 +71,23 @@
     }
 
     data_type_impl->data_type.ops->free = 
-        axis2_xml_schema_data_type_free;
+        xml_schema_data_type_free;
     data_type_impl->data_type.ops->parse_value = 
-        axis2_xml_schema_data_type_parse_value;
+        xml_schema_data_type_parse_value;
     data_type_impl->data_type.ops->value_type = 
-        axis2_xml_schema_data_type_value_type;
+        xml_schema_data_type_value_type;
     data_type_impl->data_type.ops->tokenized_type = 
-        axis2_xml_schema_data_type_tokenized_type;
+        xml_schema_data_type_tokenized_type;
 
     return &(data_type_impl->data_type);
 }
 
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_data_type_free(void *data_type,
+xml_schema_data_type_free(void *data_type,
                 const axis2_env_t *env)
 {
-    axis2_xml_schema_data_type_impl_t *data_type_impl = NULL;
+    xml_schema_data_type_impl_t *data_type_impl = NULL;
 
     data_type_impl = AXIS2_INTF_TO_IMPL(data_type);
 
@@ -106,11 +106,11 @@
 }
 
 void * AXIS2_CALL
-axis2_xml_schema_data_type_parse_value(void *data_type,
+xml_schema_data_type_parse_value(void *data_type,
                         const axis2_env_t *env,
                         void *input)
 {
-    axis2_xml_schema_data_type_impl_t *data_type_impl = NULL;
+    xml_schema_data_type_impl_t *data_type_impl = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
     data_type_impl = AXIS2_INTF_TO_IMPL(data_type);
@@ -118,10 +118,10 @@
 }
 
 void *AXIS2_CALL
-axis2_xml_schema_data_type_value_type(void *data_type,
+xml_schema_data_type_value_type(void *data_type,
                         const axis2_env_t *env)
 {
-    axis2_xml_schema_data_type_impl_t *data_type_impl = NULL;
+    xml_schema_data_type_impl_t *data_type_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     data_type_impl = AXIS2_INTF_TO_IMPL(data_type);
@@ -129,11 +129,11 @@
     return NULL;
 }
 
-axis2_xml_tokenized_type_t *AXIS2_CALL
-axis2_xml_schema_data_type_tokenized_type(void *data_type,
+xml_schema_tokenized_type_t *AXIS2_CALL
+xml_schema_data_type_tokenized_type(void *data_type,
                                             const axis2_env_t *env)
 {
-    axis2_xml_schema_data_type_impl_t *data_type_impl = NULL;
+    xml_schema_data_type_impl_t *data_type_impl = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
     data_type_impl = AXIS2_INTF_TO_IMPL(data_type);



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