svn commit: r404928 [1/2] - in /webservices/axis2/trunk/c: include/xml_schema/ modules/xml/xml_schema/

[na...@apache.org]

Author: nandika
Date: Sun May  7 21:42:06 2006
New Revision: 404928

URL: http://svn.apache.org/viewcvs?rev=404928&view=rev
Log: (empty)

Modified:
    webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_extension.h
    webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_restriction.h
    webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_extension.h
    webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_restriction.h
    webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_extension.c
    webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_restriction.c
    webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_obj_collection.c
    webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_extension.c
    webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_restriction.c

Modified: webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_extension.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_extension.h?rev=404928&r1=404927&r2=404928&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_extension.h (original)
+++ webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_extension.h Sun May  7 21:42:06 2006
@@ -45,58 +45,63 @@
 struct axis2_xml_schema_complex_content_extension_ops
 {
     axis2_status_t (AXIS2_CALL *
-    free) (void *cmp_content_ext,
-            axis2_env_t **env);
+    free)(axis2_xml_schema_complex_content_extension_t *cmp_content_ext,
+          axis2_env_t **env);
 
     axis2_xml_schema_annotated_t *(AXIS2_CALL *
-    get_base_impl) (void *cmp_content_ext,
-                    axis2_env_t **env);
+    get_base_impl) (
+            axis2_xml_schema_complex_content_extension_t *cmp_content_ext,
+            axis2_env_t **env);
 
     axis2_xml_schema_any_attribute_t* (AXIS2_CALL *
     get_any_attribute)(
-            void *cmp_content_ext,
+            axis2_xml_schema_complex_content_extension_t *cmp_content_ext,
             axis2_env_t **env);
     
     axis2_status_t (AXIS2_CALL *
     set_any_attribute)(
-            void *cmp_content_ext,
+            axis2_xml_schema_complex_content_extension_t *cmp_content_ext,
             axis2_env_t **env,
             axis2_xml_schema_any_attribute_t *any_attr);
     
     axis2_xml_schema_obj_collection_t* (AXIS2_CALL *
     get_attributes)(
-            void *cmp_content_ext,
+            axis2_xml_schema_complex_content_extension_t *cmp_content_ext,
             axis2_env_t **env);
             
     axis2_qname_t* (AXIS2_CALL*
     get_base_type_name)(
-            void *cmp_content_ext,
+            axis2_xml_schema_complex_content_extension_t *cmp_content_ext,
             axis2_env_t **env);
             
     axis2_status_t (AXIS2_CALL *
     set_base_type_name)(
-            void *cmp_content_ext,
+            axis2_xml_schema_complex_content_extension_t *cmp_content_ext,
             axis2_env_t **env,
             axis2_qname_t *qname);
             
     axis2_xml_schema_particle_t* (AXIS2_CALL *
-    get_particle)(void *cmp_content_ext,
-                  axis2_env_t **env);
+    get_particle)(
+            axis2_xml_schema_complex_content_extension_t *cmp_content_ext,
+            axis2_env_t **env);
                   
     axis2_status_t (AXIS2_CALL *
-    set_particle)(void *cmp_content_ext,
-                  axis2_env_t **env,
-                  axis2_xml_schema_particle_t *particle);
+    set_particle)(
+            axis2_xml_schema_complex_content_extension_t *cmp_content_ext,
+            axis2_env_t **env,
+            axis2_xml_schema_particle_t *particle);
                   
     axis2_char_t* (AXIS2_CALL *
-    to_string)(void *cmp_content_ext,
-                axis2_env_t **env);
+    to_string)(
+            axis2_xml_schema_complex_content_extension_t *cmp_content_ext,
+            axis2_env_t **env,
+            axis2_char_t *prefix,
+            int tab);
     
 };
 
 struct axis2_xml_schema_complex_content_extension
 {
-    axis2_xml_schema_annotated_t base;
     axis2_xml_schema_complex_content_extension_ops_t *ops;
 };
 
@@ -106,41 +111,37 @@
 AXIS2_DECLARE(axis2_xml_schema_complex_content_extension_t *)
 axis2_xml_schema_complex_content_extension_create(axis2_env_t **env);
 
-
-
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_FREE(cmp_content_ext, env) \
-		(((axis2_xml_schema_complex_content_extension_t *) cmp_content_ext)->ops->\
-            free(cmp_content_ext, env))
+		((cmp_content_ext)->ops->free(cmp_content_ext, env))
 
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_GET_BASE_IMPL(cmp_content_ext, env) \
-		(((axis2_xml_schema_complex_content_extension_t *) cmp_content_ext)->ops->\
-            get_base_impl(cmp_content_ext, env))
+		((cmp_content_ext)->ops->get_base_impl(cmp_content_ext, env))
 
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_GET_ANY_ATTRIBUTE(cmp_content_ext, env) \
-		(((axis2_xml_schema_complex_content_extension_t *) cmp_content_ext)->ops->\
-            get_any_attribute(cmp_content_ext, env))
+		((cmp_content_ext)->ops->get_any_attribute(cmp_content_ext, env))
 
-#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_SET__ANY_ATTRIBUTE(cmp_content_ext, env, any_attr)\
-		(((axis2_xml_schema_complex_content_extension_t *) cmp_content_ext)->ops->\
-            set_content(cmp_content_ext, env, any_attr ))
+#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_SET__ANY_ATTRIBUTE(cmp_content_ext, \
+         env, any_attr)\
+		((cmp_content_ext)->ops->set_content(cmp_content_ext, env, any_attr ))
 
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_GET_ATTRIBUTES(cmp_content_ext, env) \
-		(((axis2_xml_schema_complex_content_extension_t *) cmp_content_ext)->ops->\
-            get_attributes(cmp_content_ext, env))
+		((cmp_content_ext)->ops->get_attributes(cmp_content_ext, env))
             
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_GET_BASE_TYPE_NAME(cmp_content_ext, env)\
-        (((axis2_xml_schema_complex_content_extension_t *) cmp_content_ext)->ops->\
-            get_base_type_name(cmp_content_ext, env))            
+        ((cmp_content_ext)->ops->get_base_type_name(cmp_content_ext, env))            
 
-#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_SET_BASE_TYPE_NAME(cmp_content_ext, env, base_type_name) \
-        (((axis2_xml_schema_complex_content_extension_t *) cmp_content_ext)->ops->\
-            set_base_type_name(cmp_content_ext, env, base_type_name))
+#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_SET_BASE_TYPE_NAME(cmp_content_ext,\
+         env, base_type_name) \
+        ((cmp_content_ext)->ops->set_base_type_name(cmp_content_ext, env, base_type_name))
             
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_GET_PARTICLE(cmp_content_ext, env) \
-        (((axis2_xml_schema_complex_content_extension_t *) cmp_content_ext)->ops->\
-            get_particle(cmp_content_ext, env))       
-            
-            
+        ((cmp_content_ext)->ops->get_particle(cmp_content_ext, env))       
+ 
+#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_SET_PARTICLE(cmp_content_ext, env, particle) \
+        ((cmp_content_ext)->ops->set_particle(cmp_content_ext, env, particle)) 
+        
+#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_TO_STRING(cmp_content_ext, env, prefix, tab) \
+        ((cmp_content_ext)->ops->to_string(cmp_content_ext, env, prefix, tab))                     
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_restriction.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_restriction.h?rev=404928&r1=404927&r2=404928&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_restriction.h (original)
+++ webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_complex_content_restriction.h Sun May  7 21:42:06 2006
@@ -47,59 +47,62 @@
 struct axis2_xml_schema_complex_content_restriction_ops
 {
     axis2_status_t (AXIS2_CALL *
-    free) (void *cmp_content_res,
-            axis2_env_t **env);
+    free)(axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+           axis2_env_t **env);
 
     axis2_xml_schema_annotated_t *(AXIS2_CALL *
-    get_base_impl) (void *cmp_content_res,
-                    axis2_env_t **env);
+    get_base_impl)(
+            axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+            axis2_env_t **env);
 
     axis2_xml_schema_any_attribute_t* (AXIS2_CALL *
     get_any_attribute)(
-            void *cmp_content_res,
+            axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
             axis2_env_t **env);
     
     axis2_status_t (AXIS2_CALL *
     set_any_attribute)(
-            void *cmp_content_res,
+            axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
             axis2_env_t **env,
             axis2_xml_schema_any_attribute_t *any_attr);
     
     axis2_xml_schema_obj_collection_t* (AXIS2_CALL *
     get_attributes)(
-            void *cmp_content_res,
+            axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
             axis2_env_t **env);
             
     axis2_qname_t* (AXIS2_CALL*
     get_base_type_name)(
-            void *cmp_content_res,
+            axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
             axis2_env_t **env);
             
     axis2_status_t (AXIS2_CALL *
     set_base_type_name)(
-            void *cmp_content_res,
+            axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
             axis2_env_t **env,
             axis2_qname_t *qname); 
             
     axis2_xml_schema_particle_t* (AXIS2_CALL *
-    get_particle)(void *cmp_content_res,
-                  axis2_env_t **env);
+    get_particle)(
+            axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+            axis2_env_t **env);
                   
     axis2_status_t (AXIS2_CALL *
-    set_particle)(void *cmp_content_res,
-                  axis2_env_t **env,
-                  axis2_xml_schema_particle_t *particle);
+    set_particle)(
+            axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+            axis2_env_t **env,
+            axis2_xml_schema_particle_t *particle);
                   
     axis2_char_t* (AXIS2_CALL *
-    to_string)(void *cmp_content_res,
-               axis2_env_t **env,
-               axis2_char_t *prefix,
-               int tab);
+    to_string)(
+            axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+            axis2_env_t **env,
+            axis2_char_t *prefix,
+            int tab);
 };
 
 struct axis2_xml_schema_complex_content_restriction
 {
-    axis2_xml_schema_annotated_t base;
     axis2_xml_schema_complex_content_restriction_ops_t *ops;
 };
 
