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 [1/3] - in /webservices/axis2/trunk/c/xml_schema: include/xml_schema/ samples/ src/ test/
Date Wed, 07 Jun 2006 12:03:30 GMT
Author: nandika
Date: Wed Jun  7 05:03:26 2006
New Revision: 412382

URL: http://svn.apache.org/viewvc?rev=412382&view=rev
Log:
Macros changed 

Added:
    webservices/axis2/trunk/c/xml_schema/samples/test_schema.c
Modified:
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_annotated.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_annotation.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_any.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_any_attribute.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_app_info.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute_group.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute_group_ref.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_extension.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_content_processing.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_content_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_data_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_derivation_method.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_documentation.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_enum.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_external.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_facet.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_form.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_base.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_ref.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_identity_constraint.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_import.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_particle.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_redefine.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_extension.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_content.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_list.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_restriction.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_union.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_use.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_xpath.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_severity_type.h
    webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_tokenized_type.h
    webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_any_attribute.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_app_info.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_attribute_group_ref.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_extension.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_content_restriction.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_complex_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_data_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_element.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_external.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_group.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_base.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_group_ref.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_import.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_particle.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_redefine.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_extension.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_content_restriction.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_content.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_list.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_restriction.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_simple_type_union.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_xpath.c
    webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c
    webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c
    webservices/axis2/trunk/c/xml_schema/test/main.c
    webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema.h Wed Jun  7 05:03:26 2006
@@ -70,7 +70,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(  void *schema,
+    get_type)(  void *schema,
             const axis2_env_t *env);
     
     axis2_xml_schema_annotated_t *(AXIS2_CALL *
@@ -263,9 +263,9 @@
       (((axis2_xml_schema_t *) schema)->ops->\
             super_objs(schema, env))
 
-#define AXIS2_XML_SCHEMA_TYPE(schema, env) \
+#define AXIS2_XML_SCHEMA_GET_TYPE(schema, env) \
       (((axis2_xml_schema_t *) schema)->ops->\
-            type(schema, env))
+            get_type(schema, env))
 
 #define AXIS2_XML_SCHEMA_GET_BASE_IMPL(schema, env) \
       (((axis2_xml_schema_t *) schema)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_annotated.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_annotated.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_annotated.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_annotated.h Wed Jun  7 05:03:26 2006
@@ -52,7 +52,7 @@
             const axis2_env_t *env);
     
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(
+    get_type)(
             void *annotated,
             const axis2_env_t *env);
 
