axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r412382 [2/3] - in /webservices/axis2/trunk/c/xml_schema: include/xml_schema/ samples/ src/ test/
Date Wed, 07 Jun 2006 12:03:30 GMT
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
                                     const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_any_attribute_type(void *any_attr,
+axis2_xml_schema_any_attribute_get_type(void *any_attr,
                                     const axis2_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
@@ -123,8 +123,8 @@
     any_attr_impl->any_attr.ops->free = 
         axis2_xml_schema_any_attribute_free;
         
-    any_attr_impl->any_attr.ops->type =
-        axis2_xml_schema_any_attribute_type;
+    any_attr_impl->any_attr.ops->get_type =
+        axis2_xml_schema_any_attribute_get_type;
     
     any_attr_impl->any_attr.ops->super_objs =
         axis2_xml_schema_any_attribute_super_objs;                
@@ -152,8 +152,8 @@
     }
     axis2_hash_set(any_attr_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_any_attribute_free);
-    axis2_hash_set(any_attr_impl->methods, "type", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_any_attribute_type);
+    axis2_hash_set(any_attr_impl->methods, "get_type", AXIS2_HASH_KEY_STRING,
+            axis2_xml_schema_any_attribute_get_type);
     axis2_hash_set(any_attr_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_any_attribute_super_objs);            
     axis2_hash_set(any_attr_impl->methods, "get_namespace", AXIS2_HASH_KEY_STRING, 
@@ -322,7 +322,7 @@
 
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_any_attribute_type(void *any_attr,
+axis2_xml_schema_any_attribute_get_type(void *any_attr,
                                     const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(any_attr)->obj_type;    

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_app_info_type(
+axis2_xml_schema_app_info_get_type(
         void *app_info,
         const axis2_env_t *env);
 
@@ -123,8 +123,8 @@
     app_info_impl->app_info.ops->super_objs = 
         axis2_xml_schema_app_info_super_objs;
     
-    app_info_impl->app_info.ops->type = 
-        axis2_xml_schema_app_info_type;
+    app_info_impl->app_info.ops->get_type = 
+        axis2_xml_schema_app_info_get_type;
     
     app_info_impl->app_info.ops->get_base_impl = 
         axis2_xml_schema_app_info_get_base_impl;
@@ -154,8 +154,8 @@
     axis2_hash_set(app_info_impl->methods, "super_objs", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_app_info_super_objs);
     
-    axis2_hash_set(app_info_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_app_info_type);
+    axis2_hash_set(app_info_impl->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING, axis2_xml_schema_app_info_get_type);
     
     axis2_hash_set(app_info_impl->methods, "get_source", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_app_info_get_source);
@@ -257,7 +257,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_app_info_type(
+axis2_xml_schema_app_info_get_type(
         void *app_info,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c Wed Jun  7 05:03:26 2006
@@ -70,7 +70,7 @@
                                     const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_attribute_type(void *attr,
+axis2_xml_schema_attribute_get_type(void *attr,
                                     const axis2_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
@@ -223,8 +223,8 @@
     }            
     attr_impl->attr.ops->free = 
         axis2_xml_schema_attribute_free;
-    attr_impl->attr.ops->type =
-        axis2_xml_schema_attribute_type;
+    attr_impl->attr.ops->get_type =
+        axis2_xml_schema_attribute_get_type;
     attr_impl->attr.ops->super_objs =
         axis2_xml_schema_attribute_super_objs;                
     attr_impl->attr.ops->get_base_impl = 
@@ -277,8 +277,8 @@
     }
     axis2_hash_set(attr_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_attribute_free);
-    axis2_hash_set(attr_impl->methods, "type", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_attribute_type);
+    axis2_hash_set(attr_impl->methods, "get_type", AXIS2_HASH_KEY_STRING,
+            axis2_xml_schema_attribute_get_type);
     axis2_hash_set(attr_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_attribute_super_objs);            
     
@@ -390,53 +390,8 @@
     return attr_impl->annotated;
 }
 
-/*
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_attribute_resolve_methods(
-                                axis2_xml_schema_attribute_t *attr,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_attribute_t *attr_impl,
-                                axis2_hash_t *methods)
-{
-    axis2_xml_schema_attribute_impl_t *any_impl_l = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, attr_impl, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
-    
-    any_impl_l = (axis2_xml_schema_attribute_impl_t *) attr_impl;
-    
-    attr->ops = AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_xml_schema_attribute_ops_t));
-    if(NULL != attr->ops)
-    {
-        AXIS2_ERROR_SET(env->error, 
-            AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return AXIS2_FAILURE;
-    }            
-            
-    attr->ops->free = axis2_hash_get(methods, "free", 
-            AXIS2_HASH_KEY_STRING);
-    attr->ops->get_base_impl = 
-            any_impl_l->attr.ops->get_base_impl;
-    attr->ops->get_namespace = 
-            any_impl_l->attr.ops->get_namespace;
-    attr->ops->set_namespace = 
-            any_impl_l->attr.ops->set_namespace;
-    attr->ops->get_process_content = 
-            any_impl_l->attr.ops->get_process_content;
-    attr->ops->set_process_content = 
-            any_impl_l->attr.ops->set_process_content;
-    
-    return axis2_xml_schema_annotated_resolve_methods(&(attr->base), 
-            env, any_impl_l->annotated, methods);
-}
-*/
-
-
-
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_attribute_type(void *attr,
+axis2_xml_schema_attribute_get_type(void *attr,
                                     const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(attr)->obj_type;    

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c Wed Jun  7 05:03:26 2006
@@ -21,8 +21,7 @@
                 axis2_xml_schema_attribute_group_impl_t;
 
 /** 
- * @brief Other Extension Struct Impl
- *   Axis2 Other Extension  
+ * @brief axis2_xml_schema_attribute_group_impl
  */ 
 struct axis2_xml_schema_attribute_group_impl
 {
@@ -52,12 +51,14 @@
                         const axis2_env_t *env);
 
 axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_attribute_group_get_base_impl(void *attr_grp,
-                                    const axis2_env_t *env);
+axis2_xml_schema_attribute_group_get_base_impl(
+        void *attr_grp,
+        const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_attribute_group_type(void *attr_grp,
-                                    const axis2_env_t *env);
+axis2_xml_schema_attribute_group_get_type(
+        void *attr_grp,
+        const axis2_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
 axis2_xml_schema_attribute_group_super_objs(void *attr_grp,
@@ -131,8 +132,8 @@
     
     attr_impl->attr_grp.ops->free = 
         axis2_xml_schema_attribute_group_free;
-    attr_impl->attr_grp.ops->type =
-        axis2_xml_schema_attribute_group_type;
+    attr_impl->attr_grp.ops->get_type =
+        axis2_xml_schema_attribute_group_get_type;
     attr_impl->attr_grp.ops->super_objs =
         axis2_xml_schema_attribute_group_super_objs;                
     attr_impl->attr_grp.ops->get_base_impl = 
@@ -158,8 +159,8 @@
     }
     axis2_hash_set(attr_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_attribute_group_free);
-    axis2_hash_set(attr_impl->methods, "type", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_attribute_group_type);
+    axis2_hash_set(attr_impl->methods, "get_type", AXIS2_HASH_KEY_STRING,
+            axis2_xml_schema_attribute_group_get_type);
     axis2_hash_set(attr_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_attribute_group_super_objs);            
     
@@ -257,53 +258,8 @@
     return attr_impl->annotated;
 }
 
-/*
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_attribute_group_resolve_methods(
-                                axis2_xml_schema_attribute_group_t *attr_grp,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_attribute_group_t *attr_impl,
-                                axis2_hash_t *methods)
-{
-    axis2_xml_schema_attribute_group_impl_t *any_impl_l = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, attr_impl, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
-    
-    any_impl_l = (axis2_xml_schema_attribute_group_impl_t *) attr_impl;
-    
-    attr_grp->ops = AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_xml_schema_attribute_group_ops_t));
-    if(NULL != attr_grp->ops)
-    {
-        AXIS2_ERROR_SET(env->error, 
-            AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return AXIS2_FAILURE;
-    }            
-            
-    attr_grp->ops->free = axis2_hash_get(methods, "free", 
-            AXIS2_HASH_KEY_STRING);
-    attr_grp->ops->get_base_impl = 
-            any_impl_l->attr_grp.ops->get_base_impl;
-    attr_grp->ops->get_namespace = 
-            any_impl_l->attr_grp.ops->get_namespace;
-    attr_grp->ops->set_namespace = 
-            any_impl_l->attr_grp.ops->set_namespace;
-    attr_grp->ops->get_process_content = 
-            any_impl_l->attr_grp.ops->get_process_content;
-    attr_grp->ops->set_process_content = 
-            any_impl_l->attr_grp.ops->set_process_content;
-    
-    return axis2_xml_schema_annotated_resolve_methods(&(attr_grp->base), 
-            env, any_impl_l->annotated, methods);
-}
-*/
-
-
-
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_attribute_group_type(void *attr_grp,
+axis2_xml_schema_attribute_group_get_type(void *attr_grp,
                                     const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(attr_grp)->obj_type;    

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c Wed Jun  7 05:03:26 2006
@@ -45,16 +45,19 @@
 
 /******************* function prototypes **********************************/
 axis2_status_t AXIS2_CALL 
-axis2_xml_schema_attribute_group_ref_free(void *grp_ref,
-                        const axis2_env_t *env);
+axis2_xml_schema_attribute_group_ref_free(
+        void *grp_ref,
+        const axis2_env_t *env);
 
 axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_attribute_group_ref_get_base_impl(void *grp_ref,
-                                    const axis2_env_t *env);
+axis2_xml_schema_attribute_group_ref_get_base_impl(
+        void *grp_ref,
+        const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_attribute_group_ref_type(void *grp_ref,
-                                    const axis2_env_t *env);
+axis2_xml_schema_attribute_group_ref_get_type(
+        void *grp_ref,
+        const axis2_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
 axis2_xml_schema_attribute_group_ref_super_objs(void *grp_ref,
@@ -62,15 +65,15 @@
 
 axis2_qname_t* AXIS2_CALL 
 axis2_xml_schema_attribute_group_ref_get_ref_qname(
-            void *grp_ref,
-            const axis2_env_t *env);
+        void *grp_ref,
+        const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL 
 axis2_xml_schema_attribute_group_ref_set_ref_qname(
-            void *grp_ref,
-            const axis2_env_t *env,
-            axis2_qname_t *any_attr);  
-    
+        void *grp_ref,
+        const axis2_env_t *env,
+        axis2_qname_t *any_attr);  
+
  /************************ end function prototypes ******************************/
  
 AXIS2_EXTERN axis2_xml_schema_attribute_group_ref_t * AXIS2_CALL
@@ -107,8 +110,8 @@
     
     attr_impl->grp_ref.ops->free = 
         axis2_xml_schema_attribute_group_ref_free;
-    attr_impl->grp_ref.ops->type =
-        axis2_xml_schema_attribute_group_ref_type;
+    attr_impl->grp_ref.ops->get_type =
+        axis2_xml_schema_attribute_group_ref_get_type;
     attr_impl->grp_ref.ops->super_objs =
         axis2_xml_schema_attribute_group_ref_super_objs;                
     attr_impl->grp_ref.ops->get_base_impl = 
@@ -128,8 +131,8 @@
     }
     axis2_hash_set(attr_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_attribute_group_ref_free);
-    axis2_hash_set(attr_impl->methods, "type", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_attribute_group_ref_type);
+    axis2_hash_set(attr_impl->methods, "get_type", AXIS2_HASH_KEY_STRING,
+            axis2_xml_schema_attribute_group_ref_get_type);
     axis2_hash_set(attr_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_attribute_group_ref_super_objs);            
     
@@ -158,8 +161,9 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_xml_schema_attribute_group_ref_free(void *grp_ref,
-                            const axis2_env_t *env)
+axis2_xml_schema_attribute_group_ref_free(
+        void *grp_ref,
+        const axis2_env_t *env)
 {
     axis2_xml_schema_attribute_group_ref_impl_t *attr_impl = NULL;
 
@@ -205,8 +209,9 @@
 }
 
 axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_attribute_group_ref_get_base_impl(void *grp_ref,
-                                const axis2_env_t *env)
+axis2_xml_schema_attribute_group_ref_get_base_impl(
+        void *grp_ref,
+        const axis2_env_t *env)
 {
     axis2_xml_schema_attribute_group_ref_impl_t *attr_impl = NULL;
 
@@ -215,75 +220,35 @@
     return attr_impl->annotated;
 }
 
-/*
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_attribute_group_ref_resolve_methods(
-                                axis2_xml_schema_attribute_group_ref_t *grp_ref,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_attribute_group_ref_t *attr_impl,
-                                axis2_hash_t *methods)
-{
-    axis2_xml_schema_attribute_group_ref_impl_t *any_impl_l = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, attr_impl, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
-    
-    any_impl_l = (axis2_xml_schema_attribute_group_ref_impl_t *) attr_impl;
-    
-    grp_ref->ops = AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_xml_schema_attribute_group_ref_ops_t));
-    if(NULL != grp_ref->ops)
-    {
-        AXIS2_ERROR_SET(env->error, 
-            AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return AXIS2_FAILURE;
-    }            
-            
-    grp_ref->ops->free = axis2_hash_get(methods, "free", 
-            AXIS2_HASH_KEY_STRING);
-    grp_ref->ops->get_base_impl = 
-            any_impl_l->grp_ref.ops->get_base_impl;
-    grp_ref->ops->get_namespace = 
-            any_impl_l->grp_ref.ops->get_namespace;
-    grp_ref->ops->set_namespace = 
-            any_impl_l->grp_ref.ops->set_namespace;
-    grp_ref->ops->get_process_content = 
-            any_impl_l->grp_ref.ops->get_process_content;
-    grp_ref->ops->set_process_content = 
-            any_impl_l->grp_ref.ops->set_process_content;
-    
-    return axis2_xml_schema_annotated_resolve_methods(&(grp_ref->base), 
-            env, any_impl_l->annotated, methods);
-}
-*/
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_attribute_group_ref_type(void *grp_ref,
-                                    const axis2_env_t *env)
+axis2_xml_schema_attribute_group_ref_get_type(
+        void *grp_ref,
+        const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(grp_ref)->obj_type;    
 }                                    
 
 axis2_hash_t* AXIS2_CALL
-axis2_xml_schema_attribute_group_ref_super_objs(void *grp_ref,
-                                        const axis2_env_t *env)
+axis2_xml_schema_attribute_group_ref_super_objs(
+        void *grp_ref,
+        const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(grp_ref)->ht_super;
 }
 
 axis2_qname_t* AXIS2_CALL 
 axis2_xml_schema_attribute_group_ref_get_ref_qname(
-            void *grp_ref,
-            const axis2_env_t *env)
+        void *grp_ref,
+        const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(grp_ref)->ref_qname;
 }
 
 axis2_status_t AXIS2_CALL 
 axis2_xml_schema_attribute_group_ref_set_ref_qname(
-            void *grp_ref,
-            const axis2_env_t *env,
-            axis2_qname_t *ref_qname)
+        void *grp_ref,
+        const axis2_env_t *env,
+        axis2_qname_t *ref_qname)
 {
     axis2_xml_schema_attribute_group_ref_impl_t *attr_grp_impl = NULL;
     AXIS2_PARAM_CHECK(env->error, ref_qname, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c Wed Jun  7 05:03:26 2006
@@ -55,7 +55,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_content_type(
+axis2_xml_schema_complex_content_get_type(
         void *complex_content,
         const axis2_env_t *env);
 
@@ -132,8 +132,8 @@
             axis2_xml_schema_complex_content_free;
     complex_content_impl->complex_content.ops->get_base_impl = 
             axis2_xml_schema_complex_content_get_base_impl;
-    complex_content_impl->complex_content.ops->type = 
-            axis2_xml_schema_complex_content_type;
+    complex_content_impl->complex_content.ops->get_type = 
+            axis2_xml_schema_complex_content_get_type;
     complex_content_impl->complex_content.ops->super_objs = 
             axis2_xml_schema_complex_content_super_objs;
     complex_content_impl->complex_content.ops->set_content = 
@@ -160,8 +160,8 @@
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_get_content);
     axis2_hash_set(complex_content_impl->methods, "set_content", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_set_content);
-    axis2_hash_set(complex_content_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_type);
+    axis2_hash_set(complex_content_impl->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_get_type);
     axis2_hash_set(complex_content_impl->methods, "super_objs", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_complex_content_super_objs);
     axis2_hash_set(complex_content_impl->methods, "to_string", 
@@ -353,7 +353,7 @@
 }
                                            
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_content_type(
+axis2_xml_schema_complex_content_get_type(
         void *complex_content,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c Wed Jun  7 05:03:26 2006
@@ -59,7 +59,7 @@
         const axis2_env_t *env);
         
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_content_extension_type(
+axis2_xml_schema_complex_content_extension_get_type(
         void *cmp_cnt_ext,
         const axis2_env_t *env);
         
@@ -154,8 +154,8 @@
 
     cmp_cnt_ext_impl->cmp_cnt_ext.ops->free = 
             axis2_xml_schema_complex_content_extension_free;
-    cmp_cnt_ext_impl->cmp_cnt_ext.ops->type = 
-            axis2_xml_schema_complex_content_extension_type;            
+    cmp_cnt_ext_impl->cmp_cnt_ext.ops->get_type = 
+            axis2_xml_schema_complex_content_extension_get_type;            
     cmp_cnt_ext_impl->cmp_cnt_ext.ops->super_objs = 
             axis2_xml_schema_complex_content_extension_super_objs;            
     cmp_cnt_ext_impl->cmp_cnt_ext.ops->get_base_impl = 
@@ -189,8 +189,8 @@
     axis2_hash_set(cmp_cnt_ext_impl->methods,"free", AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_complex_content_extension_free);
 
-    axis2_hash_set(cmp_cnt_ext_impl->methods,"type", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_extension_type);            
+    axis2_hash_set(cmp_cnt_ext_impl->methods,"get_type", AXIS2_HASH_KEY_STRING,
+            axis2_xml_schema_complex_content_extension_get_type);            
     
     axis2_hash_set(cmp_cnt_ext_impl->methods,"super_objs", AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_complex_content_extension_super_objs);            
@@ -399,7 +399,7 @@
 } 
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_content_extension_type(
+axis2_xml_schema_complex_content_extension_get_type(
         void *cmp_cnt_ext,
         const axis2_env_t *env)
 {

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=412382&r1=412381&r2=412382&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 Wed Jun  7 05:03:26 2006
@@ -64,7 +64,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_type(
+axis2_xml_schema_complex_content_restriction_get_type(
         void *cmp_content_res,
         const axis2_env_t *env);
 
@@ -157,8 +157,8 @@
     cmp_content_res_impl->cmp_content_res.ops->free = 
             axis2_xml_schema_complex_content_restriction_free;
             
-    cmp_content_res_impl->cmp_content_res.ops->type = 
-            axis2_xml_schema_complex_content_restriction_type;
+    cmp_content_res_impl->cmp_content_res.ops->get_type = 
+            axis2_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;                        
@@ -203,8 +203,8 @@
     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,"type", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_complex_content_restriction_type);
+    axis2_hash_set(cmp_content_res_impl->methods,"get_type", AXIS2_HASH_KEY_STRING,
+            axis2_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);                        
@@ -439,7 +439,7 @@
 }        
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_content_restriction_type(
+axis2_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=412382&r1=412381&r2=412382&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 Wed Jun  7 05:03:26 2006
@@ -78,7 +78,7 @@
         const axis2_env_t *env);
         
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_type_type(
+axis2_xml_schema_complex_type_get_type(
         void *complex_type,
         const axis2_env_t *env);
         
@@ -268,8 +268,8 @@
     
     complex_type_impl->complex_type.ops->free = 
         axis2_xml_schema_complex_type_free;
-    complex_type_impl->complex_type.ops->type =
-        axis2_xml_schema_complex_type_type;
+    complex_type_impl->complex_type.ops->get_type =
+        axis2_xml_schema_complex_type_get_type;
     complex_type_impl->complex_type.ops->super_objs =
         axis2_xml_schema_complex_type_super_objs;            
     complex_type_impl->complex_type.ops->get_base_impl = 
@@ -326,8 +326,8 @@
     }
     axis2_hash_set(complex_type_impl->methods, "free", AXIS2_HASH_KEY_STRING,
         axis2_xml_schema_complex_type_free);
-  axis2_hash_set(complex_type_impl->methods, "type", AXIS2_HASH_KEY_STRING,
-        axis2_xml_schema_complex_type_type);
+  axis2_hash_set(complex_type_impl->methods, "get_type", AXIS2_HASH_KEY_STRING,
+        axis2_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);            
     axis2_hash_set(complex_type_impl->methods, "get_any_attribute", AXIS2_HASH_KEY_STRING,
@@ -658,7 +658,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_complex_type_type(
+axis2_xml_schema_complex_type_get_type(
         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=412382&r1=412381&r2=412382&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 Wed Jun  7 05:03:26 2006
@@ -54,7 +54,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_content_processing_type(
+axis2_xml_schema_content_processing_get_type(
         void *content_processing,
         const axis2_env_t *env);
 
@@ -105,8 +105,8 @@
             axis2_xml_schema_content_processing_free;
     content_processing_impl->content_processing.ops->super_objs = 
             axis2_xml_schema_content_processing_super_objs;
-    content_processing_impl->content_processing.ops->type = 
-            axis2_xml_schema_content_processing_type;
+    content_processing_impl->content_processing.ops->get_type = 
+            axis2_xml_schema_content_processing_get_type;
     content_processing_impl->content_processing.ops->get_base_impl = 
             axis2_xml_schema_content_processing_get_base_impl;
     content_processing_impl->content_processing.ops->get_values = 
@@ -143,8 +143,8 @@
             AXIS2_HASH_KEY_STRING, axis2_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_set(content_processing_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_content_processing_type);
+    axis2_hash_set(content_processing_impl->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING, axis2_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);
@@ -253,7 +253,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_content_processing_type(
+axis2_xml_schema_content_processing_get_type(
         void *content_processing,
         const axis2_env_t *env)
 {

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=412382&r1=412381&r2=412382&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 Wed Jun  7 05:03:26 2006
@@ -52,19 +52,12 @@
 axis2_xml_schema_content_type_get_base_impl(void *content_type,
                                 const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_content_type_resolve_methods(
-                                axis2_xml_schema_content_type_t *content_type,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_content_type_t *content_type_impl,
-                                axis2_hash_t *methods);
-
 axis2_array_list_t *AXIS2_CALL
 axis2_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_type(void *content_type,
+axis2_xml_schema_content_type_get_type(void *content_type,
                                    const axis2_env_t *env);
                                    
 axis2_hash_t* AXIS2_CALL
@@ -111,8 +104,8 @@
             axis2_xml_schema_content_type_get_base_impl;
     content_type_impl->content_type.ops->get_values = 
             axis2_xml_schema_content_type_get_values;
-    content_type_impl->content_type.ops->type =
-            axis2_xml_schema_content_type_type;
+    content_type_impl->content_type.ops->get_type =
+            axis2_xml_schema_content_type_get_type;
     content_type_impl->content_type.ops->super_objs =
             axis2_xml_schema_content_type_super_objs;                
                 
@@ -146,8 +139,8 @@
             axis2_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);
-    axis2_hash_set(content_type_impl->methods, "type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_content_type_type);
+    axis2_hash_set(content_type_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, 
+            axis2_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);                        
             
@@ -241,17 +234,11 @@
 axis2_xml_schema_content_type_get_values(void *content_type,
                                 const axis2_env_t *env)
 {
-/*    axis2_xml_schema_content_type_impl_t *schema_impl = NULL;
-    axis2_hash_t *super = NULL;
-    super = AXIS2_XML_SCHEMA_CONTENT_TYPE_SUPER_OBJS(content_type, env);
-    if(NULL != super)
-        schema_impl = axis2_hash_get(super,
-         "AXIS2_XML_SCHEMA_CONTENT_TYPE", AXIS2_HASH_KEY_STRING); */
     return AXIS2_INTF_TO_IMPL(content_type)->members;
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_content_type_type(void *content_type,
+axis2_xml_schema_content_type_get_type(void *content_type,
                                    const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(content_type)->obj_type;

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=412382&r1=412381&r2=412382&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 Wed Jun  7 05:03:26 2006
@@ -105,34 +105,6 @@
     return AXIS2_SUCCESS;
 }
 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_data_type_resolve_methods(
-                                    axis2_xml_schema_data_type_t *data_type,
-                                    const axis2_env_t *env,
-                                    axis2_xml_schema_data_type_t *data_type_impl,
-                                    axis2_hash_t *methods)
-{    
-    axis2_xml_schema_data_type_impl_t *data_type_impl_l = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, data_type_impl, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
-    
-    data_type_impl_l = (axis2_xml_schema_data_type_impl_t *) data_type_impl;
-    
-    data_type->ops = AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_xml_schema_data_type_ops_t));
-    data_type->ops->free = axis2_hash_get(methods, "free", 
-            AXIS2_HASH_KEY_STRING);
-    data_type->ops->parse_value = axis2_hash_get(methods, "parse_value", 
-            AXIS2_HASH_KEY_STRING);
-    data_type->ops->value_type = axis2_hash_get(methods, "value_type", 
-            AXIS2_HASH_KEY_STRING);
-    data_type->ops->tokenized_type = axis2_hash_get(methods, "tokenized_type", 
-            AXIS2_HASH_KEY_STRING);
-    return AXIS2_SUCCESS;    
-
-}
 void * AXIS2_CALL
 axis2_xml_schema_data_type_parse_value(void *data_type,
                         const axis2_env_t *env,
@@ -167,4 +139,3 @@
     data_type_impl = AXIS2_INTF_TO_IMPL(data_type);
     return NULL;
 }
-

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c Wed Jun  7 05:03:26 2006
@@ -49,7 +49,7 @@
                                               const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_derivation_method_type(void *derivation_method,
+axis2_xml_schema_derivation_method_get_type(void *derivation_method,
                                         const axis2_env_t *env); 
 
 axis2_status_t AXIS2_CALL 
@@ -108,8 +108,8 @@
             axis2_xml_schema_derivation_method_get_values;
     derivation_method_impl->derivation_method.ops->super_objs = 
             axis2_xml_schema_derivation_method_super_objs;
-    derivation_method_impl->derivation_method.ops->type =
-            axis2_xml_schema_derivation_method_type;
+    derivation_method_impl->derivation_method.ops->get_type =
+            axis2_xml_schema_derivation_method_get_type;
                                     
     derivation_method_impl->members = axis2_array_list_create(env, 0);
     
@@ -162,8 +162,8 @@
     axis2_hash_set(derivation_method_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_derivation_method_super_objs);
             
-    axis2_hash_set(derivation_method_impl->methods, "type", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_derivation_method_type);
+    axis2_hash_set(derivation_method_impl->methods, "get_type", AXIS2_HASH_KEY_STRING,
+            axis2_xml_schema_derivation_method_get_type);
     
     derivation_method_impl->schema_enum = 
         axis2_xml_schema_enum_create(env, value);
@@ -257,18 +257,6 @@
 axis2_xml_schema_derivation_method_get_values(void *derivation_method,
                                         const axis2_env_t *env)
 {
-/*
-    axis2_xml_schema_derivation_method_impl_t *deri_impl = NULL;
-    axis2_hash_t *ht_super = NULL;
-    ht_super = AXIS2_XML_SCHEMA_DERIVATION_METHOD_SUPER_OBJS(derivation_method, env);
-    if(NULL != ht_super)
-    {
-        deri_impl = (axis2_xml_schema_derivation_method_impl_t*)
-            axis2_hash_get(ht_super, "AXIS2_XML_SCHEMA_DERIVATION_METHOD", AXIS2_HASH_KEY_STRING);
-        if(NULL != deri_impl)
-            return deri_impl->members;            
-    }
-*/    
     return AXIS2_INTF_TO_IMPL(derivation_method)->members;
 }
 
@@ -280,7 +268,7 @@
 }                                              
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_derivation_method_type(void *derivation_method,
+axis2_xml_schema_derivation_method_get_type(void *derivation_method,
                                         const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(derivation_method)->type;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c Wed Jun  7 05:03:26 2006
@@ -22,8 +22,6 @@
                 axis2_xml_schema_documentation_impl_t;
 
 /** 
- * @brief Other Extension Struct Impl
- *   Axis2 Other Extension  
  */ 
 struct axis2_xml_schema_documentation_impl
 {
@@ -58,7 +56,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_documentation_type(
+axis2_xml_schema_documentation_get_type(
         void *documentation,
         const axis2_env_t *env);
 
@@ -137,8 +135,8 @@
     documentation_impl->documentation.ops->super_objs = 
         axis2_xml_schema_documentation_super_objs;
     
-    documentation_impl->documentation.ops->type = 
-        axis2_xml_schema_documentation_type;
+    documentation_impl->documentation.ops->get_type = 
+        axis2_xml_schema_documentation_get_type;
     
     documentation_impl->documentation.ops->get_base_impl = 
         axis2_xml_schema_documentation_get_base_impl;
@@ -175,8 +173,8 @@
     axis2_hash_set(documentation_impl->methods, "super_objs", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_documentation_super_objs);
     
-    axis2_hash_set(documentation_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_documentation_type);
+    axis2_hash_set(documentation_impl->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING, axis2_xml_schema_documentation_get_type);
     
     axis2_hash_set(documentation_impl->methods, "get_source", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_documentation_get_source);
@@ -278,7 +276,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_documentation_type(
+axis2_xml_schema_documentation_get_type(
         void *documentation,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c Wed Jun  7 05:03:26 2006
@@ -125,7 +125,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_element_type(
+axis2_xml_schema_element_get_type(
         void *element,
         const axis2_env_t *env);
                             
@@ -367,8 +367,8 @@
             axis2_xml_schema_element_get_base_impl;
     element_impl->element.ops->super_objs =
             axis2_xml_schema_element_super_objs;
-    element_impl->element.ops->type =
-            axis2_xml_schema_element_type;
+    element_impl->element.ops->get_type =
+            axis2_xml_schema_element_get_type;
                         
     element_impl->element.ops->get_constraints = 
             axis2_xml_schema_element_get_constraints;
@@ -443,8 +443,8 @@
             axis2_xml_schema_element_free);
     axis2_hash_set(element_impl->methods, "get_constraints", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_element_get_constraints);
-    axis2_hash_set(element_impl->methods, "type", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_element_type);
+    axis2_hash_set(element_impl->methods, "get_type", AXIS2_HASH_KEY_STRING,
+            axis2_xml_schema_element_get_type);
     axis2_hash_set(element_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_element_super_objs);            
     axis2_hash_set(element_impl->methods, "get_default_value", AXIS2_HASH_KEY_STRING, 
@@ -996,7 +996,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_element_type(
+axis2_xml_schema_element_get_type(
 		void *element,
 		const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c Wed Jun  7 05:03:26 2006
@@ -52,7 +52,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_enum_type(
+axis2_xml_schema_enum_get_type(
         void *schema_enum,
         const axis2_env_t *env);
 
@@ -118,8 +118,8 @@
     schema_enum_impl->schema_enum.ops->super_objs = 
             axis2_xml_schema_enum_super_objs;
 
-    schema_enum_impl->schema_enum.ops->type = 
-            axis2_xml_schema_enum_type;
+    schema_enum_impl->schema_enum.ops->get_type = 
+            axis2_xml_schema_enum_get_type;
             
     schema_enum_impl->schema_enum.ops->get_value = 
             axis2_xml_schema_enum_get_value;
@@ -203,7 +203,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_enum_type(
+axis2_xml_schema_enum_get_type(
         void *schema_enum,
         const axis2_env_t *env)
 {
@@ -242,7 +242,7 @@
     
     schema_enum->ops->super_objs = axis2_hash_get(methods, "super_objs", 
             AXIS2_HASH_KEY_STRING);
-    schema_enum->ops->type = axis2_hash_get(methods, "type", 
+    schema_enum->ops->get_type = axis2_hash_get(methods, "get_type", 
             AXIS2_HASH_KEY_STRING);
     
     schema_enum->ops->get_value = 

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c Wed Jun  7 05:03:26 2006
@@ -18,8 +18,7 @@
 #include <xml_schema/axis2_xml_schema.h>
 
 /** 
- * @brief Other Extension Struct Impl
- *   Axis2 Other Extension  
+ * @brief axis2_xml_schema_external_impl
  */ 
 typedef struct axis2_xml_schema_external_impl
 {
@@ -57,7 +56,7 @@
                                         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_external_type(void *external,
+axis2_xml_schema_external_get_type(void *external,
                                 const axis2_env_t *env);
 
 
@@ -118,8 +117,8 @@
         axis2_xml_schema_external_free;
     external_impl->external.ops->get_base_impl = 
         axis2_xml_schema_external_get_base_impl;
-    external_impl->external.ops->type =    
-        axis2_xml_schema_external_type;
+    external_impl->external.ops->get_type =    
+        axis2_xml_schema_external_get_type;
     external_impl->external.ops->super_objs =
         axis2_xml_schema_external_super_objs;        
     external_impl->external.ops->get_schema = 
@@ -141,24 +140,37 @@
         return NULL;
     }
 
-    axis2_hash_set(external_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
+    axis2_hash_set(external_impl->methods, "free", 
+            AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_external_free);
-    axis2_hash_set(external_impl->methods, "type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_external_type);
-    axis2_hash_set(external_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, 
+    
+    axis2_hash_set(external_impl->methods, "get_type",
+            AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_external_get_type);
+    
+    axis2_hash_set(external_impl->methods, "super_objs", 
+            AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_external_super_objs);
-    axis2_hash_set(external_impl->methods, "get_schema_location", AXIS2_HASH_KEY_STRING, 
+            
+    axis2_hash_set(external_impl->methods, "get_schema_location",
+            AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_external_get_schema_location);
-    axis2_hash_set(external_impl->methods, "set_schema_location", AXIS2_HASH_KEY_STRING, 
+            
+    axis2_hash_set(external_impl->methods, "set_schema_location", 
+            AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_external_set_schema_location);
+            
     axis2_hash_set(external_impl->methods, "get_schema", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_external_get_schema);
+            AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_external_get_schema);
+            
     axis2_hash_set(external_impl->methods, "set_schema", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_external_set_schema);
-
+            AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_external_set_schema);
 
     external_impl->annotated = axis2_xml_schema_annotated_create(env);
-     if(!external_impl->annotated)
+
+    if(!external_impl->annotated)
     {
         axis2_xml_schema_external_free(&(external_impl->external), env);
         return NULL;
@@ -263,7 +275,7 @@
             AXIS2_HASH_KEY_STRING);
     external->ops->super_objs = axis2_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
-    external->ops->type = axis2_hash_get(methods, "type",
+    external->ops->get_type = axis2_hash_get(methods, "type",
             AXIS2_HASH_KEY_STRING);
                                    
     external->ops->set_schema = 
@@ -333,7 +345,7 @@
 }                                        
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_external_type(void *external,
+axis2_xml_schema_external_get_type(void *external,
                                 const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(external)->obj_type;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c Wed Jun  7 05:03:26 2006
@@ -21,12 +21,6 @@
 typedef struct axis2_xml_schema_facet_impl 
                 axis2_xml_schema_facet_impl_t;
                 
-               
-
-/** 
- * @brief Other Extension Struct Impl
- *   Axis2 Other Extension  
- */ 
 struct axis2_xml_schema_facet_impl
 {
     axis2_xml_schema_facet_t facet;
@@ -88,7 +82,7 @@
         int facet_type);
             
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_facet_type(
+axis2_xml_schema_facet_get_type(
         void *facet,
         const axis2_env_t *env);
                                                                                
@@ -144,8 +138,8 @@
         axis2_xml_schema_facet_get_value;
     facet_impl->facet.ops->set_value = 
         axis2_xml_schema_facet_set_value;
-    facet_impl->facet.ops->type = 
-        axis2_xml_schema_facet_type; 
+    facet_impl->facet.ops->get_type = 
+        axis2_xml_schema_facet_get_type; 
     facet_impl->facet.ops->set_facet_type =
         axis2_xml_schema_facet_set_facet_type;
     facet_impl->facet.ops->super_objs =
@@ -169,8 +163,8 @@
     axis2_hash_set(facet_impl->methods, "set_value", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_facet_set_value);
 
-    axis2_hash_set(facet_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_facet_type);
+    axis2_hash_set(facet_impl->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING, axis2_xml_schema_facet_get_type);
     axis2_hash_set(facet_impl->methods, "super_objs",
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_facet_super_objs);
             
@@ -394,7 +388,7 @@
 }                                      
                                       
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_facet_type(void *facet,
+axis2_xml_schema_facet_get_type(void *facet,
                                       const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(facet)->obj_type;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c Wed Jun  7 05:03:26 2006
@@ -38,7 +38,8 @@
     axis2_array_list_t *members;
 };
 
-#define AXIS2_INTF_TO_IMPL(form) ((axis2_xml_schema_form_impl_t *) form)
+#define AXIS2_INTF_TO_IMPL(form) \
+        ((axis2_xml_schema_form_impl_t *) form)
 
 axis2_status_t AXIS2_CALL 
 axis2_xml_schema_form_free(
@@ -51,7 +52,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_form_type(
+axis2_xml_schema_form_get_type(
         void *form,
         const axis2_env_t *env);
 
@@ -109,8 +110,8 @@
     form_impl->form.ops->super_objs = 
         axis2_xml_schema_form_super_objs;
         
-    form_impl->form.ops->type = 
-        axis2_xml_schema_form_type;
+    form_impl->form.ops->get_type = 
+        axis2_xml_schema_form_get_type;
         
     form_impl->form.ops->get_base_impl = 
         axis2_xml_schema_form_get_base_impl;
@@ -149,8 +150,8 @@
     axis2_hash_set(form_impl->methods, "super_objs", 
         AXIS2_HASH_KEY_STRING, axis2_xml_schema_form_super_objs);
         
-    axis2_hash_set(form_impl->methods, "type", 
-        AXIS2_HASH_KEY_STRING, axis2_xml_schema_form_type);
+    axis2_hash_set(form_impl->methods, "get_type", 
+        AXIS2_HASH_KEY_STRING, axis2_xml_schema_form_get_type);
         
     axis2_hash_set(form_impl->methods, "get_values", 
         AXIS2_HASH_KEY_STRING, axis2_xml_schema_form_get_values);
@@ -264,7 +265,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_form_type(void *form,
+axis2_xml_schema_form_get_type(void *form,
                                 const axis2_env_t *env)
 {
     axis2_xml_schema_form_impl_t *form_impl = NULL;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c Wed Jun  7 05:03:26 2006
@@ -18,11 +18,11 @@
 #include <xml_schema/axis2_xml_schema_group_base.h>
 #include <axis2_utils.h>
 
-typedef struct axis2_xml_schema_group_impl axis2_xml_schema_group_impl_t;
+typedef struct axis2_xml_schema_group_impl 
+                axis2_xml_schema_group_impl_t;
 
 /** 
- * @brief Other Extension Struct Impl
- *   Axis2 Other Extension  
+ * @brief axis2_xml_schema_group_impl
  */ 
 struct axis2_xml_schema_group_impl
 {
@@ -48,7 +48,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_group_type(
+axis2_xml_schema_group_get_type(
         void *group,
         const axis2_env_t *env);
 
@@ -111,8 +111,8 @@
             axis2_xml_schema_group_free;
     group_impl->group.ops->super_objs = 
             axis2_xml_schema_group_super_objs;
-    group_impl->group.ops->type = 
-            axis2_xml_schema_group_type;
+    group_impl->group.ops->get_type = 
+            axis2_xml_schema_group_get_type;
     group_impl->group.ops->get_base_impl = 
             axis2_xml_schema_group_get_base_impl;
     group_impl->group.ops->get_name = 
@@ -135,8 +135,8 @@
             axis2_xml_schema_group_free);
     axis2_hash_set(group_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_group_super_objs);
-    axis2_hash_set(group_impl->methods, "type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_group_type);
+    axis2_hash_set(group_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_group_get_type);
     axis2_hash_set(group_impl->methods, "get_name", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_group_get_name);
     axis2_hash_set(group_impl->methods, "set_name", 
@@ -239,7 +239,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_group_type(void *group,
+axis2_xml_schema_group_get_type(void *group,
                                 const axis2_env_t *env)
 {
     axis2_xml_schema_group_impl_t *group_impl = NULL;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c Wed Jun  7 05:03:26 2006
@@ -54,7 +54,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_group_base_type(
+axis2_xml_schema_group_base_get_type(
         void *group_base,
         const axis2_env_t *env);
 
@@ -112,8 +112,8 @@
     group_base_impl->group_base.ops->super_objs = 
         axis2_xml_schema_group_base_super_objs;
     
-    group_base_impl->group_base.ops->type = 
-        axis2_xml_schema_group_base_type;
+    group_base_impl->group_base.ops->get_type = 
+        axis2_xml_schema_group_base_get_type;
     
     group_base_impl->group_base.ops->get_base_impl = 
         axis2_xml_schema_group_base_get_base_impl;
@@ -131,15 +131,24 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    axis2_hash_set(group_base_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
+    axis2_hash_set(group_base_impl->methods, "free", 
+            AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_group_base_free);
-    axis2_hash_set(group_base_impl->methods, "type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_group_base_type);
-    axis2_hash_set(group_base_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, 
+            
+    axis2_hash_set(group_base_impl->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_group_base_get_type);
+            
+    axis2_hash_set(group_base_impl->methods, "super_objs", 
+            AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_group_base_super_objs);
-    axis2_hash_set(group_base_impl->methods, "get_items", AXIS2_HASH_KEY_STRING, 
+            
+    axis2_hash_set(group_base_impl->methods, "get_items", 
+            AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_group_base_get_items);
-    axis2_hash_set(group_base_impl->methods, "to_string", AXIS2_HASH_KEY_STRING,
+            
+    axis2_hash_set(group_base_impl->methods, "to_string", 
+            AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_group_base_to_string);            
     
     group_base_impl->particle = axis2_xml_schema_particle_create(env);
@@ -273,7 +282,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_group_base_type(
+axis2_xml_schema_group_base_get_type(
         void *group_base,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_group_ref_type(
+axis2_xml_schema_group_ref_get_type(
         void *group_ref,
         const axis2_env_t *env);
 
@@ -126,8 +126,8 @@
             axis2_xml_schema_group_ref_free;
     group_ref_impl->group_ref.ops->super_objs = 
             axis2_xml_schema_group_ref_super_objs;
-    group_ref_impl->group_ref.ops->type = 
-            axis2_xml_schema_group_ref_type;
+    group_ref_impl->group_ref.ops->get_type = 
+            axis2_xml_schema_group_ref_get_type;
     
     group_ref_impl->group_ref.ops->get_base_impl = 
             axis2_xml_schema_group_ref_get_base_impl;
@@ -155,8 +155,8 @@
             axis2_xml_schema_group_ref_free);
     axis2_hash_set(group_ref_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_group_ref_super_objs);
-    axis2_hash_set(group_ref_impl->methods, "type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_group_ref_type);
+    axis2_hash_set(group_ref_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_group_ref_get_type);
     axis2_hash_set(group_ref_impl->methods, "get_ref_qname", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_group_ref_get_ref_qname);
     axis2_hash_set(group_ref_impl->methods, "set_ref_qname", 
@@ -265,7 +265,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_group_ref_type(
+axis2_xml_schema_group_ref_get_type(
         void *group_ref,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c Wed Jun  7 05:03:26 2006
@@ -54,7 +54,7 @@
                                         
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_identity_constraint_type(void *id_constr,
+axis2_xml_schema_identity_constraint_get_type(void *id_constr,
                                         const axis2_env_t *env);
                                         
 
@@ -134,8 +134,8 @@
             axis2_xml_schema_identity_constraint_get_refer;
     id_cns_impl->id_constr.ops->set_refer = 
             axis2_xml_schema_identity_constraint_set_refer;
-    id_cns_impl->id_constr.ops->type = 
-            axis2_xml_schema_identity_constraint_type;
+    id_cns_impl->id_constr.ops->get_type = 
+            axis2_xml_schema_identity_constraint_get_type;
     id_cns_impl->id_constr.ops->super_objs = 
             axis2_xml_schema_identity_constraint_super_objs;
     id_cns_impl->id_constr.ops->get_fields = 
@@ -162,8 +162,8 @@
             axis2_xml_schema_identity_constraint_free);
     axis2_hash_set(id_cns_impl->methods, "get_fields", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_identity_constraint_get_fields);
-    axis2_hash_set(id_cns_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_identity_constraint_type);
+    axis2_hash_set(id_cns_impl->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING, axis2_xml_schema_identity_constraint_get_type);
     axis2_hash_set(id_cns_impl->methods, "super_objs", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_identity_constraint_super_objs);
     axis2_hash_set(id_cns_impl->methods, "get_refer", 
@@ -416,7 +416,7 @@
 
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_identity_constraint_type(void *id_constr,
+axis2_xml_schema_identity_constraint_get_type(void *id_constr,
                                         const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(id_constr)->obj_type;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c Wed Jun  7 05:03:26 2006
@@ -18,8 +18,7 @@
 #include  <xml_schema/axis2_xml_schema.h>
 #include <axis2_utils.h>
 /** 
- * @brief Other Extension Struct Impl
- *   Axis2 Other Extension  
+ * @brief axis2_xml_schema_import_impl
  */ 
 typedef struct axis2_xml_schema_import_impl
 {
@@ -51,7 +50,7 @@
                                         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_import_type(void *import,
+axis2_xml_schema_import_get_type(void *import,
                             const axis2_env_t *env);
                             
 axis2_hash_t *AXIS2_CALL
@@ -104,8 +103,8 @@
         axis2_xml_schema_import_free;
     import_impl->import.ops->get_base_impl = 
         axis2_xml_schema_import_get_base_impl;
-    import_impl->import.ops->type =
-        axis2_xml_schema_import_type;
+    import_impl->import.ops->get_type =
+        axis2_xml_schema_import_get_type;
     import_impl->import.ops->super_objs =
         axis2_xml_schema_import_super_objs;        
     import_impl->import.ops->get_namespace = 
@@ -124,8 +123,8 @@
 
     axis2_hash_set(import_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_import_free);
-    axis2_hash_set(import_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_import_type);
+    axis2_hash_set(import_impl->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING, axis2_xml_schema_import_get_type);
     axis2_hash_set(import_impl->methods, "super_objs", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_import_super_objs);
     axis2_hash_set(import_impl->methods, "get_namespace", 
@@ -214,39 +213,6 @@
     return import_impl->external;
 }
 
-/*
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_import_resolve_methods(
-                                axis2_xml_schema_import_t *import,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_import_t *import_impl,
-                                axis2_hash_t *methods)
-{
-    axis2_xml_schema_import_impl_t *import_impl_l = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, import_impl, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
-    
-    import_impl_l = (axis2_xml_schema_import_impl_t *) import_impl;
-    
-    import->ops = AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_xml_schema_import_ops_t));
-            
-    import->ops->free = axis2_hash_get(methods, "free", 
-            AXIS2_HASH_KEY_STRING);
-            
-    import->ops->get_base_impl = 
-        import_impl_l->import.ops->get_base_impl;
-    import->ops->set_namespace = 
-        import_impl_l->import.ops->set_namespace;
-    import->ops->get_namespace = 
-        import_impl_l->import.ops->get_namespace;
-        
-    return axis2_xml_schema_external_resolve_methods(&(import->base), 
-            env, import_impl_l->external, methods);
-}
-*/
 axis2_char_t * AXIS2_CALL
 axis2_xml_schema_import_get_namespace(void *import,
                                             const axis2_env_t *env)
@@ -273,7 +239,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_import_type(void *import,
+axis2_xml_schema_import_get_type(void *import,
                             const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(import)->obj_type;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_obj_type(
+axis2_xml_schema_obj_get_type(
         void *obj,
         const axis2_env_t *env);
 
@@ -137,8 +137,8 @@
         axis2_xml_schema_obj_free;
     obj_impl->obj.ops->super_objs = 
         axis2_xml_schema_obj_super_objs;
-    obj_impl->obj.ops->type = 
-        axis2_xml_schema_obj_type;
+    obj_impl->obj.ops->get_type = 
+        axis2_xml_schema_obj_get_type;
     obj_impl->obj.ops->get_line_num = 
         axis2_xml_schema_obj_get_line_num;
     obj_impl->obj.ops->set_line_num = 
@@ -211,7 +211,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_obj_type(
+axis2_xml_schema_obj_get_type(
         void *obj,
         const axis2_env_t *env)
 {
@@ -249,7 +249,7 @@
     obj->ops->super_objs = axis2_hash_get(methods, "super_objs", 
             AXIS2_HASH_KEY_STRING);
             
-    obj->ops->type = axis2_hash_get(methods, "type", 
+    obj->ops->get_type = axis2_hash_get(methods, "get_type", 
             AXIS2_HASH_KEY_STRING);
 
     obj->ops->get_line_num = 

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c Wed Jun  7 05:03:26 2006
@@ -62,7 +62,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_particle_type(
+axis2_xml_schema_particle_get_type(
         void *particle,
         const axis2_env_t *env);
 
@@ -131,8 +131,8 @@
     particle_impl->particle.ops->super_objs = 
             axis2_xml_schema_particle_super_objs;
     
-    particle_impl->particle.ops->type = 
-            axis2_xml_schema_particle_type;
+    particle_impl->particle.ops->get_type = 
+            axis2_xml_schema_particle_get_type;
     
     particle_impl->particle.ops->get_base_impl = 
             axis2_xml_schema_particle_get_base_impl;
@@ -160,8 +160,8 @@
             axis2_xml_schema_particle_free);
     axis2_hash_set(particle_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_particle_super_objs);
-    axis2_hash_set(particle_impl->methods, "type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_particle_type);
+    axis2_hash_set(particle_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_particle_get_type);
     axis2_hash_set(particle_impl->methods, "get_max_occurs", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_particle_get_max_occurs);
     axis2_hash_set(particle_impl->methods, "set_max_occurs", 
@@ -257,7 +257,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_particle_type(void *particle,
+axis2_xml_schema_particle_get_type(void *particle,
                                 const axis2_env_t *env)
 {
     axis2_xml_schema_particle_impl_t *particle_impl = NULL;
@@ -303,7 +303,7 @@
             AXIS2_HASH_KEY_STRING);
     particle->ops->super_objs = axis2_hash_get(methods, "super_objs", 
             AXIS2_HASH_KEY_STRING);
-    particle->ops->type = axis2_hash_get(methods, "type", 
+    particle->ops->get_type = axis2_hash_get(methods, "get_type", 
             AXIS2_HASH_KEY_STRING);
 
     particle->ops->get_max_occurs = axis2_hash_get(methods, "get_max_occurs", 

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c Wed Jun  7 05:03:26 2006
@@ -18,8 +18,7 @@
 #include  <xml_schema/axis2_xml_schema.h>
 
 /** 
- * @brief Other Extension Struct Impl
- *   Axis2 Other Extension  
+ * @brief axis2_xml_schema_redefine_impl
  */ 
 typedef struct axis2_xml_schema_redefine_impl
 {
@@ -57,7 +56,7 @@
                                         const axis2_env_t *env);
                                         
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_redefine_type(void *redefine,
+axis2_xml_schema_redefine_get_type(void *redefine,
                                 const axis2_env_t *env);
 
 axis2_hash_t *AXIS2_CALL
@@ -129,8 +128,8 @@
         axis2_xml_schema_redefine_free;
     redefine_impl->redefine.ops->get_base_impl = 
         axis2_xml_schema_redefine_get_base_impl;
-    redefine_impl->redefine.ops->type =
-        axis2_xml_schema_redefine_type;
+    redefine_impl->redefine.ops->get_type =
+        axis2_xml_schema_redefine_get_type;
     redefine_impl->redefine.ops->super_objs =
         axis2_xml_schema_redefine_super_objs;
     redefine_impl->redefine.ops->get_items = 
@@ -155,8 +154,8 @@
 
     axis2_hash_set(redefine_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_redefine_free);
-    axis2_hash_set(redefine_impl->methods, "type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_redefine_type);
+    axis2_hash_set(redefine_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_redefine_get_type);
     axis2_hash_set(redefine_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_redefine_super_objs);
     axis2_hash_set(redefine_impl->methods, "get_items", 
@@ -330,7 +329,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_redefine_type(void *redefine,
+axis2_xml_schema_redefine_get_type(void *redefine,
                                 const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(redefine)->obj_type;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c Wed Jun  7 05:03:26 2006
@@ -55,7 +55,7 @@
                                             const axis2_env_t *env);
                                             
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_content_type(void *sim_content,
+axis2_xml_schema_simple_content_get_type(void *sim_content,
                                             const axis2_env_t *env);
                                             
 axis2_hash_t* AXIS2_CALL
@@ -108,8 +108,8 @@
 
     sim_cnt_impl->sim_content.ops->free = 
             axis2_xml_schema_simple_content_free;
-    sim_cnt_impl->sim_content.ops->type = 
-            axis2_xml_schema_simple_content_type;
+    sim_cnt_impl->sim_content.ops->get_type = 
+            axis2_xml_schema_simple_content_get_type;
     sim_cnt_impl->sim_content.ops->super_objs = 
             axis2_xml_schema_simple_content_super_objs;
     sim_cnt_impl->sim_content.ops->get_base_impl = 
@@ -131,8 +131,8 @@
     }
     axis2_hash_set(sim_cnt_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_simple_content_free);
-    axis2_hash_set(sim_cnt_impl->methods, "type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_simple_content_type);            
+    axis2_hash_set(sim_cnt_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_simple_content_get_type);            
     axis2_hash_set(sim_cnt_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_simple_content_super_objs);            
     axis2_hash_set(sim_cnt_impl->methods, "get_content", 
@@ -227,48 +227,6 @@
     return sim_cnt_impl->annotated;
 }
 
-/*
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_resolve_methods(
-                                axis2_xml_schema_simple_content_t *sim_content,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_simple_content_t *sim_cnt_impl,
-                                axis2_hash_t *methods)
-{
-    axis2_xml_schema_simple_content_impl_t *group_impl_l = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, sim_cnt_impl, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, methods, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, sim_content, AXIS2_FAILURE);
-    
-    group_impl_l = (axis2_xml_schema_simple_content_impl_t *) sim_cnt_impl;
-    
-    sim_content->ops = AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_xml_schema_simple_content_ops_t));
-    if(!sim_content->ops)
-    {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-        return AXIS2_FAILURE;
-    }
-    sim_content->ops->free = axis2_hash_get(methods, "free", 
-            AXIS2_HASH_KEY_STRING);
-    sim_content->ops->get_base_impl = 
-            group_impl_l->sim_content.ops->get_base_impl;
-    sim_content->ops->get_content = 
-            group_impl_l->sim_content.ops->get_content;
-    sim_content->ops->set_content = 
-            group_impl_l->sim_content.ops->set_content;
-    sim_content->ops->to_string = 
-            group_impl_l->sim_content.ops->to_string;
-    
-    return axis2_xml_schema_annotated_resolve_methods(&(sim_content->base), 
-            env, group_impl_l->annotated, methods);
-}
-*/
-
-
 void* AXIS2_CALL
 axis2_xml_schema_simple_content_get_content(void *sim_content,
                                 const axis2_env_t *env)
@@ -317,7 +275,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_content_type(void *sim_content,
+axis2_xml_schema_simple_content_get_type(void *sim_content,
                                             const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(sim_content)->obj_type;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c Wed Jun  7 05:03:26 2006
@@ -21,8 +21,7 @@
                     axis2_xml_schema_simple_content_extension_impl_t;
 
 /** 
- * @brief Other Extension Struct Impl
- *   Axis2 Other Extension  
+ * @brief axis2_xml_schema_simple_content_extension_impl
  */ 
 struct axis2_xml_schema_simple_content_extension_impl
 {
@@ -58,7 +57,7 @@
         const axis2_env_t *env);
         
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_content_extension_type(
+axis2_xml_schema_simple_content_extension_get_type(
         void *sim_content_ext,
         const axis2_env_t *env);
         
@@ -141,8 +140,8 @@
             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->type = 
-            axis2_xml_schema_simple_content_extension_type;            
+    sim_content_ext_impl->sim_content_ext.ops->get_type = 
+            axis2_xml_schema_simple_content_extension_get_type;            
     sim_content_ext_impl->sim_content_ext.ops->super_objs = 
             axis2_xml_schema_simple_content_extension_super_objs;            
             
@@ -168,8 +167,8 @@
     
     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, "type", AXIS2_HASH_KEY_STRING,
-            axis2_xml_schema_simple_content_extension_type);            
+     axis2_hash_set(sim_content_ext_impl->methods, "get_type", AXIS2_HASH_KEY_STRING,
+            axis2_xml_schema_simple_content_extension_get_type);            
       axis2_hash_set(sim_content_ext_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_simple_content_extension_super_objs);            
             
@@ -342,7 +341,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_content_extension_type(
+axis2_xml_schema_simple_content_extension_get_type(
         void *sim_content_ext,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c Wed Jun  7 05:03:26 2006
@@ -61,7 +61,7 @@
         const axis2_env_t *env);
         
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_simple_content_restriction_type(
+axis2_xml_schema_simple_content_restriction_get_type(
         void *sim_content_res,
         const axis2_env_t *env);
 
@@ -71,7 +71,7 @@
         const axis2_env_t *env);        
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_type(
+axis2_xml_schema_simple_content_restriction_get_type(
         void *sim_content_res,
         const axis2_env_t *env);
         
@@ -173,8 +173,8 @@
     sim_content_res_impl->sim_content_res.ops->free = 
             axis2_xml_schema_simple_content_restriction_free;
             
-    sim_content_res_impl->sim_content_res.ops->type = 
-            axis2_xml_schema_simple_content_restriction_type;
+    sim_content_res_impl->sim_content_res.ops->get_type = 
+            axis2_xml_schema_simple_content_restriction_get_type;
     
     sim_content_res_impl->sim_content_res.ops->super_objs = 
             axis2_xml_schema_simple_content_restriction_super_objs;
@@ -217,18 +217,22 @@
     axis2_hash_set(sim_content_res_impl->methods, "free", AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_simple_content_restriction_free);;
             
-    axis2_hash_set(sim_content_res_impl->methods, "type", AXIS2_HASH_KEY_STRING,                             axis2_xml_schema_simple_content_restriction_type);
+    axis2_hash_set(sim_content_res_impl->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING,                                                                  axis2_xml_schema_simple_content_restriction_get_type);
     
-    axis2_hash_set(sim_content_res_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING,
+    axis2_hash_set(sim_content_res_impl->methods, "super_objs", 
+            AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_simple_content_restriction_super_objs);
                                 
-    axis2_hash_set(sim_content_res_impl->methods, "get_any_attribute", AXIS2_HASH_KEY_STRING,
+    axis2_hash_set(sim_content_res_impl->methods, "get_any_attribute",                              AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_simple_content_restriction_get_any_attribute);
             
-    axis2_hash_set(sim_content_res_impl->methods, "set_any_attribute", AXIS2_HASH_KEY_STRING,
+    axis2_hash_set(sim_content_res_impl->methods, "set_any_attribute",
+            AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_simple_content_restriction_set_any_attribute);
             
-    axis2_hash_set(sim_content_res_impl->methods, "get_attribute", AXIS2_HASH_KEY_STRING,
+    axis2_hash_set(sim_content_res_impl->methods, "get_attribute", 
+            AXIS2_HASH_KEY_STRING,
             axis2_xml_schema_simple_content_restriction_get_attributes);
             
     axis2_hash_set(sim_content_res_impl->methods, "get_base_type_name", AXIS2_HASH_KEY_STRING,
@@ -451,7 +455,7 @@
 }       
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_simple_content_restriction_type(
+axis2_xml_schema_simple_content_restriction_get_type(
         void *sim_content_res,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c Wed Jun  7 05:03:26 2006
@@ -26,8 +26,7 @@
                 axis2_xml_schema_simple_type_impl_t;
 
 /** 
- * @brief Other Extension Struct Impl
- *   Axis2 Other Extension  
+ * @brief axis2_xml_schema_simple_type_impl
  */ 
 struct axis2_xml_schema_simple_type_impl
 {
@@ -61,7 +60,7 @@
                                         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_type(void *simple_type,
+axis2_xml_schema_simple_type_get_type(void *simple_type,
                                   const axis2_env_t *env);
 
 
@@ -137,8 +136,8 @@
     simple_type->simple_type.ops->set_content = 
             axis2_xml_schema_simple_type_set_content;
             
-    simple_type->simple_type.ops->type =
-            axis2_xml_schema_simple_type_type;      
+    simple_type->simple_type.ops->get_type =
+            axis2_xml_schema_simple_type_get_type;      
                   
     simple_type->simple_type.ops->super_objs = 
             axis2_xml_schema_simple_type_super_objs;            
@@ -158,8 +157,8 @@
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_get_content);
     axis2_hash_set(simple_type->methods, "set_content", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_set_content);
-    axis2_hash_set(simple_type->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_type);
+    axis2_hash_set(simple_type->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_get_type);
     axis2_hash_set(simple_type->methods, "super_objs", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_super_objs);
                     
@@ -320,7 +319,7 @@
 }                                        
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_type(void *simple_type,
+axis2_xml_schema_simple_type_get_type(void *simple_type,
                                   const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(simple_type)->obj_type;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c Wed Jun  7 05:03:26 2006
@@ -51,7 +51,7 @@
                                         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_content_type(void *sim_type_cont,
+axis2_xml_schema_simple_type_content_get_type(void *sim_type_cont,
                                             const axis2_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
@@ -96,8 +96,8 @@
             axis2_xml_schema_simple_type_content_free;
     sim_type_cont_impl->sim_type_cont.ops->get_base_impl = 
             axis2_xml_schema_simple_type_content_get_base_impl;
-    sim_type_cont_impl->sim_type_cont.ops->type = 
-            axis2_xml_schema_simple_type_content_type;
+    sim_type_cont_impl->sim_type_cont.ops->get_type = 
+            axis2_xml_schema_simple_type_content_get_type;
     sim_type_cont_impl->sim_type_cont.ops->super_objs = 
             axis2_xml_schema_simple_type_content_super_objs;
    
@@ -111,8 +111,8 @@
     }
     axis2_hash_set(sim_type_cont_impl->methods, "free", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_simple_type_content_free);
-    axis2_hash_set(sim_type_cont_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_content_type);
+    axis2_hash_set(sim_type_cont_impl->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_content_get_type);
     axis2_hash_set(sim_type_cont_impl->methods, "super_objs", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_type_content_super_objs);
 
@@ -221,7 +221,7 @@
     
     sim_type_cont->ops->free = axis2_hash_get(methods, "free", 
             AXIS2_HASH_KEY_STRING);
-    sim_type_cont->ops->type = axis2_hash_get(methods, "type", 
+    sim_type_cont->ops->get_type = axis2_hash_get(methods, "get_type", 
             AXIS2_HASH_KEY_STRING);
     sim_type_cont->ops->super_objs = axis2_hash_get(methods, "super_objs", 
             AXIS2_HASH_KEY_STRING);
@@ -232,7 +232,7 @@
 
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_simple_type_content_type(void *sim_type_cont,
+axis2_xml_schema_simple_type_content_get_type(void *sim_type_cont,
                                             const axis2_env_t *env)
 {
     return AXIS2_INTF_TO_IMPL(sim_type_cont)->obj_type;



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


Mime
View raw message