@@ -112,43 +115,36 @@
 
 
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_FREE(cmp_content_res, env) \
-		(((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\
-            free(cmp_content_res, env))
+		(( cmp_content_res)->ops->free(cmp_content_res, env))
 
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_GET_BASE_IMPL(cmp_content_res, env) \
-		(((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\
-            get_base_impl(cmp_content_res, env))
+		(( cmp_content_res)->ops->get_base_impl(cmp_content_res, env))
 
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_GET_ANY_ATTRIBUTE(cmp_content_res, env) \
-		(((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\
-            get_any_attribute(cmp_content_res, env))
+		(( cmp_content_res)->ops->get_any_attribute(cmp_content_res, env))
 
-#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_SET__ANY_ATTRIBUTE(cmp_content_res, env, any_attr)\
-		(((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\
-            set_content(cmp_content_res, env, any_attr ))
+#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_SET_ANY_ATTRIBUTE(cmp_content_res,\
+         env, any_attr)\
+		(( cmp_content_res)->ops->set_content(cmp_content_res, env, any_attr ))
 
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_GET_ATTRIBUTES(cmp_content_res, env) \
-		(((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\
-            get_attributes(cmp_content_res, env))
+		(( cmp_content_res)->ops->get_attributes(cmp_content_res, env))
             
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_GET_BASE_TYPE_NAME(cmp_content_res, env)\
-        (((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\
-            get_base_type_name(cmp_content_res, env))            
+        (( cmp_content_res)->ops->get_base_type_name(cmp_content_res, env))            
 
-#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_SET_BASE_TYPE_NAME(cmp_content_res, env, base_type_name) \
-        (((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\
-            set_base_type_name(cmp_content_res, env, base_type_name))
+#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_SET_BASE_TYPE_NAME(cmp_content_res,\
+         env, base_type_name) \
+        (( cmp_content_res)->ops->set_base_type_name(cmp_content_res, env, base_type_name))
             
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_GET_PARTICLE(cmp_content_res, env) \
-        (((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\
-            get_particle(cmp_content_res, env))
+        (( cmp_content_res)->ops->get_particle(cmp_content_res, env))
             
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_SET_PARTICLE(cmp_content_res, env) \
-        (((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\
-            set_particle(cmp_content_res, env))
+        (( cmp_content_res)->ops->set_particle(cmp_content_res, env))
                         
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_TO_STRING(cmp_content_res, env) \
-        (((            
+        (( cmp_content_res)->ops->to_string(cmp_content_res, env))
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_extension.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_extension.h?rev=404928&r1=404927&r2=404928&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_extension.h (original)
+++ webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_extension.h Sun May  7 21:42:06 2006
@@ -52,37 +52,37 @@
 struct axis2_xml_schema_simple_content_extension_ops
 {
     axis2_status_t (AXIS2_CALL *
-    free) (void *sim_content_ext,
+    free) (axis2_xml_schema_simple_content_extension_t *sim_content_ext,
             axis2_env_t **env);
 
     axis2_xml_schema_annotated_t *(AXIS2_CALL *
-    get_base_impl) (void *sim_content_ext,
+    get_base_impl) (axis2_xml_schema_simple_content_extension_t *sim_content_ext,
                     axis2_env_t **env);
 
     axis2_xml_schema_any_attribute_t* (AXIS2_CALL *
     get_any_attribute)(
-            void *sim_content_ext,
+            axis2_xml_schema_simple_content_extension_t *sim_content_ext,
             axis2_env_t **env);
     
     axis2_status_t (AXIS2_CALL *
     set_any_attribute)(
-            void *sim_content_ext,
+            axis2_xml_schema_simple_content_extension_t *sim_content_ext,
             axis2_env_t **env,
             axis2_xml_schema_any_attribute_t *any_attr);
     
     axis2_xml_schema_obj_collection_t* (AXIS2_CALL *
     get_attributes)(
-            void *sim_content_ext,
+            axis2_xml_schema_simple_content_extension_t *sim_content_ext,
             axis2_env_t **env);
             
     axis2_qname_t* (AXIS2_CALL*
     get_base_type_name)(
-            void *sim_content_ext,
+            axis2_xml_schema_simple_content_extension_t *sim_content_ext,
             axis2_env_t **env);
             
     axis2_status_t (AXIS2_CALL *
     set_base_type_name)(
-            void *sim_content_ext,
+            axis2_xml_schema_simple_content_extension_t *sim_content_ext,
             axis2_env_t **env,
             axis2_qname_t *qname);
             
@@ -92,7 +92,6 @@
 
 struct axis2_xml_schema_simple_content_extension
 {
-    axis2_xml_schema_annotated_t base;
     axis2_xml_schema_simple_content_extension_ops_t *ops;
 };
 
@@ -105,32 +104,26 @@
 
 
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_FREE(sim_content_ext, env) \
-		(((axis2_xml_schema_simple_content_extension_t *) sim_content_ext)->ops->\
-            free(sim_content_ext, env))
+		((sim_content_ext)->ops->free(sim_content_ext, env))
 
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_BASE_IMPL(sim_content_ext, env) \
-		(((axis2_xml_schema_simple_content_extension_t *) sim_content_ext)->ops->\
-            get_base_impl(sim_content_ext, env))
+		((sim_content_ext)->ops->get_base_impl(sim_content_ext, env))
 
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_ANY_ATTRIBUTE(sim_content_ext, env) \
-		(((axis2_xml_schema_simple_content_extension_t *) sim_content_ext)->ops->\
-            get_any_attribute(sim_content_ext, env))
+		((sim_content_ext)->ops->get_any_attribute(sim_content_ext, env))
 
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_SET__ANY_ATTRIBUTE(sim_content_ext, env, any_attr)\
-		(((axis2_xml_schema_simple_content_extension_t *) sim_content_ext)->ops->\
-            set_content(sim_content_ext, env, any_attr ))
+		((sim_content_ext)->ops->set_content(sim_content_ext, env, any_attr ))
 
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_ATTRIBUTES(sim_content_ext, env) \
-		(((axis2_xml_schema_simple_content_extension_t *) sim_content_ext)->ops->\
-            get_attributes(sim_content_ext, env))
+		((sim_content_ext)->ops->get_attributes(sim_content_ext, env))
             
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_BASE_TYPE_NAME(sim_content_ext, env)\
-        (((axis2_xml_schema_simple_content_extension_t *) sim_content_ext)->ops->\
-            get_base_type_name(sim_content_ext, env))            
+        ((sim_content_ext)->ops->get_base_type_name(sim_content_ext, env))            
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_SET_BASE_TYPE_NAME(sim_content_ext, env, base_type_name) \
-        (((axis2_xml_schema_simple_content_extension_t *) sim_content_ext)->ops->\
-            set_base_type_name(sim_content_ext, env, base_type_name))
+#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_SET_BASE_TYPE_NAME(sim_content_ext, \
+          env, base_type_name) \
+        ((sim_content_ext)->ops->set_base_type_name(sim_content_ext, env, base_type_name))
             
             
 /** @} */

Modified: webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_restriction.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_restriction.h?rev=404928&r1=404927&r2=404928&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_restriction.h (original)
+++ webservices/axis2/trunk/c/include/xml_schema/axis2_xml_schema_simple_content_restriction.h Sun May  7 21:42:06 2006
@@ -54,57 +54,60 @@
 struct axis2_xml_schema_simple_content_restriction_ops
 {
     axis2_status_t (AXIS2_CALL *
-    free) (void *sim_content_res,
-            axis2_env_t **env);
+    free) (axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+           axis2_env_t **env);
 
     axis2_xml_schema_annotated_t *(AXIS2_CALL *
-    get_base_impl) (void *sim_content_res,
-                    axis2_env_t **env);
+    get_base_impl)(
+            axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+            axis2_env_t **env);
 
     axis2_xml_schema_any_attribute_t* (AXIS2_CALL *
     get_any_attribute)(
-            void *sim_content_res,
+            axis2_xml_schema_simple_content_restriction_t *sim_content_res,
             axis2_env_t **env);
     
     axis2_status_t (AXIS2_CALL *
     set_any_attribute)(
-            void *sim_content_res,
+            axis2_xml_schema_simple_content_restriction_t *sim_content_res,
             axis2_env_t **env,
             axis2_xml_schema_any_attribute_t *any_attr);
     
     axis2_xml_schema_obj_collection_t* (AXIS2_CALL *
     get_attributes)(
-            void *sim_content_res,
+            axis2_xml_schema_simple_content_restriction_t *sim_content_res,
             axis2_env_t **env);
             
     axis2_qname_t* (AXIS2_CALL*
     get_base_type_name)(
-            void *sim_content_res,
+            axis2_xml_schema_simple_content_restriction_t *sim_content_res,
             axis2_env_t **env);
             
     axis2_status_t (AXIS2_CALL *
     set_base_type_name)(
-            void *sim_content_res,
+            axis2_xml_schema_simple_content_restriction_t *sim_content_res,
             axis2_env_t **env,
             axis2_qname_t *qname); 
             
     axis2_xml_schema_simple_type_t* (AXIS2_CALL*
-    get_base_type)(void *sim_content_res,
-                   axis2_env_t **env);
+    get_base_type)(
+            axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+            axis2_env_t **env);
                    
     axis2_status_t (AXIS2_CALL *
-    set_base_type)(void *sim_content_res,
-                   axis2_env_t **env,
-                   axis2_xml_schema_simple_type_t *base_type); 
+    set_base_type)(
+            axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+            axis2_env_t **env,
+            axis2_xml_schema_simple_type_t *base_type); 
                    
     axis2_xml_schema_obj_collection_t* (AXIS2_CALL *
-    get_facets)(void *sim_content_res,
-                axis2_env_t **env);                   
+    get_facets)(
+            axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+            axis2_env_t **env);                   
 };
 
 struct axis2_xml_schema_simple_content_restriction
 {
-    axis2_xml_schema_annotated_t base;
     axis2_xml_schema_simple_content_restriction_ops_t *ops;
 };
 
@@ -117,44 +120,35 @@
 
 
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_FREE(sim_content_res, env) \
-		(((axis2_xml_schema_simple_content_restriction_t *) sim_content_res)->ops->\
-            free(sim_content_res, env))
+		((sim_content_res)->ops->free(sim_content_res, env))
 
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_BASE_IMPL(sim_content_res, env) \
-		(((axis2_xml_schema_simple_content_restriction_t *) sim_content_res)->ops->\
-            get_base_impl(sim_content_res, env))
+		((sim_content_res)->ops->get_base_impl(sim_content_res, env))
 
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_ANY_ATTRIBUTE(sim_content_res, env) \
-		(((axis2_xml_schema_simple_content_restriction_t *) sim_content_res)->ops->\
-            get_any_attribute(sim_content_res, env))
+		((sim_content_res)->ops->get_any_attribute(sim_content_res, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SET__ANY_ATTRIBUTE(sim_content_res, env, any_attr)\
-		(((axis2_xml_schema_simple_content_restriction_t *) sim_content_res)->ops->\
-            set_content(sim_content_res, env, any_attr ))
+#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SET__ANY_ATTRIBUTE(sim_content_res,\
+         env, any_attr)\
+		((sim_content_res)->ops->set_content(sim_content_res, env, any_attr ))
 
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_ATTRIBUTES(sim_content_res, env) \
-		(((axis2_xml_schema_simple_content_restriction_t *) sim_content_res)->ops->\
-            get_attributes(sim_content_res, env))
+		((sim_content_res)->ops->get_attributes(sim_content_res, env))
             
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_BASE_TYPE_NAME(sim_content_res, env)\
-        (((axis2_xml_schema_simple_content_restriction_t *) sim_content_res)->ops->\
-            get_base_type_name(sim_content_res, env))            
+        ((sim_content_res)->ops->get_base_type_name(sim_content_res, env))            
 
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SET_BASE_TYPE_NAME(sim_content_res, env, base_type_name) \
-        (((axis2_xml_schema_simple_content_restriction_t *) sim_content_res)->ops->\
-            set_base_type_name(sim_content_res, env, base_type_name))
+        ((sim_content_res)->ops->set_base_type_name(sim_content_res, env, base_type_name))
             
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_SET_BASE_TYPE(sim_content_res, env, base_type) \
-        (((axis2_xml_schema_simple_content_restriction_t *) sim_content_res)->ops->\
-            set_base_type(sim_content_res, env, base_type)) 
+        ((sim_content_res)->ops->set_base_type(sim_content_res, env, base_type)) 
             
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_BASE_TYPE(sim_content_res, env)\
-        (((axis2_xml_schema_simple_content_restriction_t *) sim_content_res)->ops->\
-            get_base_type(sim_content_res, env))
+        ((sim_content_res)->ops->get_base_type(sim_content_res, env))
             
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_FACETS(sim_content_res, env)\
-        (((axis2_xml_schema_simple_content_restriction_t *) sim_content_res)->ops->\
-            get_facets(sim_content_res, env))            
+        ((sim_content_res)->ops->get_facets(sim_content_res, env))            
             
                                             
 /** @} */

Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_extension.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_extension.c?rev=404928&r1=404927&r2=404928&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_extension.c (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_extension.c Sun May  7 21:42:06 2006
@@ -14,174 +14,173 @@
  * limitations under the License.
  */
 
-#include <axis2_xml_schema_simple_content_extension.h>
+#include <axis2_xml_schema_complex_content_extension.h>
 
-typedef struct axis2_xml_schema_simple_content_extension_impl 
-                    axis2_xml_schema_simple_content_extension_impl_t;
+typedef struct axis2_xml_schema_complex_content_extension_impl 
+                    axis2_xml_schema_complex_content_extension_impl_t;
 
 /** 
  * @brief Other Extension Struct Impl
  *	Axis2 Other Extension  
  */ 
-struct axis2_xml_schema_simple_content_extension_impl
+struct axis2_xml_schema_complex_content_extension_impl
 {
-    axis2_xml_schema_simple_content_extension_t sim_content_ext;
+    axis2_xml_schema_complex_content_extension_t cmp_cnt_ext;
     
     axis2_xml_schema_annotated_t *annotated;
     
-    axis2_hash_t *methods;
-    
     axis2_xml_schema_obj_collection_t *attributes;
     
     axis2_xml_schema_any_attribute_t *any_attribute;
     
     axis2_qname_t *base_type_name;
     
-    int type;
+    axis2_xml_schema_particle_t *particle;
 };
 
-#define AXIS2_INTF_TO_IMPL(sim_content_ext) \
-        ((axis2_xml_schema_simple_content_extension_impl_t *) sim_content_ext)
+#define AXIS2_INTF_TO_IMPL(cmp_cnt_ext) \
+        ((axis2_xml_schema_complex_content_extension_impl_t *) cmp_cnt_ext)
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_simple_content_extension_free(void *sim_content_ext,
-                        axis2_env_t **env);
+axis2_xml_schema_complex_content_extension_free(
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env);
 
 axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_simple_content_extension_get_base_impl(void *sim_content_ext,
-                                        axis2_env_t **env);
+axis2_xml_schema_complex_content_extension_get_base_impl(
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env);
 
 axis2_xml_schema_any_attribute_t* AXIS2_CALL
-axis2_xml_schema_simple_content_extension_get_any_attribute(
-                                            void *sim_content_ext,
-                                            axis2_env_t **env);
-
+axis2_xml_schema_complex_content_extension_get_any_attribute(
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env);
+        
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_extension_set_any_attribute(void *sim_content_ext,
-                                            axis2_env_t **env,
-                                            axis2_xml_schema_any_attribute_t *any_attr);
+axis2_xml_schema_complex_content_extension_set_any_attribute(
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env,
+        axis2_xml_schema_any_attribute_t *any_attr);
 
 axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_simple_content_extension_get_attributes(void *sim_content_ext,
-                                                         axis2_env_t **env);
+axis2_xml_schema_complex_content_extension_get_attributes(
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_extension_set_base_type_name(
-                                          void *sim_content_ext,
-                                          axis2_env_t **env,
-                                          axis2_qname_t *base_type_name);
+axis2_xml_schema_complex_content_extension_set_base_type_name(
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env,
+        axis2_qname_t *base_type_name);
                                           
 axis2_qname_t* AXIS2_CALL
-axis2_xml_schema_simple_content_extension_get_base_type_name(
-                                          void *sim_content_ext,
-                                          axis2_env_t **env);
+axis2_xml_schema_complex_content_extension_get_base_type_name(
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env);
+        
                                           
-int AXIS2_CALL 
-axis2_xml_schema_simple_content_extension_get_type(
-                                        void *sim_content_ext,
-                                        axis2_env_t **env);                                          
+axis2_xml_schema_particle_t* AXIS2_CALL
+axis2_xml_schema_complex_content_extension_get_particle( 
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env);                                       
+                              
+axis2_status_t AXIS2_CALL
+axis2_xml_schema_complex_content_extension_set_particle( 
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env,
+        axis2_xml_schema_particle_t *particle);
+        
+axis2_char_t *AXIS2_CALL
+axis2_xml_schema_complex_content_extension_to_string(
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env,
+        axis2_char_t *prefix,
+        int tab);                                      
                                           
 /*************************** end function protos **********************************/                                          
-AXIS2_DECLARE(axis2_xml_schema_simple_content_extension_t *)
-axis2_xml_schema_simple_content_extension_create(axis2_env_t **env)
+AXIS2_DECLARE(axis2_xml_schema_complex_content_extension_t *)
+axis2_xml_schema_complex_content_extension_create(axis2_env_t **env)
 {
-    axis2_xml_schema_simple_content_extension_impl_t *sim_content_ext_impl = NULL;
+    axis2_xml_schema_complex_content_extension_impl_t *cmp_cnt_ext_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
-    sim_content_ext_impl = (axis2_xml_schema_simple_content_extension_impl_t*)
-        AXIS2_MALLOC((*env)->allocator, sizeof(axis2_xml_schema_simple_content_extension_impl_t));
+    cmp_cnt_ext_impl = (axis2_xml_schema_complex_content_extension_impl_t*)
+        AXIS2_MALLOC((*env)->allocator, 
+        sizeof(axis2_xml_schema_complex_content_extension_impl_t));
         
-    if(!sim_content_ext_impl)
+    if(!cmp_cnt_ext_impl)
     {
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
-    sim_content_ext_impl->annotated = NULL;
-    sim_content_ext_impl->methods = NULL;
-    sim_content_ext_impl->sim_content_ext.base.ops = NULL;
-    sim_content_ext_impl->sim_content_ext.ops = NULL;
-    sim_content_ext_impl->attributes = NULL;
-    sim_content_ext_impl->base_type_name = NULL;
-    sim_content_ext_impl->any_attribute = NULL;
+    cmp_cnt_ext_impl->annotated = NULL;
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops = NULL;
+    cmp_cnt_ext_impl->attributes = NULL;
+    cmp_cnt_ext_impl->base_type_name = NULL;
+    cmp_cnt_ext_impl->any_attribute = NULL;
+    cmp_cnt_ext_impl->particle = NULL;
     
-    sim_content_ext_impl->sim_content_ext.ops = AXIS2_MALLOC((*env)->allocator, 
-                    sizeof(axis2_xml_schema_simple_content_extension_ops_t));
-    if(!sim_content_ext_impl->sim_content_ext.ops)
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops = AXIS2_MALLOC((*env)->allocator, 
+                    sizeof(axis2_xml_schema_complex_content_extension_ops_t));
+                    
+    if(!cmp_cnt_ext_impl->cmp_cnt_ext.ops)
     {
-        axis2_xml_schema_simple_content_extension_free(
-            &(sim_content_ext_impl->sim_content_ext), env);
+        axis2_xml_schema_complex_content_extension_free(
+            &(cmp_cnt_ext_impl->cmp_cnt_ext), env);
         AXIS2_ERROR_SET((*env)->error, 
             AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
 
 
-    sim_content_ext_impl->sim_content_ext.ops->free = 
-            axis2_xml_schema_simple_content_extension_free;
-    sim_content_ext_impl->sim_content_ext.ops->get_base_impl = 
-            axis2_xml_schema_simple_content_extension_get_base_impl;
-    sim_content_ext_impl->sim_content_ext.ops->get_any_attribute = 
-            axis2_xml_schema_simple_content_extension_get_any_attribute;
-    sim_content_ext_impl->sim_content_ext.ops->set_any_attribute = 
-            axis2_xml_schema_simple_content_extension_set_any_attribute;
-    sim_content_ext_impl->sim_content_ext.ops->get_attributes = 
-            axis2_xml_schema_simple_content_extension_get_attributes;
-    sim_content_ext_impl->sim_content_ext.ops->get_base_type_name = 
-            axis2_xml_schema_simple_content_extension_get_base_type_name;
-    sim_content_ext_impl->sim_content_ext.ops->set_base_type_name =
-            axis2_xml_schema_simple_content_extension_set_base_type_name; 
-
-    sim_content_ext_impl->methods = axis2_hash_make(env);
-   
-    if(!sim_content_ext_impl->methods)
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops->free = 
+            axis2_xml_schema_complex_content_extension_free;
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops->get_base_impl = 
+            axis2_xml_schema_complex_content_extension_get_base_impl;
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops->get_any_attribute = 
+            axis2_xml_schema_complex_content_extension_get_any_attribute;
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops->set_any_attribute = 
+            axis2_xml_schema_complex_content_extension_set_any_attribute;
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops->get_attributes = 
+            axis2_xml_schema_complex_content_extension_get_attributes;
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops->get_base_type_name = 
+            axis2_xml_schema_complex_content_extension_get_base_type_name;
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops->set_base_type_name =
+            axis2_xml_schema_complex_content_extension_set_base_type_name; 
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops->get_particle =
+            axis2_xml_schema_complex_content_extension_get_particle;
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops->set_particle =
+            axis2_xml_schema_complex_content_extension_set_particle;
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops->to_string =
+            axis2_xml_schema_complex_content_extension_to_string;            
+                    
+            
+            
+            
+    if(!cmp_cnt_ext_impl->annotated)
     {
-        axis2_xml_schema_simple_content_extension_free(
-            &(sim_content_ext_impl->sim_content_ext), env);
-        AXIS2_ERROR_SET((*env)->error, 
-            AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return NULL;
-    }
-    axis2_hash_set(sim_content_ext_impl->methods, "free", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_extension_free);
-    axis2_hash_set(sim_content_ext_impl->methods, "get_any_attribute", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_extension_get_any_attribute);
-    axis2_hash_set(sim_content_ext_impl->methods, "set_any_attribute", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_extension_set_any_attribute);
-    axis2_hash_set(sim_content_ext_impl->methods, "get_attributes", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_extension_get_attributes);
-    axis2_hash_set(sim_content_ext_impl->methods, "get_base_type_name", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_extension_get_base_type_name);
-    axis2_hash_set(sim_content_ext_impl->methods, "set_base_type_name",
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_extension_set_base_type_name);
-    sim_content_ext_impl->annotated = axis2_xml_schema_annotated_create(env);
-    if(!sim_content_ext_impl->annotated)
-    {
-        axis2_xml_schema_simple_content_extension_free(
-                &(sim_content_ext_impl->sim_content_ext), env);
+        axis2_xml_schema_complex_content_extension_free(
+                &(cmp_cnt_ext_impl->cmp_cnt_ext), env);
         return NULL;
     }
-    sim_content_ext_impl->attributes = axis2_xml_schema_obj_collection_create(env);
-    if(!sim_content_ext_impl->attributes)
+    cmp_cnt_ext_impl->attributes = axis2_xml_schema_obj_collection_create(env);
+    if(!cmp_cnt_ext_impl->attributes)
     {
-        axis2_xml_schema_simple_content_extension_free(&(sim_content_ext_impl->sim_content_ext), env);
+        axis2_xml_schema_complex_content_extension_free(&(cmp_cnt_ext_impl->cmp_cnt_ext), env);
         return NULL;
     }
-    status = axis2_xml_schema_annotated_resolve_methods(
-            &(sim_content_ext_impl->sim_content_ext.base), env, sim_content_ext_impl->annotated, 
-            sim_content_ext_impl->methods);
-    
-    return &(sim_content_ext_impl->sim_content_ext);
+    return &(cmp_cnt_ext_impl->cmp_cnt_ext);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_extension_free(void *sim_content_ext_ext,
+axis2_xml_schema_complex_content_extension_free(axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext_ext_ext,
                                     axis2_env_t **env)
 {
-    axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL;
+    axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content_ext_ext);
+    content_ext_impl = AXIS2_INTF_TO_IMPL(cmp_cnt_ext_ext_ext);
     if(NULL != content_ext_impl->any_attribute)
     {
         AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_ext_impl->any_attribute, env);
@@ -196,25 +195,15 @@
         AXIS2_QNAME_FREE(content_ext_impl->base_type_name, env);
         content_ext_impl->base_type_name = NULL;
     }    
-    if(NULL != content_ext_impl->methods)
-    {
-        axis2_hash_free(content_ext_impl->methods, env);
-        content_ext_impl->methods = NULL;
-    }
     if(NULL != content_ext_impl->annotated)
     {
         AXIS2_XML_SCHEMA_ANNOTATED_FREE(content_ext_impl->annotated, env);
         content_ext_impl->annotated = NULL;
     }
-    if(NULL != content_ext_impl->sim_content_ext.base.ops)
-    {
-        AXIS2_FREE((*env)->allocator, content_ext_impl->sim_content_ext.base.ops);
-        content_ext_impl->sim_content_ext.base.ops = NULL;  
-    }
-    if(NULL != content_ext_impl->sim_content_ext.ops)
+    if(NULL != content_ext_impl->cmp_cnt_ext.ops)
     {
-        AXIS2_FREE((*env)->allocator, content_ext_impl->sim_content_ext.ops);
-        content_ext_impl->sim_content_ext.ops = NULL;
+        AXIS2_FREE((*env)->allocator, content_ext_impl->cmp_cnt_ext.ops);
+        content_ext_impl->cmp_cnt_ext.ops = NULL;
     }
  
     AXIS2_FREE((*env)->allocator, content_ext_impl);
@@ -223,33 +212,33 @@
 }
 
 axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_simple_content_extension_get_base_impl(void *sim_content_ext,
+axis2_xml_schema_complex_content_extension_get_base_impl(axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
                                 axis2_env_t **env)
 {
-    axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL;
+    axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
-    content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content_ext);
+    content_ext_impl = AXIS2_INTF_TO_IMPL(cmp_cnt_ext);
     return content_ext_impl->annotated;
 }
 
 
 
 axis2_xml_schema_any_attribute_t* AXIS2_CALL
-axis2_xml_schema_simple_content_extension_get_any_attribute(void *sim_content_ext,
+axis2_xml_schema_complex_content_extension_get_any_attribute(axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
                                                             axis2_env_t **env)
 {
-    axis2_xml_schema_simple_content_extension_impl_t *cnt_ext_impl = NULL;
+    axis2_xml_schema_complex_content_extension_impl_t *cnt_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
-    cnt_ext_impl = AXIS2_INTF_TO_IMPL(sim_content_ext);
+    cnt_ext_impl = AXIS2_INTF_TO_IMPL(cmp_cnt_ext);
     return cnt_ext_impl->any_attribute;    
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_extension_set_any_attribute(void *sim_content_ext,
+axis2_xml_schema_complex_content_extension_set_any_attribute(axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
                                 axis2_env_t **env,
                                 axis2_xml_schema_any_attribute_t *any_attr)
 {
-    axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL;
+    axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, any_attr, AXIS2_FAILURE);
@@ -263,35 +252,35 @@
 }
 
 axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_simple_content_extension_get_attributes(void *sim_content,
+axis2_xml_schema_complex_content_extension_get_attributes(axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
                                                         axis2_env_t **env)
 {
-    axis2_xml_schema_simple_content_extension_impl_t *cnt_ext_impl = NULL;
+    axis2_xml_schema_complex_content_extension_impl_t *cnt_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
-    cnt_ext_impl = AXIS2_INTF_TO_IMPL(sim_content);
+    cnt_ext_impl = AXIS2_INTF_TO_IMPL(cmp_cnt_ext);
     return cnt_ext_impl->attributes;
 }
 
 axis2_qname_t* AXIS2_CALL
-axis2_xml_schema_simple_content_extension_get_base_type_name(
-                                          void *sim_content,
+axis2_xml_schema_complex_content_extension_get_base_type_name(
+                                          axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
                                           axis2_env_t **env)
 {
-    axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL;
+    axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
-    content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content);
+    content_ext_impl = AXIS2_INTF_TO_IMPL(cmp_cnt_ext);
     return content_ext_impl->base_type_name;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_extension_set_base_type_name(
-                                          void *sim_content,
+axis2_xml_schema_complex_content_extension_set_base_type_name(
+                                          axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
                                           axis2_env_t **env,
                                           axis2_qname_t *base_type_name)
 {
-    axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL;
+    axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content);
+    content_ext_impl = AXIS2_INTF_TO_IMPL(cmp_cnt_ext);
     if(NULL != content_ext_impl->base_type_name)
     {
         AXIS2_QNAME_FREE(content_ext_impl->base_type_name, env);
@@ -301,4 +290,39 @@
     return AXIS2_SUCCESS;
 }
 
-                                       
\ No newline at end of file
+axis2_xml_schema_particle_t* AXIS2_CALL
+axis2_xml_schema_complex_content_extension_get_particle( 
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env)
+{
+    return AXIS2_INTF_TO_IMPL(cmp_cnt_ext)->particle;
+}                                             
+                              
+axis2_status_t AXIS2_CALL
+axis2_xml_schema_complex_content_extension_set_particle( 
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env,
+        axis2_xml_schema_particle_t *particle)
+{
+    axis2_xml_schema_complex_content_extension_impl_t *cmp_cnt_ext_impl = NULL;
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK((*env)->error, particle, AXIS2_FAILURE);
+    cmp_cnt_ext_impl = AXIS2_INTF_TO_IMPL(cmp_cnt_ext);
+    if(NULL != cmp_cnt_ext_impl->particle)
+    {
+        AXIS2_XML_SCHEMA_PARTICLE_FREE(cmp_cnt_ext_impl->particle, env);
+        cmp_cnt_ext_impl->particle = NULL;
+    }
+    cmp_cnt_ext_impl->particle = particle;
+    return AXIS2_SUCCESS;
+}        
+        
+axis2_char_t *AXIS2_CALL
+axis2_xml_schema_complex_content_extension_to_string(
+        axis2_xml_schema_complex_content_extension_t *cmp_cnt_ext,
+        axis2_env_t **env,
+        axis2_char_t *prefix,
+        int tab)
+{
+    return NULL;
+}        
\ No newline at end of file

Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_restriction.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_restriction.c?rev=404928&r1=404927&r2=404928&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_restriction.c (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_complex_content_restriction.c Sun May  7 21:42:06 2006
@@ -29,51 +29,74 @@
     
     axis2_xml_schema_annotated_t *annotated;
     
-    axis2_hash_t *methods;
-    
     axis2_xml_schema_obj_collection_t *attributes;
     
     axis2_xml_schema_any_attribute_t *any_attribute;
     
     axis2_qname_t *base_type_name;
     
+    axis2_xml_schema_particle_t *particle;
+    
 };
 
 #define AXIS2_INTF_TO_IMPL(cmp_content_res) \
         ((axis2_xml_schema_complex_content_restriction_impl_t *) cmp_content_res)
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_complex_content_restriction_free(void *cmp_content_res,
-                        axis2_env_t **env);
+axis2_xml_schema_complex_content_restriction_free(
+        axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+        axis2_env_t **env);
 
 axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_base_impl(void *cmp_content_res,
-                                        axis2_env_t **env);
+axis2_xml_schema_complex_content_restriction_get_base_impl(
+        axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+        axis2_env_t **env);
 
 axis2_xml_schema_any_attribute_t* AXIS2_CALL
 axis2_xml_schema_complex_content_restriction_get_any_attribute(
-                                            void *cmp_content_res,
-                                            axis2_env_t **env);
+        axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+        axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_set_any_attribute(void *cmp_content_res,
-                                            axis2_env_t **env,
-                                            axis2_xml_schema_any_attribute_t *any_attr);
+axis2_xml_schema_complex_content_restriction_set_any_attribute(
+        axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+        axis2_env_t **env,
+        axis2_xml_schema_any_attribute_t *any_attr);
 
 axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_attributes(void *cmp_content_res,
-                                                         axis2_env_t **env);
+axis2_xml_schema_complex_content_restriction_get_attributes(
+        axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+        axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
 axis2_xml_schema_complex_content_restriction_set_base_type_name(
-                                          void *cmp_content_res,
-                                          axis2_env_t **env,
-                                          axis2_qname_t *base_type_name);
+        axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+        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(
-                                          void *cmp_content_res,
-                                          axis2_env_t **env);
+        axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+        axis2_env_t **env);
+                                          
+axis2_char_t* AXIS2_CALL
+axis2_xml_schema_complex_content_restriction_to_string(
+        axis2_xml_schema_complex_content_restriction_t *cmp_cnt_res,
+        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(
+        axis2_xml_schema_complex_content_restriction_t *cmp_cnt_res,
+        axis2_env_t **env);
+                                        
+axis2_status_t AXIS2_CALL
+axis2_xml_schema_complex_content_restriction_set_particle(
+        axis2_xml_schema_complex_content_restriction_t *cmp_content,
+        axis2_env_t **env,
+        axis2_xml_schema_particle_t *particle);
+                                                                         
                                           
 /*****************************************************************************/                                          
 AXIS2_DECLARE(axis2_xml_schema_complex_content_restriction_t *)
@@ -92,12 +115,12 @@
     }
     
     cmp_content_res_impl->annotated = NULL;
-    cmp_content_res_impl->methods = NULL;
-    cmp_content_res_impl->cmp_content_res.base.ops = NULL;
     cmp_content_res_impl->cmp_content_res.ops = NULL;
     cmp_content_res_impl->attributes = NULL;
     cmp_content_res_impl->base_type_name = NULL;
     cmp_content_res_impl->any_attribute = NULL;
+    cmp_content_res_impl->particle = NULL;
+    
     
     cmp_content_res_impl->cmp_content_res.ops = AXIS2_MALLOC((*env)->allocator, 
                     sizeof(axis2_xml_schema_complex_content_restriction_ops_t));
@@ -130,31 +153,17 @@
             axis2_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;  
+            axis2_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;             
+            
+    cmp_content_res_impl->cmp_content_res.ops->set_particle =
+            axis2_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;                        
             
-    cmp_content_res_impl->methods = axis2_hash_make(env);
-   
-    if(!cmp_content_res_impl->methods)
-    {
-        axis2_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);
-        return NULL;
-    }
-    axis2_hash_set(cmp_content_res_impl->methods, "free", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_restriction_free);
-    axis2_hash_set(cmp_content_res_impl->methods, "get_any_attribute", 
-            AXIS2_HASH_KEY_STRING, axis2_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);
-    axis2_hash_set(cmp_content_res_impl->methods, "get_attributes", 
-            AXIS2_HASH_KEY_STRING, axis2_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);
-    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);
-    
     cmp_content_res_impl->annotated = axis2_xml_schema_annotated_create(env);
     if(!cmp_content_res_impl->annotated)
     {
@@ -170,16 +179,13 @@
         return NULL;            
     }
     
-    status = axis2_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(void *cmp_content_res,
-                                    axis2_env_t **env)
+axis2_xml_schema_complex_content_restriction_free(
+        axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+        axis2_env_t **env)
 {
     axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
 
@@ -200,21 +206,12 @@
         AXIS2_QNAME_FREE(content_res_impl->base_type_name, env);
         content_res_impl->base_type_name = NULL;
     }    
-    if(NULL != content_res_impl->methods)
-    {
-        axis2_hash_free(content_res_impl->methods, env);
-        content_res_impl->methods = NULL;
-    }
+   
     if(NULL != content_res_impl->annotated)
     {
         AXIS2_XML_SCHEMA_ANNOTATED_FREE(content_res_impl->annotated, env);
         content_res_impl->annotated = NULL;
     }
-    if(NULL != content_res_impl->cmp_content_res.base.ops)
-    {
-        AXIS2_FREE((*env)->allocator, content_res_impl->cmp_content_res.base.ops);
-        content_res_impl->cmp_content_res.base.ops = NULL;  
-    }
     if(NULL != content_res_impl->cmp_content_res.ops)
     {
         AXIS2_FREE((*env)->allocator, content_res_impl->cmp_content_res.ops);
@@ -227,8 +224,9 @@
 }
 
 axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_base_impl(void *cmp_content_res,
-                                axis2_env_t **env)
+axis2_xml_schema_complex_content_restriction_get_base_impl(
+        axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+        axis2_env_t **env)
 {
     axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -239,8 +237,9 @@
 
 
 axis2_xml_schema_any_attribute_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_any_attribute(void *cmp_content_res,
-                                                            axis2_env_t **env)
+axis2_xml_schema_complex_content_restriction_get_any_attribute(
+        axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+        axis2_env_t **env)
 {
     axis2_xml_schema_complex_content_restriction_impl_t *cnt_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -249,9 +248,10 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_set_any_attribute(void *cmp_content_res,
-                                axis2_env_t **env,
-                                axis2_xml_schema_any_attribute_t *any_attr)
+axis2_xml_schema_complex_content_restriction_set_any_attribute(
+        axis2_xml_schema_complex_content_restriction_t *cmp_content_res,
+        axis2_env_t **env,
+        axis2_xml_schema_any_attribute_t *any_attr)
 {
     axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
     
@@ -262,13 +262,15 @@
         AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_res_impl->any_attribute, env);
         content_res_impl->any_attribute = NULL;
     }
-        content_res_impl->any_attribute = any_attr;
+    
+    content_res_impl->any_attribute = any_attr;
     return AXIS2_SUCCESS;
 }
 
 axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_get_attributes(void *cmp_content,
-                                                        axis2_env_t **env)
+axis2_xml_schema_complex_content_restriction_get_attributes(
+        axis2_xml_schema_complex_content_restriction_t *cmp_content,
+        axis2_env_t **env)
 {
     axis2_xml_schema_complex_content_restriction_impl_t *cnt_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -278,8 +280,8 @@
 
 axis2_qname_t* AXIS2_CALL
 axis2_xml_schema_complex_content_restriction_get_base_type_name(
-                                          void *cmp_content,
-                                          axis2_env_t **env)
+        axis2_xml_schema_complex_content_restriction_t *cmp_content,
+        axis2_env_t **env)
 {
     axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
@@ -289,9 +291,9 @@
 
 axis2_status_t AXIS2_CALL
 axis2_xml_schema_complex_content_restriction_set_base_type_name(
-                                          void *cmp_content,
-                                          axis2_env_t **env,
-                                          axis2_qname_t *base_type_name)
+        axis2_xml_schema_complex_content_restriction_t *cmp_content,
+        axis2_env_t **env,
+        axis2_qname_t *base_type_name)
 {
     axis2_xml_schema_complex_content_restriction_impl_t *content_res_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -305,3 +307,42 @@
     return AXIS2_SUCCESS;
 }
 
+axis2_status_t AXIS2_CALL
+axis2_xml_schema_complex_content_restriction_set_particle(
+        axis2_xml_schema_complex_content_restriction_t *cmp_content,
+        axis2_env_t **env,
+        axis2_xml_schema_particle_t *particle)
+{
+    axis2_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);
+        cmp_cnt_res_impl->particle = NULL;
+    }
+
+    cmp_cnt_res_impl->particle = particle;
+    return AXIS2_SUCCESS;
+}
+
+axis2_xml_schema_particle_t* AXIS2_CALL
+axis2_xml_schema_complex_content_restriction_get_particle(
+        axis2_xml_schema_complex_content_restriction_t *cmp_cnt_res,
+        axis2_env_t **env)
+{
+    return AXIS2_INTF_TO_IMPL(cmp_cnt_res)->particle;
+}
+                                                                                  
+axis2_char_t* AXIS2_CALL
+axis2_xml_schema_complex_content_restriction_to_string(
+        axis2_xml_schema_complex_content_restriction_t *cmp_cnt_res,
+        axis2_env_t **env,
+        axis2_char_t *prefix,
+        int tab)
+{
+    /** TODO */
+    return NULL;
+}                                                                             
+                                                                                  
\ No newline at end of file

Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_obj_collection.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_obj_collection.c?rev=404928&r1=404927&r2=404928&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_obj_collection.c (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_obj_collection.c Sun May  7 21:42:06 2006
@@ -1,4 +1,4 @@
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
                                                                                                                                                                                                                                                                                                              /*
+/*
  * Copyright 2004,2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_extension.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_extension.c?rev=404928&r1=404927&r2=404928&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_extension.c (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_extension.c Sun May  7 21:42:06 2006
@@ -14,174 +14,149 @@
  * limitations under the License.
  */
 
-#include <axis2_xml_schema_complex_content_extension.h>
+#include <axis2_xml_schema_simple_content_extension.h>
 
-typedef struct axis2_xml_schema_complex_content_extension_impl 
-                    axis2_xml_schema_complex_content_extension_impl_t;
+typedef struct axis2_xml_schema_simple_content_extension_impl 
+                    axis2_xml_schema_simple_content_extension_impl_t;
 
 /** 
  * @brief Other Extension Struct Impl
  *	Axis2 Other Extension  
  */ 
-struct axis2_xml_schema_complex_content_extension_impl
+struct axis2_xml_schema_simple_content_extension_impl
 {
-    axis2_xml_schema_complex_content_extension_t cmp_content_ext;
+    axis2_xml_schema_simple_content_extension_t sim_content_ext;
     
     axis2_xml_schema_annotated_t *annotated;
     
-    axis2_hash_t *methods;
-    
     axis2_xml_schema_obj_collection_t *attributes;
     
     axis2_xml_schema_any_attribute_t *any_attribute;
     
     axis2_qname_t *base_type_name;
     
-    int type;
 };
 
-#define AXIS2_INTF_TO_IMPL(cmp_content_ext) \
-        ((axis2_xml_schema_complex_content_extension_impl_t *) cmp_content_ext)
+#define AXIS2_INTF_TO_IMPL(sim_content_ext) \
+        ((axis2_xml_schema_simple_content_extension_impl_t *) sim_content_ext)
 
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_complex_content_extension_free(void *cmp_content_ext,
-                        axis2_env_t **env);
+axis2_xml_schema_simple_content_extension_free(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext,
+        axis2_env_t **env);
 
 axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_complex_content_extension_get_base_impl(void *cmp_content_ext,
-                                        axis2_env_t **env);
+axis2_xml_schema_simple_content_extension_get_base_impl(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext,
+        axis2_env_t **env);
 
 axis2_xml_schema_any_attribute_t* AXIS2_CALL
-axis2_xml_schema_complex_content_extension_get_any_attribute(
-                                            void *cmp_content_ext,
-                                            axis2_env_t **env);
+axis2_xml_schema_simple_content_extension_get_any_attribute(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext,
+        axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_extension_set_any_attribute(void *cmp_content_ext,
-                                            axis2_env_t **env,
-                                            axis2_xml_schema_any_attribute_t *any_attr);
+axis2_xml_schema_simple_content_extension_set_any_attribute(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext,
+        axis2_env_t **env,
+        axis2_xml_schema_any_attribute_t *any_attr);
 
 axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_complex_content_extension_get_attributes(void *cmp_content_ext,
-                                                         axis2_env_t **env);
+axis2_xml_schema_simple_content_extension_get_attributes(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext,
+        axis2_env_t **env);
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_extension_set_base_type_name(
-                                          void *cmp_content_ext,
-                                          axis2_env_t **env,
-                                          axis2_qname_t *base_type_name);
+axis2_xml_schema_simple_content_extension_set_base_type_name(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext,
+        axis2_env_t **env,
+        axis2_qname_t *base_type_name);
+        
                                           
 axis2_qname_t* AXIS2_CALL
-axis2_xml_schema_complex_content_extension_get_base_type_name(
-                                          void *cmp_content_ext,
-                                          axis2_env_t **env);
+axis2_xml_schema_simple_content_extension_get_base_type_name(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext,
+        axis2_env_t **env);
                                           
 int AXIS2_CALL 
-axis2_xml_schema_complex_content_extension_get_type(
-                                        void *cmp_content_ext,
-                                        axis2_env_t **env);                                          
+axis2_xml_schema_simple_content_extension_get_type(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext,
+        axis2_env_t **env);                                          
                                           
-/*************************** end function protos **********************************/                                          
-AXIS2_DECLARE(axis2_xml_schema_complex_content_extension_t *)
-axis2_xml_schema_complex_content_extension_create(axis2_env_t **env)
+/*************************** end function protos **********************************/                
+                          
+AXIS2_DECLARE(axis2_xml_schema_simple_content_extension_t *)
+axis2_xml_schema_simple_content_extension_create(axis2_env_t **env)
 {
-    axis2_xml_schema_complex_content_extension_impl_t *cmp_content_ext_impl = NULL;
+    axis2_xml_schema_simple_content_extension_impl_t *sim_content_ext_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
-    cmp_content_ext_impl = (axis2_xml_schema_complex_content_extension_impl_t*)
-        AXIS2_MALLOC((*env)->allocator, sizeof(axis2_xml_schema_complex_content_extension_impl_t));
+    sim_content_ext_impl = (axis2_xml_schema_simple_content_extension_impl_t*)
+        AXIS2_MALLOC((*env)->allocator, sizeof(axis2_xml_schema_simple_content_extension_impl_t));
         
-    if(!cmp_content_ext_impl)
+    if(!sim_content_ext_impl)
     {
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
-    cmp_content_ext_impl->annotated = NULL;
-    cmp_content_ext_impl->methods = NULL;
-    cmp_content_ext_impl->cmp_content_ext.base.ops = NULL;
-    cmp_content_ext_impl->cmp_content_ext.ops = NULL;
-    cmp_content_ext_impl->attributes = NULL;
-    cmp_content_ext_impl->base_type_name = NULL;
-    cmp_content_ext_impl->any_attribute = NULL;
-    
-    cmp_content_ext_impl->cmp_content_ext.ops = AXIS2_MALLOC((*env)->allocator, 
-                    sizeof(axis2_xml_schema_complex_content_extension_ops_t));
-    if(!cmp_content_ext_impl->cmp_content_ext.ops)
+    sim_content_ext_impl->annotated = NULL;
+    sim_content_ext_impl->sim_content_ext.ops = NULL;
+    sim_content_ext_impl->attributes = NULL;
+    sim_content_ext_impl->base_type_name = NULL;
+    sim_content_ext_impl->any_attribute = NULL;
+    
+    sim_content_ext_impl->sim_content_ext.ops = AXIS2_MALLOC((*env)->allocator, 
+                    sizeof(axis2_xml_schema_simple_content_extension_ops_t));
+    if(!sim_content_ext_impl->sim_content_ext.ops)
     {
-        axis2_xml_schema_complex_content_extension_free(
-            &(cmp_content_ext_impl->cmp_content_ext), env);
+        axis2_xml_schema_simple_content_extension_free(
+            &(sim_content_ext_impl->sim_content_ext), env);
         AXIS2_ERROR_SET((*env)->error, 
             AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
 
 
-    cmp_content_ext_impl->cmp_content_ext.ops->free = 
-            axis2_xml_schema_complex_content_extension_free;
-    cmp_content_ext_impl->cmp_content_ext.ops->get_base_impl = 
-            axis2_xml_schema_complex_content_extension_get_base_impl;
-    cmp_content_ext_impl->cmp_content_ext.ops->get_any_attribute = 
-            axis2_xml_schema_complex_content_extension_get_any_attribute;
-    cmp_content_ext_impl->cmp_content_ext.ops->set_any_attribute = 
-            axis2_xml_schema_complex_content_extension_set_any_attribute;
-    cmp_content_ext_impl->cmp_content_ext.ops->get_attributes = 
-            axis2_xml_schema_complex_content_extension_get_attributes;
-    cmp_content_ext_impl->cmp_content_ext.ops->get_base_type_name = 
-            axis2_xml_schema_complex_content_extension_get_base_type_name;
-    cmp_content_ext_impl->cmp_content_ext.ops->set_base_type_name =
-            axis2_xml_schema_complex_content_extension_set_base_type_name; 
-
-    cmp_content_ext_impl->methods = axis2_hash_make(env);
-   
-    if(!cmp_content_ext_impl->methods)
-    {
-        axis2_xml_schema_complex_content_extension_free(
-            &(cmp_content_ext_impl->cmp_content_ext), env);
-        AXIS2_ERROR_SET((*env)->error, 
-            AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return NULL;
-    }
-    axis2_hash_set(cmp_content_ext_impl->methods, "free", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_extension_free);
-    axis2_hash_set(cmp_content_ext_impl->methods, "get_any_attribute", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_extension_get_any_attribute);
-    axis2_hash_set(cmp_content_ext_impl->methods, "set_any_attribute", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_extension_set_any_attribute);
-    axis2_hash_set(cmp_content_ext_impl->methods, "get_attributes", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_extension_get_attributes);
-    axis2_hash_set(cmp_content_ext_impl->methods, "get_base_type_name", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_extension_get_base_type_name);
-    axis2_hash_set(cmp_content_ext_impl->methods, "set_base_type_name",
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_extension_set_base_type_name);
-    cmp_content_ext_impl->annotated = axis2_xml_schema_annotated_create(env);
-    if(!cmp_content_ext_impl->annotated)
+    sim_content_ext_impl->sim_content_ext.ops->free = 
+            axis2_xml_schema_simple_content_extension_free;
+    sim_content_ext_impl->sim_content_ext.ops->get_base_impl = 
+            axis2_xml_schema_simple_content_extension_get_base_impl;
+    sim_content_ext_impl->sim_content_ext.ops->get_any_attribute = 
+            axis2_xml_schema_simple_content_extension_get_any_attribute;
+    sim_content_ext_impl->sim_content_ext.ops->set_any_attribute = 
+            axis2_xml_schema_simple_content_extension_set_any_attribute;
+    sim_content_ext_impl->sim_content_ext.ops->get_attributes = 
+            axis2_xml_schema_simple_content_extension_get_attributes;
+    sim_content_ext_impl->sim_content_ext.ops->get_base_type_name = 
+            axis2_xml_schema_simple_content_extension_get_base_type_name;
+    sim_content_ext_impl->sim_content_ext.ops->set_base_type_name =
+            axis2_xml_schema_simple_content_extension_set_base_type_name; 
+
+    if(!sim_content_ext_impl->annotated)
     {
-        axis2_xml_schema_complex_content_extension_free(
-                &(cmp_content_ext_impl->cmp_content_ext), env);
+        axis2_xml_schema_simple_content_extension_free(
+                &(sim_content_ext_impl->sim_content_ext), env);
         return NULL;
     }
-    cmp_content_ext_impl->attributes = axis2_xml_schema_obj_collection_create(env);
-    if(!cmp_content_ext_impl->attributes)
+    sim_content_ext_impl->attributes = axis2_xml_schema_obj_collection_create(env);
+    if(!sim_content_ext_impl->attributes)
     {
-        axis2_xml_schema_complex_content_extension_free(&(cmp_content_ext_impl->cmp_content_ext), env);
+        axis2_xml_schema_simple_content_extension_free(&(sim_content_ext_impl->sim_content_ext), env);
         return NULL;
     }
-    status = axis2_xml_schema_annotated_resolve_methods(
-            &(cmp_content_ext_impl->cmp_content_ext.base), env, cmp_content_ext_impl->annotated, 
-            cmp_content_ext_impl->methods);
-    
-    return &(cmp_content_ext_impl->cmp_content_ext);
+    return &(sim_content_ext_impl->sim_content_ext);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_extension_free(void *cmp_content_ext_ext,
-                                    axis2_env_t **env)
+axis2_xml_schema_simple_content_extension_free(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext_ext,
+        axis2_env_t **env)
 {
-    axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
+    axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    content_ext_impl = AXIS2_INTF_TO_IMPL(cmp_content_ext_ext);
+    content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content_ext_ext);
     if(NULL != content_ext_impl->any_attribute)
     {
         AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_ext_impl->any_attribute, env);
@@ -196,25 +171,15 @@
         AXIS2_QNAME_FREE(content_ext_impl->base_type_name, env);
         content_ext_impl->base_type_name = NULL;
     }    
-    if(NULL != content_ext_impl->methods)
-    {
-        axis2_hash_free(content_ext_impl->methods, env);
-        content_ext_impl->methods = NULL;
-    }
     if(NULL != content_ext_impl->annotated)
     {
         AXIS2_XML_SCHEMA_ANNOTATED_FREE(content_ext_impl->annotated, env);
         content_ext_impl->annotated = NULL;
     }
-    if(NULL != content_ext_impl->cmp_content_ext.base.ops)
-    {
-        AXIS2_FREE((*env)->allocator, content_ext_impl->cmp_content_ext.base.ops);
-        content_ext_impl->cmp_content_ext.base.ops = NULL;  
-    }
-    if(NULL != content_ext_impl->cmp_content_ext.ops)
+    if(NULL != content_ext_impl->sim_content_ext.ops)
     {
-        AXIS2_FREE((*env)->allocator, content_ext_impl->cmp_content_ext.ops);
-        content_ext_impl->cmp_content_ext.ops = NULL;
+        AXIS2_FREE((*env)->allocator, content_ext_impl->sim_content_ext.ops);
+        content_ext_impl->sim_content_ext.ops = NULL;
     }
  
     AXIS2_FREE((*env)->allocator, content_ext_impl);
@@ -223,33 +188,36 @@
 }
 
 axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_complex_content_extension_get_base_impl(void *cmp_content_ext,
-                                axis2_env_t **env)
+axis2_xml_schema_simple_content_extension_get_base_impl(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext,
+        axis2_env_t **env)
 {
-    axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
+    axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
-    content_ext_impl = AXIS2_INTF_TO_IMPL(cmp_content_ext);
+    content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content_ext);
     return content_ext_impl->annotated;
 }
 
 
 
 axis2_xml_schema_any_attribute_t* AXIS2_CALL
-axis2_xml_schema_complex_content_extension_get_any_attribute(void *cmp_content_ext,
-                                                            axis2_env_t **env)
+axis2_xml_schema_simple_content_extension_get_any_attribute(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext,
+        axis2_env_t **env)
 {
-    axis2_xml_schema_complex_content_extension_impl_t *cnt_ext_impl = NULL;
+    axis2_xml_schema_simple_content_extension_impl_t *cnt_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
-    cnt_ext_impl = AXIS2_INTF_TO_IMPL(cmp_content_ext);
+    cnt_ext_impl = AXIS2_INTF_TO_IMPL(sim_content_ext);
     return cnt_ext_impl->any_attribute;    
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_extension_set_any_attribute(void *cmp_content_ext,
-                                axis2_env_t **env,
-                                axis2_xml_schema_any_attribute_t *any_attr)
+axis2_xml_schema_simple_content_extension_set_any_attribute(
+        axis2_xml_schema_simple_content_extension_t *sim_content_ext,
+        axis2_env_t **env,
+        axis2_xml_schema_any_attribute_t *any_attr)
 {
-    axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
+    axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, any_attr, AXIS2_FAILURE);
@@ -263,35 +231,36 @@
 }
 
 axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_complex_content_extension_get_attributes(void *cmp_content,
-                                                        axis2_env_t **env)
+axis2_xml_schema_simple_content_extension_get_attributes(
+        axis2_xml_schema_simple_content_extension_t *sim_content,
+        axis2_env_t **env)
 {
-    axis2_xml_schema_complex_content_extension_impl_t *cnt_ext_impl = NULL;
+    axis2_xml_schema_simple_content_extension_impl_t *cnt_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
-    cnt_ext_impl = AXIS2_INTF_TO_IMPL(cmp_content);
+    cnt_ext_impl = AXIS2_INTF_TO_IMPL(sim_content);
     return cnt_ext_impl->attributes;
 }
 
 axis2_qname_t* AXIS2_CALL
-axis2_xml_schema_complex_content_extension_get_base_type_name(
-                                          void *cmp_content,
-                                          axis2_env_t **env)
+axis2_xml_schema_simple_content_extension_get_base_type_name(
+        axis2_xml_schema_simple_content_extension_t *sim_content,
+        axis2_env_t **env)
 {
-    axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
+    axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
-    content_ext_impl = AXIS2_INTF_TO_IMPL(cmp_content);
+    content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content);
     return content_ext_impl->base_type_name;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_extension_set_base_type_name(
-                                          void *cmp_content,
-                                          axis2_env_t **env,
-                                          axis2_qname_t *base_type_name)
+axis2_xml_schema_simple_content_extension_set_base_type_name(
+        axis2_xml_schema_simple_content_extension_t *sim_content,
+        axis2_env_t **env,
+        axis2_qname_t *base_type_name)
 {
-    axis2_xml_schema_complex_content_extension_impl_t *content_ext_impl = NULL;
+    axis2_xml_schema_simple_content_extension_impl_t *content_ext_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    content_ext_impl = AXIS2_INTF_TO_IMPL(cmp_content);
+    content_ext_impl = AXIS2_INTF_TO_IMPL(sim_content);
     if(NULL != content_ext_impl->base_type_name)
     {
         AXIS2_QNAME_FREE(content_ext_impl->base_type_name, env);