@@ -123,8 +123,8 @@
       (((axis2_xml_schema_annotated_t *) annotated)->ops->super_objs(\
             annotated, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATED_TYPE(annotated, env) \
-      (((axis2_xml_schema_annotated_t *) annotated)->ops->type(\
+#define AXIS2_XML_SCHEMA_ANNOTATED_GET_TYPE(annotated, env) \
+      (((axis2_xml_schema_annotated_t *) annotated)->ops->get_type(\
             annotated, env))
 
 #define AXIS2_XML_SCHEMA_ANNOTATED_GET_BASE_IMPL(annotated, env) \

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_annotation.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_annotation.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_annotation.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_annotation.h Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (
+    get_type) (
             void *annotation,
             const axis2_env_t *env);
 
@@ -89,9 +89,9 @@
       (((axis2_xml_schema_annotation_t *) annotation)->ops->\
             super_objs(annotation, env))
 
-#define AXIS2_XML_SCHEMA_ANNOTATION_TYPE(annotation, env) \
+#define AXIS2_XML_SCHEMA_ANNOTATION_GET_TYPE(annotation, env) \
       (((axis2_xml_schema_annotation_t *) annotation)->ops->\
-            type(annotation, env))
+            get_type(annotation, env))
 
 #define AXIS2_XML_SCHEMA_ANNOTATION_GET_ITEMS(annotation, env) \
       (((axis2_xml_schema_annotation_t *) annotation)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_any.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_any.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_any.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_any.h Wed Jun  7 05:03:26 2006
@@ -61,7 +61,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (
+    get_type) (
             void *any,
             const axis2_env_t *env);
 
@@ -116,8 +116,8 @@
 #define AXIS2_XML_SCHEMA_ANY_SUPER_OBJS(any, env) \
       (((axis2_xml_schema_any_t *) any)->ops->super_objs(any, env))
 
-#define AXIS2_XML_SCHEMA_ANY_TYPE(any, env) \
-      (((axis2_xml_schema_any_t *) any)->ops->type(any, env))
+#define AXIS2_XML_SCHEMA_ANY_GET_TYPE(any, env) \
+      (((axis2_xml_schema_any_t *) any)->ops->get_type(any, env))
 
 #define AXIS2_XML_SCHEMA_ANY_GET_BASE_IMPL(any, env) \
       (((axis2_xml_schema_any_t *) any)->ops->get_base_impl(any, env))

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_any_attribute.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_any_attribute.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_any_attribute.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_any_attribute.h Wed Jun  7 05:03:26 2006
@@ -55,7 +55,7 @@
             const axis2_env_t *env);
             
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(void *any_attr,
+    get_type)(void *any_attr,
           const axis2_env_t *env);
           
     axis2_hash_t* (AXIS2_CALL *
@@ -114,8 +114,8 @@
       (((axis2_xml_schema_any_attribute_t *) any_attr)->ops->get_base_impl(any_attr, env))
 
 
-#define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_TYPE(any_attr, env) \
-      (((axis2_xml_schema_any_attribute_t *) any_attr)->ops->type(any_attr, env))
+#define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_GET_TYPE(any_attr, env) \
+      (((axis2_xml_schema_any_attribute_t *) any_attr)->ops->get_type(any_attr, env))
       
       
 #define AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_SUPER_OBJS(any_attr, env) \

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_app_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_app_info.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_app_info.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_app_info.h Wed Jun  7 05:03:26 2006
@@ -59,7 +59,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (
+    get_type) (
             void *app_info,
             const axis2_env_t *env);
 
@@ -109,9 +109,9 @@
       (((axis2_xml_schema_app_info_t *) app_info)->ops->\
             super_objs(app_info, env))
 
-#define AXIS2_XML_SCHEMA_APP_INFO_TYPE(app_info, env) \
+#define AXIS2_XML_SCHEMA_APP_INFO_GET_TYPE(app_info, env) \
       (((axis2_xml_schema_app_info_t *) app_info)->ops->\
-            type(app_info, env))
+            get_type(app_info, env))
 
 #define AXIS2_XML_SCHEMA_APP_INFO_GET_SOURCE(app_info, env) \
       (((axis2_xml_schema_app_info_t *) app_info)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute.h Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
             const axis2_env_t *env);
             
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(
+    get_type)(
             void *attr,
             const axis2_env_t *env);
           
@@ -185,8 +185,8 @@
 #define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_BASE_IMPL(attr, env) \
       (((axis2_xml_schema_attribute_t *) attr)->ops->get_base_impl(attr, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_TYPE(attr, env) \
-      (((axis2_xml_schema_attribute_t *) attr)->ops->type(attr, env))
+#define AXIS2_XML_SCHEMA_ATTRIBUTE_GET_TYPE(attr, env) \
+      (((axis2_xml_schema_attribute_t *) attr)->ops->get_type(attr, env))
       
 #define AXIS2_XML_SCHEMA_ATTRIBUTE_SUPER_OBJS(attr, env) \
       (((axis2_xml_schema_attribute_t *) attr)->ops->super_objs(attr, env))

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute_group.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute_group.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute_group.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute_group.h Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
             const axis2_env_t *env);
             
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(
+    get_type)(
             void *attr_grp,
             const axis2_env_t *env);
           
@@ -111,16 +111,6 @@
 AXIS2_EXTERN axis2_xml_schema_attribute_group_t * AXIS2_CALL
 axis2_xml_schema_attribute_group_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_attribute_resolve_methods(
-                                axis2_xml_schema_attribute_t *attr,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_attribute_t *any_impl,
-                                axis2_hash_t *methods);
- */
 /******************************* Macros *************************************************/ 
  
 #define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_FREE(attr_grp, env) \
@@ -129,8 +119,8 @@
 #define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_GET_BASE_IMPL(attr_grp, env) \
       (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->get_base_impl(attr_grp, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_TYPE(attr_grp, env) \
-      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->type(attr_grp, env))
+#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_GET_TYPE(attr_grp, env) \
+      (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->get_type(attr_grp, env))
       
 #define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_SUPER_OBJS(attr_grp, env) \
       (((axis2_xml_schema_attribute_group_t *) attr_grp)->ops->super_objs(attr_grp, env))

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute_group_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute_group_ref.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute_group_ref.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_attribute_group_ref.h Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
             const axis2_env_t *env);
             
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(
+    get_type)(
             void *grp_ref,
             const axis2_env_t *env);
           
@@ -92,16 +92,6 @@
 AXIS2_EXTERN axis2_xml_schema_attribute_group_ref_t * AXIS2_CALL
 axis2_xml_schema_attribute_group_ref_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_attribute_resolve_methods(
-                                axis2_xml_schema_attribute_t *attr,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_attribute_t *any_impl,
-                                axis2_hash_t *methods);
- */
 /******************************* Macros *************************************************/ 
  
 #define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_REF_FREE(grp_ref, env) \
@@ -110,8 +100,8 @@
 #define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_REF_GET_BASE_IMPL(grp_ref, env) \
       (((axis2_xml_schema_attribute_group_ref_t *) grp_ref)->ops->get_base_impl(grp_ref, env))
 
-#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_REF_TYPE(grp_ref, env) \
-      (((axis2_xml_schema_attribute_group_ref_t *) grp_ref)->ops->type(grp_ref, env))
+#define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_REF_GET_TYPE(grp_ref, env) \
+      (((axis2_xml_schema_attribute_group_ref_t *) grp_ref)->ops->get_type(grp_ref, env))
       
 #define AXIS2_XML_SCHEMA_ATTRIBUTE_GROUP_REF_SUPER_OBJS(grp_ref, env) \
       (((axis2_xml_schema_attribute_group_ref_t *) grp_ref)->ops->super_objs(grp_ref, env))

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content.h Wed Jun  7 05:03:26 2006
@@ -55,7 +55,7 @@
                     const axis2_env_t *env);
                     
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (void *complex_content,
+    get_type) (void *complex_content,
             const axis2_env_t *env);
                     
     axis2_hash_t *(AXIS2_CALL *
@@ -101,17 +101,6 @@
 AXIS2_EXTERN axis2_xml_schema_complex_content_t * AXIS2_CALL
 axis2_xml_schema_complex_content_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
- 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_complex_content_resolve_methods(
-                                axis2_xml_schema_complex_content_t *complex_content,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_complex_content_t *group_impl,
-                                axis2_hash_t *methods);
-*/
-
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_FREE(complex_content, env) \
       (((axis2_xml_schema_complex_content_t *) complex_content)->ops->\
             free(complex_content, env))
@@ -120,9 +109,9 @@
       (((axis2_xml_schema_complex_content_t *) complex_content)->ops->\
             get_base_impl(complex_content, env))
             
-#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_TYPE(complex_content, env) \
+#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_GET_TYPE(complex_content, env) \
       (((axis2_xml_schema_complex_content_t *) complex_content)->ops->\
-            type(complex_content, env))
+            get_type(complex_content, env))
             
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_SUPER_OBJS(complex_content, env) \
       (((axis2_xml_schema_complex_content_t *) complex_content)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_extension.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_extension.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_extension.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_extension.h Wed Jun  7 05:03:26 2006
@@ -54,7 +54,7 @@
             const axis2_env_t *env);
             
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (
+    get_type) (
             void *cmp_content_ext,
             const axis2_env_t *env);  
             
@@ -129,9 +129,9 @@
       (((axis2_xml_schema_complex_content_extension_t *)cmp_content_ext)->ops->\
           get_base_impl(cmp_content_ext, env))
 
-#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_TYPE(cmp_content_ext, env) \
+#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_GET_TYPE(cmp_content_ext, env) \
       (((axis2_xml_schema_complex_content_extension_t *)cmp_content_ext)->ops->\
-          type(cmp_content_ext, env))
+          get_type(cmp_content_ext, env))
 
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_SUPER_OBJS(cmp_content_ext, env) \
       (((axis2_xml_schema_complex_content_extension_t *)cmp_content_ext)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_restriction.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_restriction.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_restriction.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_content_restriction.h Wed Jun  7 05:03:26 2006
@@ -61,7 +61,7 @@
             const axis2_env_t *env);
             
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(
+    get_type)(
             void *cmp_content_res,
             const axis2_env_t *env);                        
 
@@ -133,9 +133,9 @@
       (((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\
           get_base_impl(cmp_content_res, env))
 
-#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_TYPE(cmp_content_res, env) \
+#define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_GET_TYPE(cmp_content_res, env) \
       (((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\
-          type(cmp_content_res, env))
+          get_type(cmp_content_res, env))
 
 #define AXIS2_XML_SCHEMA_COMPLEX_CONTENT_RESTRICTION_SUPER_OBJS(cmp_content_res, env) \
       (((axis2_xml_schema_complex_content_restriction_t *) cmp_content_res)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_type.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_type.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_complex_type.h Wed Jun  7 05:03:26 2006
@@ -68,7 +68,7 @@
             const axis2_env_t *env);
             
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(
+    get_type)(
             void *cmp_type,
             const axis2_env_t *env);                        
 
@@ -213,9 +213,9 @@
       (((axis2_xml_schema_complex_type_t *) complex_type)->ops->\
           get_base_impl(complex_type, env))
           
-#define AXIS2_XML_SCHEMA_COMPLEX_TYPE_TYPE(complex_type, env) \
+#define AXIS2_XML_SCHEMA_COMPLEX_TYPE_GET_TYPE(complex_type, env) \
       (((axis2_xml_schema_complex_type_t *) complex_type)->ops->\
-          type(complex_type, env))
+          get_type(complex_type, env))
           
 #define AXIS2_XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS(complex_type, env) \
       (((axis2_xml_schema_complex_type_t *) complex_type)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_content_processing.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_content_processing.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_content_processing.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_content_processing.h Wed Jun  7 05:03:26 2006
@@ -58,7 +58,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (void *content_processing,
+    get_type) (void *content_processing,
             const axis2_env_t *env);
 
     axis2_xml_schema_enum_t *(AXIS2_CALL *
@@ -91,9 +91,9 @@
       (((axis2_xml_schema_content_processing_t *) content_processing)->ops->\
          super_objs(content_processing, env))
 
-#define AXIS2_XML_SCHEMA_CONTENT_PROCESSING_TYPE(content_processing, env) \
+#define AXIS2_XML_SCHEMA_CONTENT_PROCESSING_GET_TYPE(content_processing, env) \
       (((axis2_xml_schema_content_processing_t *) content_processing)->ops->\
-         type(content_processing, env))
+         get_type(content_processing, env))
 
 
 #define AXIS2_XML_SCHEMA_CONTENT_PROCESSING_GET_BASE_IMPL(content_processing, env) \

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_content_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_content_type.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_content_type.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_content_type.h Wed Jun  7 05:03:26 2006
@@ -57,7 +57,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (void *content_type,
+    get_type) (void *content_type,
             const axis2_env_t *env);                
 
     axis2_xml_schema_enum_t *(AXIS2_CALL *
@@ -93,9 +93,9 @@
 #define AXIS2_XML_SCHEMA_CONTENT_TYPE_SUPER_OBJS(content_type, env) \
         (((axis2_xml_schema_content_type_t *) content_type)->ops->super_objs(content_type, env))
         
-#define AXIS2_XML_SCHEMA_CONTENT_TYPE_TYPE(content_type, env) \
+#define AXIS2_XML_SCHEMA_CONTENT_TYPE_GET_TYPE(content_type, env) \
         (((axis2_xml_schema_content_type_t *) content_type) \
-         content_type)->ops->type(content_type, env))        
+         content_type)->ops->get_type(content_type, env))        
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_data_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_data_type.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_data_type.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_data_type.h Wed Jun  7 05:03:26 2006
@@ -76,16 +76,6 @@
 AXIS2_EXTERN axis2_xml_schema_data_type_t * AXIS2_CALL
 axis2_xml_schema_data_type_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
- */
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_data_type_resolve_methods(
-                            axis2_xml_schema_data_type_t *schema_data_type,
-                            const axis2_env_t *env,
-                            axis2_xml_schema_data_type_t *schema_data_type_impl,
-                            axis2_hash_t *methods);
-
 #define AXIS2_XML_SCHEMA_DATA_TYPE_FREE(data_type, env) \
       (((axis2_xml_schema_data_type_t *) data_type)->ops->free (data_type, env))
 

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_derivation_method.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_derivation_method.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_derivation_method.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_derivation_method.h Wed Jun  7 05:03:26 2006
@@ -62,7 +62,7 @@
                 const axis2_env_t *env);
     
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(void *derivation_method,
+    get_type)(void *derivation_method,
           const axis2_env_t *env);                                
     
 };
@@ -90,9 +90,9 @@
       (((axis2_xml_schema_derivation_method_t *) \
       derivation_method)->ops->values(derivation_method, env))
 
-#define AXIS2_XML_SCHEMA_DERIVATION_METHOD_TYPE(derivation_method, env) \
+#define AXIS2_XML_SCHEMA_DERIVATION_METHOD_GET_TYPE(derivation_method, env) \
       (((axis2_xml_schema_derivation_method_t *) \
-      derivation_method)->ops->type(derivation_method, env))
+      derivation_method)->ops->get_type(derivation_method, env))
       
 #define AXIS2_XML_SCHEMA_DERIVATION_METHOD_SUPER_OBJS(derivation_method, env) \
         (((axis2_xml_schema_derivation_method_t *) \

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_documentation.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_documentation.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_documentation.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_documentation.h Wed Jun  7 05:03:26 2006
@@ -35,8 +35,10 @@
   * @{
   */
 
-typedef struct axis2_xml_schema_documentation axis2_xml_schema_documentation_t;
-typedef struct axis2_xml_schema_documentation_ops axis2_xml_schema_documentation_ops_t;
+typedef struct axis2_xml_schema_documentation 
+                    axis2_xml_schema_documentation_t;
+typedef struct axis2_xml_schema_documentation_ops 
+                    axis2_xml_schema_documentation_ops_t;
 
 #ifdef __cplusplus
 extern "C"
@@ -60,7 +62,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (
+    get_type) (
             void *documentation,
             const axis2_env_t *env);
 
@@ -118,9 +120,9 @@
       (((axis2_xml_schema_documentation_t *) documentation)->ops->\
             super_objs(documentation, env))
 
-#define AXIS2_XML_SCHEMA_DOCUMENTATION_TYPE(documentation, env) \
+#define AXIS2_XML_SCHEMA_DOCUMENTATION_GET_TYPE(documentation, env) \
       (((axis2_xml_schema_documentation_t *) documentation)->ops->\
-            type(documentation, env))
+            GET_type(documentation, env))
 
 #define AXIS2_XML_SCHEMA_DOCUMENTATION_GET_SOURCE(documentation, env) \
       (((axis2_xml_schema_documentation_t *) documentation)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_element.h Wed Jun  7 05:03:26 2006
@@ -58,7 +58,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(void *element,
+    get_type)(void *element,
           const axis2_env_t *env);
           
     axis2_hash_t* (AXIS2_CALL *
@@ -253,8 +253,8 @@
       (((axis2_xml_schema_element_t *) element)->ops->get_base_impl(\
             element, env))
 
-#define AXIS2_XML_SCHEMA_ELEMENT_TYPE(element, env) \
-      (((axis2_xml_schema_element_t *) element)->ops->type(\
+#define AXIS2_XML_SCHEMA_ELEMENT_GET_TYPE(element, env) \
+      (((axis2_xml_schema_element_t *) element)->ops->get_type(\
             element, env))
 
 #define AXIS2_XML_SCHEMA_ELEMENT_SUPER_OBJS(element, env) \

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_enum.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_enum.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_enum.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_enum.h Wed Jun  7 05:03:26 2006
@@ -57,7 +57,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (
+    get_type) (
             void *schema_enum,
             const axis2_env_t *env);
 
@@ -115,8 +115,8 @@
 #define AXIS2_XML_SCHEMA_ENUM_SUPER_OBJS(schema_enum, env) \
       (((axis2_xml_schema_enum_t *) schema_enum)->ops->super_objs (schema_enum, env))
 
-#define AXIS2_XML_SCHEMA_ENUM_TYPE(schema_enum, env) \
-      (((axis2_xml_schema_enum_t *) schema_enum)->ops->type (schema_enum, env))
+#define AXIS2_XML_SCHEMA_ENUM_GET_TYPE(schema_enum, env) \
+      (((axis2_xml_schema_enum_t *) schema_enum)->ops->get_type(schema_enum, env))
 
 #define AXIS2_XML_SCHEMA_ENUM_GET_VALUE(schema_enum, env) \
       (((axis2_xml_schema_enum_t *) schema_enum)->ops->get_value \

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_external.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_external.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_external.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_external.h Wed Jun  7 05:03:26 2006
@@ -59,7 +59,7 @@
             const axis2_env_t *env);            
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(
+    get_type)(
             void *external,
             const axis2_env_t *env);            
 
@@ -131,9 +131,9 @@
       (((axis2_xml_schema_external_t *) external)->ops->\
             super_objs(external, env))
 
-#define AXIS2_XML_SCHEMA_EXTERNAL_TYPE(external, env) \
+#define AXIS2_XML_SCHEMA_EXTERNAL_GET_TYPE(external, env) \
       (((axis2_xml_schema_external_t *) external)->ops->\
-            type(external, env))
+            get_type(external, env))
 
 #define AXIS2_XML_SCHEMA_EXTERNAL_GET_SCHEMA(external, env) \
       (((axis2_xml_schema_external_t *) external)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_facet.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_facet.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_facet.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_facet.h Wed Jun  7 05:03:26 2006
@@ -59,7 +59,7 @@
                     const axis2_env_t *env);
     
     axis2_xml_schema_types_t (AXIS2_CALL*
-    type)(void *facet,
+    get_type)(void *facet,
           const axis2_env_t *env);
           
     axis2_hash_t* (AXIS2_CALL *
@@ -120,9 +120,9 @@
       (((axis2_xml_schema_facet_t *) facet)->ops->\
             get_base_impl(facet, env))
 
-#define AXIS2_XML_SCHEMA_FACET_TYPE(facet, env) \
+#define AXIS2_XML_SCHEMA_FACET_GET_TYPE(facet, env) \
       (((axis2_xml_schema_facet_t *) facet)->ops->\
-            type(facet, env))
+            get_type(facet, env))
 
 #define AXIS2_XML_SCHEMA_FACET_SUPER_OBJS(facet, env) \
         (((axis2_xml_schema_facet_t *) facet)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_form.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_form.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_form.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_form.h Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (void *form,
+    get_type) (void *form,
             const axis2_env_t *env);
 
     axis2_xml_schema_enum_t *(AXIS2_CALL *
@@ -87,7 +87,7 @@
 #define AXIS2_XML_SCHEMA_FORM_SUPER_OBJS(form, env) \
       (((axis2_xml_schema_form_t *) form)->ops->super_objs(form, env))
 
-#define AXIS2_XML_SCHEMA_FORM_TYPE(form, env) \
+#define AXIS2_XML_SCHEMA_FORM_GET_TYPE(form, env) \
       (((axis2_xml_schema_form_t *) form)->ops->type(form, env))
 
 #define AXIS2_XML_SCHEMA_FORM_GET_BASE_IMPL(form, env) \

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group.h Wed Jun  7 05:03:26 2006
@@ -59,7 +59,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (void *group,
+    get_type) (void *group,
             const axis2_env_t *env);
 
     axis2_xml_schema_annotated_t *(AXIS2_CALL *
@@ -97,17 +97,6 @@
 AXIS2_EXTERN axis2_xml_schema_group_t * AXIS2_CALL
 axis2_xml_schema_group_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
- 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_group_resolve_methods(
-                                axis2_xml_schema_group_t *group,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_group_t *group_impl,
-                                axis2_hash_t *methods);
-*/
-
 /**************************** Macros *************************************/
 #define AXIS2_XML_SCHEMA_GROUP_FREE(group, env) \
       (((axis2_xml_schema_group_t *) group)->ops->\
@@ -117,9 +106,9 @@
       (((axis2_xml_schema_group_t *) group)->ops->\
             super_objs(group, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_TYPE(group, env) \
+#define AXIS2_XML_SCHEMA_GROUP_GET_TYPE(group, env) \
       (((axis2_xml_schema_group_t *) group)->ops->\
-            type(group, env))
+            get_type(group, env))
 
 #define AXIS2_XML_SCHEMA_GROUP_GET_BASE_IMPL(group, env) \
       (((axis2_xml_schema_group_t *) group)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_base.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_base.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_base.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_base.h Wed Jun  7 05:03:26 2006
@@ -59,7 +59,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (void *group_base,
+    get_type) (void *group_base,
             const axis2_env_t *env);
 
     axis2_xml_schema_particle_t *(AXIS2_CALL *
@@ -100,16 +100,6 @@
 AXIS2_EXTERN axis2_xml_schema_group_base_t * AXIS2_CALL
 axis2_xml_schema_choice_create(const axis2_env_t *env);
 
-
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_group_base_resolve_methods(
-                                axis2_xml_schema_group_base_t *group_base,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_group_base_t *group_base_impl,
-                                axis2_hash_t *methods);
-*/
 /********************** macros ***********************************************/
 #define AXIS2_XML_SCHEMA_GROUP_BASE_FREE(group_base, env) \
       (((axis2_xml_schema_group_base_t *) group_base)->ops->free(group_base, env))
@@ -117,8 +107,8 @@
 #define AXIS2_XML_SCHEMA_GROUP_BASE_SUPER_OBJS(group_base, env) \
       (((axis2_xml_schema_group_base_t *) group_base)->ops->super_objs(group_base, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_BASE_TYPE(group_base, env) \
-      (((axis2_xml_schema_group_base_t *) group_base)->ops->type(group_base, env))
+#define AXIS2_XML_SCHEMA_GROUP_BASE_GET_TYPE(group_base, env) \
+      (((axis2_xml_schema_group_base_t *) group_base)->ops->get_type(group_base, env))
 
 #define AXIS2_XML_SCHEMA_GROUP_BASE_GET_BASE_IMPL(group_base, env) \
       (((axis2_xml_schema_group_base_t *) group_base)->ops->get_base_impl(group_base, env))

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_ref.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_ref.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_group_ref.h Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (
+    get_type) (
             void *group_ref,
             const axis2_env_t *env);
 
@@ -105,8 +105,8 @@
 #define AXIS2_XML_SCHEMA_GROUP_REF_SUPER_OBJS(group_ref, env) \
       (((axis2_xml_schema_group_ref_t *) group_ref)->ops->super_objs(group_ref, env))
 
-#define AXIS2_XML_SCHEMA_GROUP_REF_TYPE(group_ref, env) \
-      (((axis2_xml_schema_group_ref_t *) group_ref)->ops->type(group_ref, env))
+#define AXIS2_XML_SCHEMA_GROUP_REF_GET_TYPE(group_ref, env) \
+      (((axis2_xml_schema_group_ref_t *) group_ref)->ops->get_type(group_ref, env))
 
 #define AXIS2_XML_SCHEMA_GROUP_REF_GET_BASE_IMPL(group_ref, env) \
       (((axis2_xml_schema_group_ref_t *) group_ref)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_identity_constraint.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_identity_constraint.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_identity_constraint.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_identity_constraint.h Wed Jun  7 05:03:26 2006
@@ -65,7 +65,7 @@
                 
                         
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (void *id_constr,
+    get_type) (void *id_constr,
             const axis2_env_t *env);   
         
     /** xml schema keyref method */            
@@ -122,17 +122,7 @@
 AXIS2_EXTERN axis2_xml_schema_identity_constraint_t * AXIS2_CALL
 axis2_xml_schema_key_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
- 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_identity_constraint_resolve_methods(
-                axis2_xml_schema_identity_constraint_t *identity_constraint,
-                const axis2_env_t *env,
-                axis2_xml_schema_identity_constraint_t *identity_constraint_impl,
-                axis2_hash_t *methods);
-*/                
-/**************** Macros *****************************************************/                
+/**************** Macros *****************************************************/        
 
 #define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_FREE(id_constr, env) \
       (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
@@ -143,9 +133,9 @@
             get_base_impl(id_constr, env))
 
 
-#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_TYPE(id_constr, env) \
+#define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_GET_TYPE(id_constr, env) \
       (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\
-            type(id_constr, env))
+            get_type(id_constr, env))
 
 #define AXIS2_XML_SCHEMA_IDENTITY_CONSTRAINT_SUPER_OBJS(id_constr, env) \
       (((axis2_xml_schema_identity_constraint_t *) id_constr)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_import.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_import.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_import.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_import.h Wed Jun  7 05:03:26 2006
@@ -59,7 +59,7 @@
                 const axis2_env_t *env);
                 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(void *import,
+    get_type)(void *import,
                 const axis2_env_t *env);                
     
     axis2_char_t* (AXIS2_CALL *
@@ -87,18 +87,7 @@
 AXIS2_EXTERN axis2_xml_schema_import_t * AXIS2_CALL
 axis2_xml_schema_import_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_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);
- */
- 
- 
 #define AXIS2_XML_SCHEMA_IMPORT_FREE(import, env) \
       (((axis2_xml_schema_import_t *) import)->ops->\
             free(import, env))
@@ -107,9 +96,9 @@
       (((axis2_xml_schema_import_t *) import)->ops->\
             get_base_impl(import, env))
             
-#define AXIS2_XML_SCHEMA_IMPORT_TYPE(import, env) \
+#define AXIS2_XML_SCHEMA_IMPORT_GET_TYPE(import, env) \
       (((axis2_xml_schema_import_t *) import)->ops->\
-            type(import, env))
+            get_type(import, env))
             
 #define AXIS2_XML_SCHEMA_IMPORT_SUPER_OBJS(import, env) \
       (((axis2_xml_schema_import_t *) import)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_obj.h Wed Jun  7 05:03:26 2006
@@ -57,7 +57,7 @@
             const axis2_env_t *env);
     
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (
+    get_type) (
             void *obj,
             const axis2_env_t *env);
 
@@ -118,8 +118,8 @@
 #define AXIS2_XML_SCHEMA_OBJ_SUPER_OBJS(obj, env) \
       (((axis2_xml_schema_obj_t *) obj)->ops->super_objs (obj, env))
 
-#define AXIS2_XML_SCHEMA_OBJ_TYPE(obj, env) \
-      (((axis2_xml_schema_obj_t *) obj)->ops->type (obj, env))
+#define AXIS2_XML_SCHEMA_OBJ_GET_TYPE(obj, env) \
+      (((axis2_xml_schema_obj_t *) obj)->ops->get_type (obj, env))
 
 #define AXIS2_XML_SCHEMA_OBJ_GET_LINE_NUM(obj, env) \
       (((axis2_xml_schema_obj_t *) obj)->ops->get_line_num (obj, env))

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_particle.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_particle.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_particle.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_particle.h Wed Jun  7 05:03:26 2006
@@ -59,7 +59,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (
+    get_type) (
             void *particle,
             const axis2_env_t *env);
 
@@ -121,9 +121,9 @@
       (((axis2_xml_schema_particle_t *) particle)->ops->\
             super_objs(particle, env))
 
-#define AXIS2_XML_SCHEMA_PARTICLE_TYPE(particle, env) \
+#define AXIS2_XML_SCHEMA_PARTICLE_GET_TYPE(particle, env) \
       (((axis2_xml_schema_particle_t *) particle)->ops->\
-            type(particle, env))
+            get_type(particle, env))
 
 #define AXIS2_XML_SCHEMA_PARTICLE_GET_BASE_IMPL(particle, env) \
       (((axis2_xml_schema_particle_t *) particle)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_redefine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_redefine.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_redefine.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_redefine.h Wed Jun  7 05:03:26 2006
@@ -60,7 +60,7 @@
                 const axis2_env_t *env);            
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(void *redefine,
+    get_type)(void *redefine,
           const axis2_env_t *env);            
 
     axis2_xml_schema_obj_table_t* (AXIS2_CALL *
@@ -98,17 +98,6 @@
 AXIS2_EXTERN axis2_xml_schema_redefine_t * AXIS2_CALL
 axis2_xml_schema_redefine_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_redefine_resolve_methods(
-                                axis2_xml_schema_redefine_t *redefine,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_redefine_t *redefine_impl,
-                                axis2_hash_t *methods);
- */
- 
 #define AXIS2_XML_SCHEMA_REDEFINE_FREE(redefine, env) \
       (((axis2_xml_schema_redefine_t *) redefine)->ops->\
             free(redefine, env))
@@ -117,9 +106,9 @@
       (((axis2_xml_schema_redefine_t *) redefine)->ops->\
             get_base_impl(redefine, env))
 
-#define AXIS2_XML_SCHEMA_REDEFINE_TYPE(redefine, env) \
+#define AXIS2_XML_SCHEMA_REDEFINE_GET_TYPE(redefine, env) \
       (((axis2_xml_schema_redefine_t *) redefine)->ops->\
-            type(redefine, env))
+            get_type(redefine, env))
 
 #define AXIS2_XML_SCHEMA_REDEFINE_SUPER_OBJS(redefine, env) \
       (((axis2_xml_schema_redefine_t *) redefine)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content.h Wed Jun  7 05:03:26 2006
@@ -62,7 +62,7 @@
                 const axis2_env_t *env);
                     
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (void *sim_content,
+    get_type) (void *sim_content,
            const axis2_env_t *env);                                        
 
     void* (AXIS2_CALL *
@@ -96,16 +96,6 @@
 AXIS2_EXTERN axis2_xml_schema_simple_content_t * AXIS2_CALL
 axis2_xml_schema_simple_content_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_resolve_methods(
-                                axis2_xml_schema_simple_content_t *sim_content,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_simple_content_t *group_impl,
-                                axis2_hash_t *methods);
- */
  
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_FREE(sim_content, env) \
       (((axis2_xml_schema_simple_content_t *) sim_content)->ops->\
@@ -119,9 +109,9 @@
       (((axis2_xml_schema_simple_content_t *) sim_content)->ops->\
             super_objs(sim_content, env))
             
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_TYPE(sim_content, env) \
+#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_GET_TYPE(sim_content, env) \
       (((axis2_xml_schema_simple_content_t *) sim_content)->ops->\
-            type(sim_content, env))
+            get_type(sim_content, env))
                         
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_GET_CONTENT(sim_content, env) \
       (((axis2_xml_schema_simple_content_t *) sim_content)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_extension.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_extension.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_extension.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_extension.h Wed Jun  7 05:03:26 2006
@@ -60,7 +60,7 @@
                     const axis2_env_t *env);
                     
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(void *sim_content_ext,
+    get_type)(void *sim_content_ext,
           const axis2_env_t *env);
           
     axis2_hash_t* (AXIS2_CALL *
@@ -120,9 +120,9 @@
       (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
             get_base_impl(sim_content_ext, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_TYPE(sim_content_ext, env) \
+#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_GET_TYPE(sim_content_ext, env) \
       (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\
-            type(sim_content_ext, env))
+            get_type(sim_content_ext, env))
             
 #define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_EXTENSION_SUPER_OBJS(sim_content_ext, env) \
       (((axis2_xml_schema_simple_content_extension_t *)sim_content_ext)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_restriction.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_restriction.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_restriction.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_content_restriction.h Wed Jun  7 05:03:26 2006
@@ -66,7 +66,7 @@
             const axis2_env_t *env);
             
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(
+    get_type)(
             void *sim_content_res,
             const axis2_env_t *env);                        
 
@@ -173,9 +173,9 @@
       (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
       super_objs(sim_content_res, env))  
       
-#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_TYPE(sim_content_res, env) \
+#define AXIS2_XML_SCHEMA_SIMPLE_CONTENT_RESTRICTION_GET_TYPE(sim_content_res, env) \
       (((axis2_xml_schema_simple_content_restriction_t *)sim_content_res)->ops->\
-      type(sim_content_res, env))                                          
+      get_type(sim_content_res, env))                                          
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type.h Wed Jun  7 05:03:26 2006
@@ -57,7 +57,7 @@
                     const axis2_env_t *env);
                     
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (void *simple_type,
+    get_type) (void *simple_type,
             const axis2_env_t *env);
                     
     axis2_hash_t* (AXIS2_CALL *
@@ -117,9 +117,9 @@
       (((axis2_xml_schema_simple_type_t *) simple_type)->ops->\
             get_base_impl(simple_type, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_TYPE(simple_type, env) \
+#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_GET_TYPE(simple_type, env) \
       (((axis2_xml_schema_simple_type_t *) simple_type)->ops->\
-            type(simple_type, env))
+            get_type(simple_type, env))
             
 #define AXIS2_XML_SCHEMA_SIMPLE_TYPE_SUPER_OBJS(simple_type, env) \
       (((axis2_xml_schema_simple_type_t *) simple_type)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_content.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_content.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_content.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_content.h Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
                     const axis2_env_t *env);
 
     axis2_xml_schema_types_t    (AXIS2_CALL *
-    type)(void *sim_type_cont,
+    get_type)(void *sim_type_cont,
               const axis2_env_t *env);
     
     axis2_hash_t* (AXIS2_CALL *
@@ -101,9 +101,9 @@
       (((axis2_xml_schema_simple_type_content_t *) sim_type_cont)->ops->\
             get_base_impl(sim_type_cont, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_TYPE(sim_type_cont, env) \
+#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_GET_TYPE(sim_type_cont, env) \
       (((axis2_xml_schema_simple_type_content_t *) sim_type_cont)->ops->\
-            type(sim_type_cont, env))
+            get_type(sim_type_cont, env))
 
 #define AXIS2_XML_SCHEMA_SIMPLE_TYPE_CONTENT_SUPER_OBJS(sim_type_cont, env) \
       (((axis2_xml_schema_simple_type_content_t *) sim_type_cont)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_list.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_list.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_list.h Wed Jun  7 05:03:26 2006
@@ -57,7 +57,7 @@
                     const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(void *simple_type_list,
+    get_type)(void *simple_type_list,
           const axis2_env_t *env);
     
     axis2_hash_t* (AXIS2_CALL *
@@ -102,17 +102,6 @@
 AXIS2_EXTERN axis2_xml_schema_simple_type_list_t * AXIS2_CALL
 axis2_xml_schema_simple_type_list_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_list_resolve_methods(
-                    axis2_xml_schema_simple_type_list_t *simple_type_list,
-                    const axis2_env_t *env,
-                    axis2_xml_schema_simple_type_list_t *simple_type_list_impl,
-                    axis2_hash_t *methods);
- */
- 
  /********************** Macros ***********************************************/
  
 #define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_FREE(simple_type_list, env) \
@@ -125,7 +114,7 @@
             
 #define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_TYPE(simple_type_list, env) \
       (((axis2_xml_schema_simple_type_list_t *) simple_type_list)->ops->\
-            type(simple_type_list, env))
+            get_type(simple_type_list, env))
             
 #define AXIS2_XML_SCHEMA_SIMPLE_TYPE_LIST_SUPER_OBJS(simple_type_list, env) \
       (((axis2_xml_schema_simple_type_list_t *) simple_type_list)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_restriction.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_restriction.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_restriction.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_restriction.h Wed Jun  7 05:03:26 2006
@@ -44,10 +44,6 @@
 
 struct axis2_xml_schema_simple_type_restriction_ops
 {
-   /** 
-     * Deallocate memory
-     * @return status code
-     */
     axis2_status_t (AXIS2_CALL *
     free) (void *simple_type_restriction,
             const axis2_env_t *env);
@@ -57,7 +53,7 @@
                     const axis2_env_t *env);
                     
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(void *simple_type_restriction,
+    get_type)(void *simple_type_restriction,
                 const axis2_env_t *env);
                 
     axis2_hash_t *(AXIS2_CALL *
@@ -112,18 +108,6 @@
 AXIS2_EXTERN axis2_xml_schema_simple_type_restriction_t * AXIS2_CALL
 axis2_xml_schema_simple_type_restriction_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
- 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_restriction_resolve_methods(
-                    axis2_xml_schema_simple_type_restriction_t *simple_type_restriction,
-                    const axis2_env_t *env,
-                    axis2_xml_schema_simple_type_restriction_t *simple_type_restriction_impl,
-                    axis2_hash_t *methods);
-*/
-
-
 #define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_FREE(simple_type_restriction, env) \
       (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\
             free(simple_type_restriction, env))
@@ -132,9 +116,9 @@
       (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\
             get_base_impl(simple_type_restriction, env))
             
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_TYPE(simple_type_restriction, env) \
+#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_GET_TYPE(simple_type_restriction, env) \
       (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\
-            type(simple_type_restriction, env))
+            get_type(simple_type_restriction, env))
             
 #define AXIS2_XML_SCHEMA_SIMPLE_TYPE_RESTRICTION_SUPER_OBJS(simple_type_restriction, env) \
       (((axis2_xml_schema_simple_type_restriction_t *) simple_type_restriction)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_union.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_union.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_union.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_simple_type_union.h Wed Jun  7 05:03:26 2006
@@ -59,7 +59,7 @@
             const axis2_env_t *env);                    
     
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(
+    get_type)(
             void *sim_type_union,
             const axis2_env_t *env);
 
@@ -109,18 +109,7 @@
 AXIS2_EXTERN axis2_xml_schema_simple_type_union_t * AXIS2_CALL
 axis2_xml_schema_simple_type_union_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_type_union_resolve_methods(
-                    axis2_xml_schema_simple_type_union_t *sim_type_union,
-                    const axis2_env_t *env,
-                    axis2_xml_schema_simple_type_union_t *simple_type_union_impl,
-                    axis2_hash_t *methods);
- */
- 
- #define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_FREE(sim_type_union, env) \
+#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_FREE(sim_type_union, env) \
       (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\
             free(sim_type_union, env))
 
@@ -132,9 +121,9 @@
       (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\
             super_objs(sim_type_union, env))
 
-#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_TYPE(sim_type_union, env) \
+#define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_GET_TYPE(sim_type_union, env) \
       (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\
-            type(sim_type_union, env))
+            get_type(sim_type_union, env))
 
 #define AXIS2_XML_SCHEMA_SIMPLE_TYPE_UNION_GET_BASE_TYPES(sim_type_union, env) \
       (((axis2_xml_schema_simple_type_union_t *) sim_type_union)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_type.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_type.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_type.h Wed Jun  7 05:03:26 2006
@@ -45,10 +45,6 @@
 
 struct axis2_xml_schema_type_ops
 {
-   /** 
-     * Deallocate memory
-     * @return status code
-     */
     axis2_status_t (AXIS2_CALL *
     free) (void *type,
             const axis2_env_t *env);
@@ -62,7 +58,7 @@
                 const axis2_env_t *env);
                    
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(void *type,
+    get_type)(void *type,
           const axis2_env_t *env);                                                  
 
     void *(AXIS2_CALL *
@@ -150,9 +146,9 @@
       (((axis2_xml_schema_type_t *) type)->ops->\
             get_base_impl(type, env))
 
-#define AXIS2_XML_SCHEMA_TYPE_TYPE(sch_type, env) \
+#define AXIS2_XML_SCHEMA_TYPE_GET_TYPE(sch_type, env) \
       (((axis2_xml_schema_type_t *) sch_type)->ops->\
-           type(sch_type, env))
+           get_type(sch_type, env))
 
            
 #define AXIS2_XML_SCHEMA_TYPE_SUPER_OBJS(type, env) \

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_use.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_use.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_use.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_use.h Wed Jun  7 05:03:26 2006
@@ -56,7 +56,7 @@
             const axis2_env_t *env);
 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type) (
+    get_type) (
             void *use,
             const axis2_env_t *env);
 
@@ -88,8 +88,8 @@
 #define AXIS2_XML_SCHEMA_USE_SUPER_OBJS(use, env) \
       (((axis2_xml_schema_use_t *) use)->ops->super_objs(use, env))
 
-#define AXIS2_XML_SCHEMA_USE_TYPE(use, env) \
-      (((axis2_xml_schema_use_t *) use)->ops->type(use, env))
+#define AXIS2_XML_SCHEMA_USE_GET_TYPE(use, env) \
+      (((axis2_xml_schema_use_t *) use)->ops->get_type(use, env))
 
 #define AXIS2_XML_SCHEMA_USE_GET_BASE_IMPL(use, env) \
       (((axis2_xml_schema_use_t *) use)->ops->get_base_impl(use, env))

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_xpath.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_xpath.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_xpath.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_schema_xpath.h Wed Jun  7 05:03:26 2006
@@ -59,7 +59,7 @@
                     const axis2_env_t *env);
                     
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(void *xpath,
+    get_type)(void *xpath,
           const axis2_env_t *env);
           
     axis2_hash_t* (AXIS2_CALL *
@@ -89,16 +89,6 @@
 AXIS2_EXTERN axis2_xml_schema_xpath_t * AXIS2_CALL
 axis2_xml_schema_xpath_create(const axis2_env_t *env);
 
-/**
- * This method is internal to Axis2 C. It is called from Child Constructor
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_schema_xpath_resolve_methods(
-                                axis2_xml_schema_xpath_t *xpath,
-                                const axis2_env_t *env,
-                                axis2_xml_schema_xpath_t *xpath_impl,
-                                axis2_hash_t *methods);
- */
  
 #define AXIS2_XML_SCHEMA_XPATH_FREE(xpath, env) \
       (((axis2_xml_schema_xpath_t *) xpath)->ops->\
@@ -108,9 +98,9 @@
       (((axis2_xml_schema_xpath_t *) xpath)->ops->\
             get_base_impl(xpath, env))
 
-#define AXIS2_XML_SCHEMA_XPATH_TYPE(xpath, env) \
+#define AXIS2_XML_SCHEMA_XPATH_GET_TYPE(xpath, env) \
       (((axis2_xml_schema_xpath_t *) xpath)->ops->\
-            type(xpath, env))
+            get_type(xpath, env))
 
 #define AXIS2_XML_SCHEMA_XPATH_SUPER_OBJS(xpath, env) \
       (((axis2_xml_schema_xpath_t *) xpath)->ops->\

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_severity_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_severity_type.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_severity_type.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_severity_type.h Wed Jun  7 05:03:26 2006
@@ -66,7 +66,7 @@
                 const axis2_env_t *env);
                 
     axis2_xml_schema_types_t (AXIS2_CALL*
-    type)(void *severity,
+    get_type)(void *severity,
           const axis2_env_t *env);                              
     
 };
@@ -92,8 +92,8 @@
 #define AXIS2_XML_SEREVITY_TYPE_GET_VALUES(severity, env) \
       (((axis2_xml_severity_type_t *) severity)->ops->values(severity, env))
 
-#define AXIS2_XML_SEREVITY_TYPE_TYPE(severity, env) \
-      (((axis2_xml_severity_type_t *) severity)->ops->type(severity, env))
+#define AXIS2_XML_SEREVITY_TYPE_GET_TYPE(severity, env) \
+      (((axis2_xml_severity_type_t *) severity)->ops->get_type(severity, env))
 
 #define AXIS2_XML_SEREVITY_TYPE_SUPER_OBJS(severity, env) \
       (((axis2_xml_severity_type_t *) severity)->ops->super_objs(severity, env))

Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_tokenized_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_tokenized_type.h?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_tokenized_type.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema/axis2_xml_tokenized_type.h Wed Jun  7 05:03:26 2006
@@ -63,7 +63,7 @@
                 const axis2_env_t *env);
                 
     axis2_xml_schema_types_t (AXIS2_CALL *
-    type)(void *tokenized_type,
+    get_type)(void *tokenized_type,
           const axis2_env_t *env);                                
     
 };
@@ -92,8 +92,9 @@
 #define AXIS2_XML_TOKENIZED_TYPE_SUPER_OBJS(tokenized_type, env) \
       (((axis2_xml_tokenized_type_t *) tokenized_type)->ops->super_objs(tokenized_type, env))      
 
-#define AXIS2_XML_TOKENIZED_TYPE_TYPE(tokenized_type, env) \
-      (((axis2_xml_tokenized_type_t *) tokenized_type)->ops->type(tokenized_type, env))
+#define AXIS2_XML_TOKENIZED_TYPE_GET_TYPE(tokenized_type, env) \
+      (((axis2_xml_tokenized_type_t *) tokenized_type)->ops->\
+        get_type(tokenized_type, env))
 /** @} */
 #ifdef __cplusplus
 }

Added: webservices/axis2/trunk/c/xml_schema/samples/test_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/samples/test_schema.c?rev=412382&view=auto
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/samples/test_schema.c (added)
+++ webservices/axis2/trunk/c/xml_schema/samples/test_schema.c Wed Jun  7 05:03:26 2006
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <xml_schema/axis2_xml_schema_includes.h>
+#include <stdio.h>
+#include <axis2_env.h>
+#include <axis2_utils_defines.h>
+
+axis2_status_t
+xml_schema_test(
+        axis2_env_t *env,
+        axis2_char_t *filename)
+{
+    axis2_xml_reader_t *xml_reader      = NULL;
+    axis2_om_stax_builder_t *om_builder = NULL;
+    axis2_om_document_t *om_doc         = NULL;
+    axis2_xml_schema_collection_t *schema_collection = NULL;
+    axis2_xml_schema_t *schema          = NULL;
+    
+    xml_reader = 
+    axis2_xml_reader_create_for_file(env, filename, NULL);
+    if(!xml_reader)
+        return AXIS2_FAILURE;   
+    
+    om_builder = axis2_om_stax_builder_create(env, xml_reader);
+    
+    om_doc = axis2_om_document_create(env, NULL, om_builder);
+    
+    AXIS2_OM_DOCUMENT_BUILD_ALL(om_doc, env);
+    
+    schema_collection = axis2_xml_schema_collection_create(env);
+    
+    schema = AXIS2_XML_SCHEMA_COLLECTION_READ_DOCUMENT(
+        schema_collection, env, om_doc);
+        
+    if(NULL != schema)
+    {
+        printf(" parsing schema is successful ");
+    }                
+    
+    return AXIS2_SUCCESS;
+}
+
+int main(int argc, char *argv[])
+{
+    axis2_env_t *env = NULL;
+    axis2_char_t *filename = NULL;
+    if(argc > 1)
+        filename = argv[1];
+    else
+        return 0;        
+    env = axis2_env_create_all("test.log", 1);   
+    xml_schema_test(env, filename);
+}
\ No newline at end of file

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema.c Wed Jun  7 05:03:26 2006
@@ -83,7 +83,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_type(
+axis2_xml_schema_get_type(
         void *schema,
         const axis2_env_t *env);
 
@@ -316,7 +316,7 @@
 
     schema_impl->schema.ops->free = axis2_xml_schema_free;
     schema_impl->schema.ops->super_objs = axis2_xml_schema_super_objs;
-    schema_impl->schema.ops->type = axis2_xml_schema_type;
+    schema_impl->schema.ops->get_type = axis2_xml_schema_get_type;
     schema_impl->schema.ops->get_base_impl = 
             axis2_xml_schema_get_base_impl;
     schema_impl->schema.ops->get_namespace = 
@@ -427,8 +427,8 @@
             axis2_xml_schema_free);
     axis2_hash_set(schema_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_super_objs);
-    axis2_hash_set(schema_impl->methods, "type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_type);
+    axis2_hash_set(schema_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_get_type);
     axis2_hash_set(schema_impl->methods, "get_namespace", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_get_namespace);
     axis2_hash_set(schema_impl->methods, "get_attr_form_default", 
@@ -556,7 +556,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_type(
+axis2_xml_schema_get_type(
         void *schema,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c Wed Jun  7 05:03:26 2006
@@ -60,7 +60,7 @@
         const axis2_env_t *env);
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_annotated_type(
+axis2_xml_schema_annotated_get_type(
         void *annotated,
         const axis2_env_t *env);
 
@@ -137,8 +137,8 @@
             axis2_xml_schema_annotated_free;
     annotated_impl->annotated.ops->super_objs = 
             axis2_xml_schema_annotated_super_objs;
-    annotated_impl->annotated.ops->type = 
-            axis2_xml_schema_annotated_type;
+    annotated_impl->annotated.ops->get_type = 
+            axis2_xml_schema_annotated_get_type;
     annotated_impl->annotated.ops->get_base_impl = 
             axis2_xml_schema_annotated_get_base_impl;
     annotated_impl->annotated.ops->get_id = 
@@ -164,8 +164,8 @@
             axis2_xml_schema_annotated_free);
     axis2_hash_set(annotated_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_annotated_super_objs);
-    axis2_hash_set(annotated_impl->methods, "type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_annotated_type);
+    axis2_hash_set(annotated_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_annotated_get_type);
     axis2_hash_set(annotated_impl->methods, "get_id", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_annotated_get_id);
     axis2_hash_set(annotated_impl->methods, "set_id", AXIS2_HASH_KEY_STRING, 
@@ -275,7 +275,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_annotated_type(
+axis2_xml_schema_annotated_get_type(
         void *annotated,
         const axis2_env_t *env)
 {
@@ -317,7 +317,7 @@
     annotated->ops->super_objs = axis2_hash_get(methods, "super_objs",
             AXIS2_HASH_KEY_STRING);
 
-    annotated->ops->type = axis2_hash_get(methods, "type", 
+    annotated->ops->get_type = axis2_hash_get(methods, "get_type", 
             AXIS2_HASH_KEY_STRING);
 
     annotated->ops->get_id = axis2_hash_get(methods, "get_id", 

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotation.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_annotation_type(
+axis2_xml_schema_annotation_get_type(
         void *annotation,
         const axis2_env_t *env);
 
@@ -106,8 +106,8 @@
     annotation_impl->annotation.ops->super_objs = 
         axis2_xml_schema_annotation_super_objs;
     
-    annotation_impl->annotation.ops->type = 
-        axis2_xml_schema_annotation_type;
+    annotation_impl->annotation.ops->get_type = 
+        axis2_xml_schema_annotation_get_type;
     
     annotation_impl->annotation.ops->get_base_impl = 
         axis2_xml_schema_annotation_get_base_impl;
@@ -136,8 +136,8 @@
             
     axis2_hash_set(annotation_impl->methods, "super_objs", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_annotation_super_objs);
-    axis2_hash_set(annotation_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_xml_schema_annotation_type);
+    axis2_hash_set(annotation_impl->methods, "get_type", 
+            AXIS2_HASH_KEY_STRING, axis2_xml_schema_annotation_get_type);
     
     axis2_hash_set(annotation_impl->methods, "get_items", 
             AXIS2_HASH_KEY_STRING, axis2_xml_schema_annotation_get_items);
@@ -262,7 +262,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL 
-axis2_xml_schema_annotation_type(
+axis2_xml_schema_annotation_get_type(
         void *annotation,
         const axis2_env_t *env)
 {

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c?rev=412382&r1=412381&r2=412382&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_any.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_type(
+axis2_xml_schema_any_get_type(
         void *any,
         const axis2_env_t *env);
 
@@ -131,8 +131,8 @@
         axis2_xml_schema_any_free;
     any_impl->any.ops->super_objs = 
         axis2_xml_schema_any_super_objs;
-    any_impl->any.ops->type = 
-        axis2_xml_schema_any_type;
+    any_impl->any.ops->get_type = 
+        axis2_xml_schema_any_get_type;
     any_impl->any.ops->get_base_impl = 
         axis2_xml_schema_any_get_base_impl;
     any_impl->any.ops->get_namespace = 
@@ -154,8 +154,8 @@
             axis2_xml_schema_any_free);
     axis2_hash_set(any_impl->methods, "super_objs", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_any_super_objs);
-    axis2_hash_set(any_impl->methods, "type", AXIS2_HASH_KEY_STRING, 
-            axis2_xml_schema_any_type);
+    axis2_hash_set(any_impl->methods, "get_type", AXIS2_HASH_KEY_STRING, 
+            axis2_xml_schema_any_get_type);
     axis2_hash_set(any_impl->methods, "get_namespace", AXIS2_HASH_KEY_STRING, 
             axis2_xml_schema_any_get_namespace);
     axis2_hash_set(any_impl->methods, "set_namespace", AXIS2_HASH_KEY_STRING, 
@@ -255,7 +255,7 @@
 }
 
 axis2_xml_schema_types_t AXIS2_CALL
-axis2_xml_schema_any_type(void *any,
+axis2_xml_schema_any_get_type(void *any,
                                 const axis2_env_t *env)
 {
     axis2_xml_schema_any_impl_t *any_impl = NULL;
@@ -313,9 +313,11 @@
     any->ops->super_objs = axis2_hash_get(methods, "super_objs", 
             AXIS2_HASH_KEY_STRING);
             
-    any->ops->type = axis2_hash_get(methods, "type", 
+    any->ops->get_type = axis2_hash_get(methods, "get_type", 
             AXIS2_HASH_KEY_STRING);
-            
+    if(!any->ops->get_type)
+        any->ops->get_type =
+            sch_any_impl->any.ops->get_type;            
     
     any->ops->get_namespace = axis2_hash_get(methods, 
             "get_namespace", AXIS2_HASH_KEY_STRING);



---------------------------------------------------------------------
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