You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/09/27 15:16:07 UTC

svn commit: r450430 [1/7] - in /webservices/axis2/trunk/c/tools/codegen: include/ src/schema/ src/schema/compiler/ src/schema/writer/ src/templates/ src/templates/c/ src/typemappers/

Author: nandika
Date: Wed Sep 27 06:16:04 2006
New Revision: 450430

URL: http://svn.apache.org/viewvc?view=rev&rev=450430
Log:
adding schema compiler

Added:
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h
    webservices/axis2/trunk/c/tools/codegen/src/schema/
    webservices/axis2/trunk/c/tools/codegen/src/schema/Makefile.am
    webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/
    webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/Makefile.am
    webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema-config.properties
    webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/writer/
    webservices/axis2/trunk/c/tools/codegen/src/schema/writer/Makefile.am
    webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer_protected.h
    webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
    webservices/axis2/trunk/c/tools/codegen/src/templates/
    webservices/axis2/trunk/c/tools/codegen/src/templates/Makefile.am
    webservices/axis2/trunk/c/tools/codegen/src/templates/c/
    webservices/axis2/trunk/c/tools/codegen/src/templates/c/CADBBeanTemplateHeader.xsl
    webservices/axis2/trunk/c/tools/codegen/src/templates/c/CADBBeanTemplateSource.xsl
    webservices/axis2/trunk/c/tools/codegen/src/templates/c/Makefile.am
    webservices/axis2/trunk/c/tools/codegen/src/templates/c/ServiceSkeleton.xsl   (with props)
    webservices/axis2/trunk/c/tools/codegen/src/templates/c/ServiceXMLTemplate.xsl   (with props)
    webservices/axis2/trunk/c/tools/codegen/src/templates/c/SkelHeaderTemplate.xsl   (with props)
    webservices/axis2/trunk/c/tools/codegen/src/templates/c/SkelSourceTemplate.xsl   (with props)
    webservices/axis2/trunk/c/tools/codegen/src/templates/c/StubHeaderTemplate.xsl   (with props)
    webservices/axis2/trunk/c/tools/codegen/src/templates/c/StubSourceTemplate.xsl   (with props)
    webservices/axis2/trunk/c/tools/codegen/src/typemappers/
    webservices/axis2/trunk/c/tools/codegen/src/typemappers/Makefile.am
    webservices/axis2/trunk/c/tools/codegen/src/typemappers/c.adb.typemap.xml
    webservices/axis2/trunk/c/tools/codegen/src/typemappers/c.default.typemap.xml
Modified:
    webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_consts.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_emitter.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_engine.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_extension.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_properties.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_consts.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_property_loader.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h
    webservices/axis2/trunk/c/tools/codegen/include/w2c_writer.h

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option.h Wed Sep 27 06:16:04 2006
@@ -39,7 +39,7 @@
 typedef struct w2c_cmdline_option w2c_cmdline_option_t;
 typedef struct w2c_cmdline_option_ops w2c_cmdline_option_ops_t;
 
-  struct w2c_cmdline_option_ops
+AXIS2_DECLARE_DATA  struct w2c_cmdline_option_ops
 {
    /**
     * free w2c_cmdline_option.
@@ -67,7 +67,7 @@
     
 };
 
-  struct w2c_cmdline_option
+AXIS2_DECLARE_DATA  struct w2c_cmdline_option
 {
      struct w2c_cmdline_option_ops *ops;
 };

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_consts.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_consts.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_consts.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_consts.h Wed Sep 27 06:16:04 2006
@@ -47,7 +47,7 @@
 #define W2C_CMDLINE_OPTION_CONSTS_STUB_LANGUAGE "l"
 #define W2C_CMDLINE_OPTION_CONSTS_GENERATE_TEST_CASE "t"
 #define W2C_CMDLINE_OPTION_CONSTS_DATA_BINDING_TYPE "d"
-#define W2C_CMDLINE_OPTION_CONSTS_UNPACK_CLASSES "u"
+#define W2C_CMDLINE_OPTION_CONSTS_PACK_CLASSES "pk"
 #define W2C_CMDLINE_OPTION_CONSTS_GENERATE_ALL "g"
 #define W2C_CMDLINE_OPTION_CONSTS_PORT_NAME "pn"
 #define W2C_CMDLINE_OPTION_CONSTS_SERVICE_NAME "sn"
@@ -70,7 +70,7 @@
 #define W2C_CMDLINE_OPTION_CONSTS_LONG_STUB_LANGUAGE "language"
 #define W2C_CMDLINE_OPTION_CONSTS_LONG_GENERATE_TEST_CASE "test-case"
 #define W2C_CMDLINE_OPTION_CONSTS_LONG_DATA_BINDING_TYPE "databinding-method"
-#define W2C_CMDLINE_OPTION_CONSTS_LONG_UNPACK_CLASSES "unpack-classes"
+#define W2C_CMDLINE_OPTION_CONSTS_LONG_PACK_CLASSES "pack-classes"
 #define W2C_CMDLINE_OPTION_CONSTS_LONG_GENERATE_ALL "generate-all"
 #define W2C_CMDLINE_OPTION_CONSTS_LONG_PORT_NAME "port-name"
 #define W2C_CMDLINE_OPTION_CONSTS_LONG_SERVICE_NAME "service-name"

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h Wed Sep 27 06:16:04 2006
@@ -40,7 +40,7 @@
 typedef struct w2c_cmdline_option_parser w2c_cmdline_option_parser_t;
 typedef struct w2c_cmdline_option_parser_ops w2c_cmdline_option_parser_ops_t;
 
-  struct w2c_cmdline_option_parser_ops
+AXIS2_DECLARE_DATA  struct w2c_cmdline_option_parser_ops
 {
    /**
     * free w2c_cmdline_option_parser.
@@ -75,7 +75,7 @@
 
 };
 
-  struct w2c_cmdline_option_parser
+AXIS2_DECLARE_DATA  struct w2c_cmdline_option_parser
 {
     struct w2c_cmdline_option_parser_ops *ops;
 };

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h Wed Sep 27 06:16:04 2006
@@ -40,7 +40,7 @@
 typedef struct w2c_config_property_loader w2c_config_property_loader_t;
 typedef struct w2c_config_property_loader_ops w2c_config_property_loader_ops_t;
 
-  struct w2c_config_property_loader_ops
+AXIS2_DECLARE_DATA  struct w2c_config_property_loader_ops
 {
    /**
     * free w2c_config_property_loader.
@@ -198,7 +198,7 @@
         const axis2_env_t *env);
 };
 
-  struct w2c_config_property_loader
+AXIS2_DECLARE_DATA  struct w2c_config_property_loader
 {
      struct w2c_config_property_loader_ops *ops;
 };

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_emitter.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_emitter.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_emitter.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_emitter.h Wed Sep 27 06:16:04 2006
@@ -40,7 +40,7 @@
 typedef struct w2c_emitter w2c_emitter_t;
 typedef struct w2c_emitter_ops w2c_emitter_ops_t;
 
-  struct w2c_emitter_ops
+AXIS2_DECLARE_DATA  struct w2c_emitter_ops
 {
    /**
     * free w2c_emitter.
@@ -88,7 +88,7 @@
 
 };
 
-  struct w2c_emitter
+AXIS2_DECLARE_DATA  struct w2c_emitter
 {
      struct w2c_emitter_ops *ops;
 };

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_engine.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_engine.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_engine.h Wed Sep 27 06:16:04 2006
@@ -39,7 +39,7 @@
 typedef struct w2c_engine w2c_engine_t;
 typedef struct w2c_engine_ops w2c_engine_ops_t;
 
-  struct w2c_engine_ops
+AXIS2_DECLARE_DATA  struct w2c_engine_ops
 {
    /**
     * free w2c_engine.
@@ -66,7 +66,7 @@
 
 };
 
-  struct w2c_engine
+AXIS2_DECLARE_DATA  struct w2c_engine
 {
      struct w2c_engine_ops *ops;
 };

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h Wed Sep 27 06:16:04 2006
@@ -40,12 +40,12 @@
  */
 
 typedef axis2_char_t* (*W2C_ENGINE_CONFIGURATION_NAMEMAKER)
-                  ( axis2_qname_t *name, const axis2_env_t *env);
+                  ( axis2_char_t *name, const axis2_env_t *env);
     
 typedef struct w2c_engine_configuration w2c_engine_configuration_t;
 typedef struct w2c_engine_configuration_ops w2c_engine_configuration_ops_t;
 
-  struct w2c_engine_configuration_ops
+AXIS2_DECLARE_DATA  struct w2c_engine_configuration_ops
 {
    /**
     * free w2c_engine_configuration.
@@ -767,7 +767,7 @@
 
 };
 
-  struct w2c_engine_configuration
+AXIS2_DECLARE_DATA  struct w2c_engine_configuration
 {
      struct w2c_engine_configuration_ops* ops;
 };

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_extension.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_extension.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_extension.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_extension.h Wed Sep 27 06:16:04 2006
@@ -39,7 +39,7 @@
 typedef struct w2c_extension w2c_extension_t;
 typedef struct w2c_extension_ops w2c_extension_ops_t;
 
-  struct w2c_extension_ops
+AXIS2_DECLARE_DATA  struct w2c_extension_ops
 {
    /**
     * free w2c_extension.
@@ -68,7 +68,7 @@
 
 };
 
-  struct w2c_extension
+AXIS2_DECLARE_DATA  struct w2c_extension
 {
      struct w2c_extension_ops *ops;
 };

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_properties.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_properties.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_properties.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_properties.h Wed Sep 27 06:16:04 2006
@@ -40,7 +40,7 @@
 typedef struct w2c_properties w2c_properties_t;
 typedef struct w2c_properties_ops w2c_properties_ops_t;
 
-  struct w2c_properties_ops
+AXIS2_DECLARE_DATA  struct w2c_properties_ops
 {
     /**
      * free w2c_properties.
@@ -64,7 +64,7 @@
            const axis2_env_t *env);
 };
 
-  struct w2c_properties
+AXIS2_DECLARE_DATA  struct w2c_properties
 {
      struct w2c_properties_ops *ops;
 };

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_qname2name_maker.h Wed Sep 27 06:16:04 2006
@@ -39,7 +39,7 @@
 typedef struct w2c_qname2name_maker w2c_qname2name_maker_t;
 typedef struct w2c_qname2name_maker_ops w2c_qname2name_maker_ops_t;
 
-  struct w2c_qname2name_maker_ops
+AXIS2_DECLARE_DATA  struct w2c_qname2name_maker_ops
 {
    /**
     * free w2c_qname2name_maker.
@@ -67,7 +67,7 @@
 
 };
 
-  struct w2c_qname2name_maker
+AXIS2_DECLARE_DATA  struct w2c_qname2name_maker
 {
      struct w2c_qname2name_maker_ops *ops;
 };

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler.h Wed Sep 27 06:16:04 2006
@@ -25,6 +25,7 @@
 #include <axis2_utils.h>
 #include <w2c_schema_compiler_options.h>
 #include <xml_schema.h>
+#include <w2c_typemapper.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -39,7 +40,7 @@
 typedef struct w2c_schema_compiler w2c_schema_compiler_t;
 typedef struct w2c_schema_compiler_ops w2c_schema_compiler_ops_t;
 
-  struct w2c_schema_compiler_ops
+AXIS2_DECLARE_DATA  struct w2c_schema_compiler_ops
 {
    /**
     * free w2c_schema_compiler.
@@ -53,7 +54,7 @@
          const axis2_env_t *env);
 
    /**
-    * free w2c_schema_compiler.
+    * compiler single schema.
     * @param  schema_compiler pointer to schema_compiler struct
     * @param  env Environment. MUST NOT be NULL
     * @param  xml_schema schema to compile
@@ -66,21 +67,20 @@
                 xml_schema_t *xml_schema);
 
    /**
-    * free w2c_schema_compiler.
+    * compiles list of schemas.
     * @param  schema_compiler pointer to schema_compiler struct
     * @param  env Environment. MUST NOT be NULL
     * @param  schema_list list of schemas
-    * @return status of the op. AXIS2_SUCCESS on success
-    *     else AXIS2_FAILURE
+    * @return result typemapper
     */
-    axis2_status_t (AXIS2_CALL *
+    w2c_typemapper_t *(AXIS2_CALL *
     compile_schema_list)( w2c_schema_compiler_t *compiler,
                 const axis2_env_t *env,
                 axis2_array_list_t *schema_list);
 
 };
 
-  struct w2c_schema_compiler
+AXIS2_DECLARE_DATA  struct w2c_schema_compiler
 {
      struct w2c_schema_compiler_ops *ops;
 };

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h Wed Sep 27 06:16:04 2006
@@ -23,7 +23,9 @@
  */
 
 #include <axis2_utils.h>
-#include <axis2_array_list.h>
+#include <axis2_hash.h>
+#include <w2c_engine_configuration.h>
+#include <w2c_qname2name_maker.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -39,7 +41,7 @@
 typedef struct w2c_schema_compiler_options w2c_schema_compiler_options_t;
 typedef struct w2c_schema_compiler_options_ops w2c_schema_compiler_options_ops_t;
 
-  struct w2c_schema_compiler_options_ops
+AXIS2_DECLARE_DATA  struct w2c_schema_compiler_options_ops
 {
    /**
     * free w2c_schema_compiler_options.
@@ -116,9 +118,38 @@
     get_ns2package_map)( w2c_schema_compiler_options_t *schema_compiler_options,
         const axis2_env_t *env);
 
+    axis2_status_t (AXIS2_CALL *
+    set_language)( w2c_schema_compiler_options_t *schema_compiler_options,
+        const axis2_env_t *env,
+        axis2_char_t *language);
+
+    axis2_char_t* (AXIS2_CALL *
+    get_language)( w2c_schema_compiler_options_t *schema_compiler_options,
+        const axis2_env_t *env);
+
+    axis2_status_t (AXIS2_CALL *
+    set_qname2name_maker)( w2c_schema_compiler_options_t *schema_compiler_options,
+        const axis2_env_t *env,
+        w2c_qname2name_maker_t *maker);
+
+    w2c_qname2name_maker_t* (AXIS2_CALL *
+    get_qname2name_maker)( w2c_schema_compiler_options_t *schema_compiler_options,
+        const axis2_env_t *env);
+
+    axis2_status_t (AXIS2_CALL *
+    set_name_maker_func)( w2c_schema_compiler_options_t *schema_compiler_options,
+        const axis2_env_t *env,
+        W2C_ENGINE_CONFIGURATION_NAMEMAKER maker);
+
+    W2C_ENGINE_CONFIGURATION_NAMEMAKER (AXIS2_CALL *
+    get_name_maker_func)( w2c_schema_compiler_options_t *schema_compiler_options,
+        const axis2_env_t *env);
+
+
+
 };
 
-  struct w2c_schema_compiler_options
+AXIS2_DECLARE_DATA  struct w2c_schema_compiler_options
 {
      struct w2c_schema_compiler_options_ops *ops;
 };
@@ -137,46 +168,64 @@
       ((schema_compiler_options)->ops->free (schema_compiler_options, env)) 
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_GET_OUTPUT_LOCATION( schema_compiler_options, env) \
-    ((schema_compiler_options)->ops->get_output_location ( schema_compiler_options, env);
+    ((schema_compiler_options)->ops->get_output_location ( schema_compiler_options, env))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_SET_OUTPUT_LOCATION( schema_compiler_options, env, val) \
-    ((schema_compiler_options)->ops->set_output_location ( schema_compiler_options, env, val);
+    ((schema_compiler_options)->ops->set_output_location ( schema_compiler_options, env, val))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_GET_PACKAGE_NAME( schema_compiler_options, env) \
-     ((schema_compiler_options)->ops->get_package_name( schema_compiler_options, env);
+     ((schema_compiler_options)->ops->get_package_name( schema_compiler_options, env))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_SET_PACKAGE_NAME( schema_compiler_options, env, val) \
-     ((schema_compiler_options)->ops->set_package_name( schema_compiler_options, env, val);
+     ((schema_compiler_options)->ops->set_package_name( schema_compiler_options, env, val))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_GET_HELPER_MODE( schema_compiler_options, env) \
-      ((schema_compiler_options)->ops->get_helper_mode( schema_compiler_options, env);
+      ((schema_compiler_options)->ops->get_helper_mode( schema_compiler_options, env))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_SET_HELPER_MODE( schema_compiler_options, env, val) \
-      ((schema_compiler_options)->ops->set_helper_mode( schema_compiler_options, env, val);
+      ((schema_compiler_options)->ops->set_helper_mode( schema_compiler_options, env, val))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_GET_WRITE_OUT( schema_compiler_options, env) \
-       ((schema_compiler_options)->ops->get_write_out( schema_compiler_options, env);
+       ((schema_compiler_options)->ops->get_write_out( schema_compiler_options, env))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_SET_WRITE_OUT( schema_compiler_options, env, val) \
-       ((schema_compiler_options)->ops->set_write_out( schema_compiler_options, env, val);
+       ((schema_compiler_options)->ops->set_write_out( schema_compiler_options, env, val))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_GET_WRAP_CLASSES( schema_compiler_options, env) \
-        ((schema_compiler_options)->ops->get_wrap_classes( schema_compiler_options, env);
+        ((schema_compiler_options)->ops->get_wrap_classes( schema_compiler_options, env))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_SET_WRAP_CLASSES( schema_compiler_options, env, val) \
-        ((schema_compiler_options)->ops->set_wrap_classes( schema_compiler_options, env, val);
+        ((schema_compiler_options)->ops->set_wrap_classes( schema_compiler_options, env, val))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_GET_NS2PACKAGE_MAP( schema_compiler_options, env) \
-         ((schema_compiler_options)->ops->get_ns2package_map( schema_compiler_options, env);
+         ((schema_compiler_options)->ops->get_ns2package_map( schema_compiler_options, env))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_SET_NS2PACKAGE_MAP( schema_compiler_options, env, val) \
-         ((schema_compiler_options)->ops->set_ns2package_map( schema_compiler_options, env, val);
+         ((schema_compiler_options)->ops->set_ns2package_map( schema_compiler_options, env, val))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_GET_MAPPER_CLASS_PACKAGE( schema_compiler_options, env) \
-         ((schema_compiler_options)->ops->get_mapper_class_package( schema_compiler_options, env);
+         ((schema_compiler_options)->ops->get_mapper_class_package( schema_compiler_options, env))
 
 #define W2C_SCHEMA_COMPILER_OPTIONS_SET_MAPPER_CLASS_PACKAGE( schema_compiler_options, env, val) \
-         ((schema_compiler_options)->ops->set_mapper_class_package( schema_compiler_options, env, val);
+         ((schema_compiler_options)->ops->set_mapper_class_package( schema_compiler_options, env, val))
+
+#define W2C_SCHEMA_COMPILER_OPTIONS_GET_LANGUAGE( schema_compiler_options, env) \
+         ((schema_compiler_options)->ops->get_language( schema_compiler_options, env))
+
+#define W2C_SCHEMA_COMPILER_OPTIONS_SET_LANGUAGE( schema_compiler_options, env, val) \
+         ((schema_compiler_options)->ops->set_language( schema_compiler_options, env, val))
+
+#define W2C_SCHEMA_COMPILER_OPTIONS_GET_QNAME2NAME_MAKER( schema_compiler_options, env) \
+         ((schema_compiler_options)->ops->get_qname2name_maker( schema_compiler_options, env))
+
+#define W2C_SCHEMA_COMPILER_OPTIONS_SET_QNAME2NAME_MAKER( schema_compiler_options, env, val) \
+         ((schema_compiler_options)->ops->set_qname2name_maker( schema_compiler_options, env, val))
+
+#define W2C_SCHEMA_COMPILER_OPTIONS_GET_NAME_MAKER_FUNC( schema_compiler_options, env) \
+         ((schema_compiler_options)->ops->get_name_maker_func( schema_compiler_options, env))
+
+#define W2C_SCHEMA_COMPILER_OPTIONS_SET_NAME_MAKER_FUNC( schema_compiler_options, env, val) \
+         ((schema_compiler_options)->ops->set_name_maker_func( schema_compiler_options, env, val))
 
 
 /** @} */

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_consts.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_consts.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_consts.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_consts.h Wed Sep 27 06:16:04 2006
@@ -40,7 +40,7 @@
 /** schema constants */
 
 
-#define W2C_SCHEMA_URI_DEFAULT_SCHEMA_XSD   URI_2001_SCHEMA_XSD
+#define W2C_SCHEMA_URI_DEFAULT_SCHEMA_XSD   AXIS2_URI_2001_SCHEMA_XSD
     
 #define W2C_SCHEMA_XSD_STRING               "string" "|" W2C_SCHEMA_URI_DEFAULT_SCHEMA_XSD
 #define W2C_SCHEMA_XSD_BOOLEAN              "boolean" "|" W2C_SCHEMA_URI_DEFAULT_SCHEMA_XSD
@@ -93,15 +93,17 @@
 
 /*it patterns for the types*/
 
-#define W2C_SCHEMA_ATTRIBUTE_TYPE           0x01
-/*#define W2C_SCHEMA_ANY                    0x02*/
-#define W2C_SCHEMA_ELEMENT_TYPE             0x02
-/*#define W2C_SCHEMA_ANY_ATTRIBUTE_TYPE     0x08*/
-#define W2C_SCHEMA_ARRAY_TYPE               0x04
-#define W2C_SCHEMA_ANY_TYPE                 0x08
-#define W2C_SCHEMA_BINARY_TYPE              0x10
+#define W2C_SCHEMA_CONSTS_ATTRIBUTE_TYPE           0x01
+/*#define W2C_SCHEMA_CONSTS_ANY                    0x02*/
+#define W2C_SCHEMA_CONSTS_ELEMENT_TYPE             0x02
+/*#define W2C_SCHEMA_CONSTS_ANY_ATTRIBUTE_TYPE     0x08*/
+#define W2C_SCHEMA_CONSTS_ARRAY_TYPE               0x04
+#define W2C_SCHEMA_CONSTS_ANY_TYPE                 0x08
+#define W2C_SCHEMA_CONSTS_BINARY_TYPE              0x10
 
 
+#define W2C_SCHEMA_COMPILER_CONSTS_EXTRA_ATTRIBUTE_FIELD_NAME "extraAttributes"
+#define W2C_SCHEMA_CONSTS_ANY_ELEMENT_FIELD_NAME "extraElement"
 /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_property_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_property_loader.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_property_loader.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_property_loader.h Wed Sep 27 06:16:04 2006
@@ -38,7 +38,7 @@
 typedef struct w2c_schema_property_loader w2c_schema_property_loader_t;
 typedef struct w2c_schema_property_loader_ops w2c_schema_property_loader_ops_t;
 
-  struct w2c_schema_property_loader_ops
+AXIS2_DECLARE_DATA  struct w2c_schema_property_loader_ops
 {
    /**
     * free w2c_schema_property_loader.
@@ -113,15 +113,37 @@
     /**
      * retrieve typemapper name.
      * @param  env Environment. MUST NOT be NULL
-     * @return Returns axis2_array_list_t*.
+     * @return Returns typemapper_name.
      */
     axis2_char_t* (AXIS2_CALL* 
     get_typemapper_name)(
         w2c_schema_property_loader_t *schema_property_loader,
         const axis2_env_t *env);
+
+    /**
+     * retrieve default class.
+     * @param  env Environment. MUST NOT be NULL
+     * @return Returns axis2_char_t*.
+     */
+    axis2_char_t* (AXIS2_CALL* 
+    get_default_class)(
+        w2c_schema_property_loader_t *schema_property_loader,
+        const axis2_env_t *env);
+
+    /**
+     * retrieve default array.
+     * @param  env Environment. MUST NOT be NULL
+     * @return Returns axis2_char_t*.
+     */
+    axis2_char_t* (AXIS2_CALL* 
+    get_default_array)(
+        w2c_schema_property_loader_t *schema_property_loader,
+        const axis2_env_t *env);
+
+
 };
 
-  struct w2c_schema_property_loader
+AXIS2_DECLARE_DATA  struct w2c_schema_property_loader
 {
      struct w2c_schema_property_loader_ops *ops;
 };
@@ -146,13 +168,20 @@
 #define W2C_SCHEMA_PROPERTY_LOADER_RELOAD(schema_property_loader, env) \
       ((schema_property_loader)->ops->reload (schema_property_loader, env)) 
 
+#define W2C_SCHEMA_PROPERTY_LOADER_GET_WRITER_INSTANCE(schema_property_loader, env) \
+      ((schema_property_loader)->ops->get_writer_instance(schema_property_loader, env)) 
+
 #define W2C_SCHEMA_PROPERTY_LOADER_GET_TEMPLATE_NAME(schema_property_loader, env) \
       ((schema_property_loader)->ops->get_template_name(schema_property_loader, env))
 
 #define W2C_SCHEMA_PROPERTY_LOADER_GET_TYPEMAPPER_NAME(schema_property_loader, env) \
       ((schema_property_loader)->ops->get_typemapper_name(schema_property_loader, env))
 
+#define W2C_SCHEMA_PROPERTY_LOADER_GET_DEFAULT_ARRAY(schema_property_loader, env) \
+      ((schema_property_loader)->ops->get_default_array(schema_property_loader, env))
 
+#define W2C_SCHEMA_PROPERTY_LOADER_GET_DEFAULT_CLASS(schema_property_loader, env) \
+      ((schema_property_loader)->ops->get_default_class(schema_property_loader, env))
 
 /** @} */
 

Added: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h?view=auto&rev=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h (added)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h Wed Sep 27 06:16:04 2006
@@ -0,0 +1,171 @@
+/*
+ * 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.
+ */
+  
+#ifndef W2C_SCHEMA_WRITER_H
+#define W2C_SCHEMA_WRITER_H
+
+/**
+ * @file w2c_schema_writer.h
+ * @brief represent command line option
+ */
+
+#include <axis2_utils.h>
+#include <axis2_hash.h>
+#include <w2c_schema_compiler_options.h>
+#include <xml_schema_element.h>
+#include <w2c_schema_writer_meta_info.h>
+#include <xml_schema_complex_type.h>
+#include <xml_schema_simple_type.h>
+#include <axis2_qname.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#define W2C_SCHEMA_WRITER_XSLT_PATH "/conf/templates/"
+
+/**
+ * @defgroup w2c_schema_writer represent command line option
+ * @ingroup w2c_wsdl_utils
+ * @{
+ */
+
+typedef struct w2c_schema_writer w2c_schema_writer_t;
+typedef struct w2c_schema_writer_ops w2c_schema_writer_ops_t;
+
+AXIS2_DECLARE_DATA  struct w2c_schema_writer_ops
+{
+   /**
+    * free w2c_schema_writer.
+    * @param  schema_writer pointer to schema_writer struct
+    * @param  env Environment. MUST NOT be NULL
+    * @return status of the op. AXIS2_SUCCESS on success
+    *     else AXIS2_FAILURE
+    */
+    axis2_status_t (AXIS2_CALL *
+    free)(w2c_schema_writer_t *schema_writer,
+          const axis2_env_t *env);
+
+    axis2_hash_t* (AXIS2_CALL *
+    get_model_map)( w2c_schema_writer_t *writer,
+        const axis2_env_t *env);
+
+    axis2_status_t (AXIS2_CALL *
+    init)( w2c_schema_writer_t *writer,
+         const axis2_env_t *env,
+         w2c_schema_compiler_options_t *options,
+         axis2_char_t *template_name,
+         axis2_hash_t *base_typemap);
+
+    axis2_char_t* (AXIS2_CALL *
+    write_element)( w2c_schema_writer_t *writer,
+         const axis2_env_t *env,
+         xml_schema_element_t *element,
+         axis2_hash_t *typemap,
+         w2c_schema_writer_meta_info_t *meta_info);
+
+    axis2_char_t* (AXIS2_CALL *
+    write_complex_type)( w2c_schema_writer_t *writer,
+         const axis2_env_t *env,
+         xml_schema_complex_type_t *type,
+         axis2_hash_t *typemap,
+         w2c_schema_writer_meta_info_t *meta_info);
+
+    axis2_status_t (AXIS2_CALL *
+    write_batch)( w2c_schema_writer_t *writer,
+                 const axis2_env_t *env);
+
+    axis2_char_t* (AXIS2_CALL *
+    write_simple_type)( w2c_schema_writer_t *writer,
+         const axis2_env_t *env,
+         xml_schema_complex_type_t *type,
+         axis2_hash_t *typemap,
+         w2c_schema_writer_meta_info_t *meta_info);
+
+    axis2_char_t* (AXIS2_CALL *
+    make_fully_qualified_class_name)( w2c_schema_writer_t *writer,
+        const axis2_env_t *env,
+        axis2_qname_t *qname);
+
+
+    axis2_status_t (AXIS2_CALL *
+    register_extension_mapper_packagename)(w2c_schema_writer_t *writer,
+                                        const axis2_env_t *env,
+                                        axis2_char_t *package_name);
+
+    axis2_status_t (AXIS2_CALL *
+    write_extension_mapper)( w2c_schema_writer_t *writer,
+                                const axis2_env_t *env,
+                                axis2_hash_t *meta_info_array);
+
+
+    axis2_char_t* (AXIS2_CALL *
+    get_extension_mapper_package_name)(w2c_schema_writer_t *writer,
+                                        const axis2_env_t *env);
+ 
+     
+   };
+
+AXIS2_DECLARE_DATA  struct w2c_schema_writer
+{
+     struct w2c_schema_writer_ops *ops;
+};
+
+/** this is an interface for schema_writer */
+
+/*************************** Function macros **********************************/
+
+#define W2C_SCHEMA_WRITER_FREE(schema_writer, env) \
+      ((schema_writer)->ops->free (schema_writer, env)) 
+
+#define W2C_SCHEMA_WRITER_GET_MODEL_MAP(schema_writer, env) \
+      ((schema_writer)->ops->get_model_map(schema_writer, env))
+
+#define W2C_SCHEMA_WRITER_INIT(schema_writer, env, options, template_name, base_typemap) \
+      ((schema_writer)->ops->init(schema_writer, env, options, template_name, base_typemap))
+
+#define W2C_SCHEMA_WRITER_WRITE_ELEMENT(schema_writer, env, element, typemap, meta_info) \
+      ((schema_writer)->ops->write_element(schema_writer, env, element, typemap, meta_info))
+
+#define W2C_SCHEMA_WRITER_WRITE_COMPLEX_TYPE(schema_writer, env, type, typemap, meta_info) \
+      ((schema_writer)->ops->write_complex_type(schema_writer, env, type, typemap, meta_info))
+
+#define W2C_SCHEMA_WRITER_WRITE_BATCH(schema_writer, env) \
+      ((schema_writer)->ops->write_batch(schema_writer, env)) 
+
+#define W2C_SCHEMA_WRITER_WRITE_SIMPLE_TYPE(schema_writer, env, type, typemap, meta_info) \
+      ((schema_writer)->ops->write_simple_type(schema_writer, env, type, typemap, meta_info))
+
+#define W2C_SCHEMA_WRITER_MAKE_FULLY_QUALIFIED_CLASS_NAME(schema_writer, env, qname) \
+      ((schema_writer)->ops->make_fully_qualified_class_name(schema_writer, env, qname))
+
+#define W2C_SCHEMA_WRITER_REGISTER_EXTENSION_MAPPER_PACKAGENAME(schema_writer, env, package) \
+      ((schema_writer)->ops->register_extension_mapper_packagename(schema_writer, env, package)) 
+
+#define W2C_SCHEMA_WRITER_WRITE_EXTENSION_MAPPER(schema_writer, env, array) \
+      ((schema_writer)->ops->write_extension_mapper(schema_writer, env, array)) 
+
+#define W2C_SCHEMA_WRITER_GET_EXTENSION_MAPPER_PACKAGE_NAME(schema_writer, env) \
+      ((schema_writer)->ops->get_extension_mapper_package_name(schema_writer, env)) 
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* W2C_SCHEMA_WRITER_H */

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer_meta_info.h Wed Sep 27 06:16:04 2006
@@ -39,7 +39,7 @@
 typedef struct w2c_schema_writer_meta_info w2c_schema_writer_meta_info_t;
 typedef struct w2c_schema_writer_meta_info_ops w2c_schema_writer_meta_info_ops_t;
 
-  struct w2c_schema_writer_meta_info_ops
+AXIS2_DECLARE_DATA  struct w2c_schema_writer_meta_info_ops
 {
    /**
     * free w2c_schema_writer_meta_info.
@@ -234,7 +234,7 @@
                             const axis2_env_t *env);
 
    /**
-    * setter for enum_face.
+    * setter for enum_facet.
     * @param  schema_writer_meta_info pointer to schema_writer_meta_info struct
     * @param  env Environment. MUST NOT be NULL
     * @param  enum_face value to set
@@ -242,21 +242,21 @@
     *      else AXIS2_FAILURE
     */
     axis2_status_t (AXIS2_CALL *
-    set_enum_face)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
+    set_enum_facet)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                             const axis2_env_t *env,
                             axis2_char_t *enum_face);
    /**
-    * getter for enum_face.
+    * getter for enum_facet.
     * @param  schema_writer_meta_info pointer to schema_writer_meta_info struct
     * @param  env Environment. MUST NOT be NULL
-    * @param  value for the enum_face
+    * @param  value for the enum_facet
     */
     axis2_char_t *(AXIS2_CALL *
-    get_enum_face)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
+    get_enum_facet)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                             const axis2_env_t *env);
 
    /**
-    * setter for pattern_face.
+    * setter for pattern_facet.
     * @param  schema_writer_meta_info pointer to schema_writer_meta_info struct
     * @param  env Environment. MUST NOT be NULL
     * @param  pattern_face value to set
@@ -264,17 +264,17 @@
     *      else AXIS2_FAILURE
     */
     axis2_status_t (AXIS2_CALL *
-    set_pattern_face)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
+    set_pattern_facet)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                             const axis2_env_t *env,
                             axis2_char_t *pattern_face);
    /**
-    * getter for pattern_face.
+    * getter for pattern_facet.
     * @param  schema_writer_meta_info pointer to schema_writer_meta_info struct
     * @param  env Environment. MUST NOT be NULL
     * @param  value for the pattern_face
     */
     axis2_char_t *(AXIS2_CALL *
-    get_pattern_face)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
+    get_pattern_facet)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                             const axis2_env_t *env);
 
    /**
@@ -453,29 +453,7 @@
     get_qname_minoccurs_countmap)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                             const axis2_env_t *env);
 
-   /**
-    * setter for qname_orderlist.
-    * @param  schema_writer_meta_info pointer to schema_writer_meta_info struct
-    * @param  env Environment. MUST NOT be NULL
-    * @param  qname_orderlist value to set
-    * @return status of the op. AXIS2_SUCCESS on success
-    *      else AXIS2_FAILURE
-    */
-    axis2_status_t (AXIS2_CALL *
-    set_qname_orderlist)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
-                            const axis2_env_t *env,
-                            axis2_hash_t *qname_orderlist);
-   /**
-    * getter for qname_orderlist.
-    * @param  schema_writer_meta_info pointer to schema_writer_meta_info struct
-    * @param  env Environment. MUST NOT be NULL
-    * @param  value for the qname_orderlist
-    */
-    axis2_hash_t *(AXIS2_CALL *
-    get_qname_orderlist)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
-                            const axis2_env_t *env);
-
-   /**
+    /**
     * setter for length_facet.
     * @param  schema_writer_meta_info pointer to schema_writer_meta_info struct
     * @param  env Environment. MUST NOT be NULL
@@ -674,6 +652,11 @@
     register_nillable_qname)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
                          const axis2_env_t *env,
                          axis2_qname_t *qname);
+    
+    axis2_bool_t (AXIS2_CALL *
+    is_nillable)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
+                         const axis2_env_t *env,
+                         axis2_qname_t *qname);
 
 
     axis2_status_t (AXIS2_CALL *
@@ -767,9 +750,14 @@
                              const axis2_env_t *env,
                              axis2_qname_t *type,
                              int mask);
+    
+    axis2_status_t (AXIS2_CALL *
+    add_enum_facet)( w2c_schema_writer_meta_info_t *schema_writer_meta_info,
+                             const axis2_env_t *env,
+                             axis2_char_t *facet);
 };
 
-  struct w2c_schema_writer_meta_info
+AXIS2_DECLARE_DATA  struct w2c_schema_writer_meta_info
 {
      struct w2c_schema_writer_meta_info_ops *ops;
 };
@@ -793,230 +781,229 @@
       ((schema_writer_meta_info)->ops->set_ordered(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_ORDERED(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_ordered(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_ordered(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_ANONYMOUS(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_anonymous(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_ANONYMOUS(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_anonymous(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_anonymous(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_CHOICE(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_choice(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_CHOICE(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_choice(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_choice(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_EXTENSION(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_extension(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_EXTENSION(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_extension(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_extension(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_RESTRICTION(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_restriction(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_RESTRICTION(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_restriction(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_restriction(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_EXTENSION_CLASSNAME(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_extension_classname(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_EXTENSION_CLASSNAME(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_extension_classname(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_extension_classname(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_RESTRICTION_CLASSNAME(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_restriction_classname(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_RESTRICTION_CLASSNAME(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_restriction_classname(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_restriction_classname(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_OWN_CLASSNAME(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_own_classname(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_OWN_CLASSNAME(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_own_classname(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_own_classname(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_ENUM_FACET(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_enum_facet(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_ENUM_FACET(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_enum_facet(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_enum_facet(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_PATTERN_FACET(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_pattern_facet(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_PATTERN_FACET(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_pattern_facet(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_pattern_facet(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_EXTENSION_BASETYPE(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_extension_basetype(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_EXTENSION_BASETYPE(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_extension_basetype(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_extension_basetype(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_RESTRICTION_BASETYPE(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_restriction_basetype(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_RESTRICTION_BASETYPE(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_restriction_basetype(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_restriction_basetype(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_OWNQNAME(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_ownqname(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_OWNQNAME(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_ownqname(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_ownqname(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_ELEMENT2SCHEMA_QNAMEMAP(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_element2schema_qnamemap(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_ELEMENT2SCHEMA_QNAMEMAP(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_element2schema_qnamemap(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_element2schema_qnamemap(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_ELEMENT2CLASSMAP(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_element2classmap(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_ELEMENT2CLASSMAP(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_element2classmap(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_element2classmap(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_SPECIALTYPE_FLAGMAP(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_specialtype_flagmap(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_SPECIALTYPE_FLAGMAP(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_specialtype_flagmap(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_specialtype_flagmap(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_QNAME_MAXOCCURS_COUNTMAP(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_qname_maxoccurs_countmap(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_QNAME_MAXOCCURS_COUNTMAP(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_qname_maxoccurs_countmap(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_qname_maxoccurs_countmap(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_QNAME_MINOCCURS_COUNTMAP(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_qname_minoccurs_countmap(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_QNAME_MINOCCURS_COUNTMAP(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_qname_minoccurs_countmap(schema_writer_meta_info, env))
-
-#define W2C_SCHEMA_WRITER_META_INFO_SET_QNAME_ORDERLIST(schema_writer_meta_info, env, value) \
-      ((schema_writer_meta_info)->ops->set_qname_orderlist(schema_writer_meta_info, env, value))
-
-#define W2C_SCHEMA_WRITER_META_INFO_GET_QNAME_ORDERLIST(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_qname_orderlist(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_qname_minoccurs_countmap(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_LENGTH_FACET(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_length_facet(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_LENGTH_FACET(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_length_facet(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_length_facet(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_MAXEXCLUSIVE_FACET(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_maxexclusive_facet(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_MAXEXCLUSIVE_FACET(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_maxexclusive_facet(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_maxexclusive_facet(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_MINEXCLUSIVE_FACET(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_minexclusive_facet(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_MINEXCLUSIVE_FACET(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_minexclusive_facet(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_minexclusive_facet(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_MAXINCLUSIVE_FACET(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_maxinclusive_facet(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_MAXINCLUSIVE_FACET(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_maxinclusive_facet(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_maxinclusive_facet(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_MININCLUSIVE_FACET(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_mininclusive_facet(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_MININCLUSIVE_FACET(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_mininclusive_facet(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_mininclusive_facet(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_MAXLENGTH_FACET(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_maxlength_facet(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_MAXLENGTH_FACET(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_maxlength_facet(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_maxlength_facet(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_MINLENGTH_FACET(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_minlength_facet(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_MINLENGTH_FACET(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_minlength_facet(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_minlength_facet(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_NILLABLE_QNAMELIST(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_nillable_qnamelist(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_NILLABLE_QNAMELIST(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_nillable_qnamelist(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_nillable_qnamelist(schema_writer_meta_info, env))
 
 #define W2C_SCHEMA_WRITER_META_INFO_SET_PARENT(schema_writer_meta_info, env, value) \
       ((schema_writer_meta_info)->ops->set_parent(schema_writer_meta_info, env, value))
 
 #define W2C_SCHEMA_WRITER_META_INFO_GET_PARENT(schema_writer_meta_info, env) \
-      ((schema_wrtier_meta_info)->ops->get_parent(schema_writer_meta_info, env))
+      ((schema_writer_meta_info)->ops->get_parent(schema_writer_meta_info, env))
 
 
-#define W2C_SCHEMA_WRITER_META_INOF_IS_RESTRICTION_BASE_TYPE(schema_writer_meta_info, env, type) \
+#define W2C_SCHEMA_WRITER_META_INFO_IS_RESTRICTION_BASE_TYPE(schema_writer_meta_info, env, type) \
       ((schema_writer_meta_info)->ops->is_restriction_base_type(schema_writer_meta_info, env, type))
 
-#define W2C_SCHEMA_WRITER_META_INOF_REGISTER_NILLABLE_QNAME(schema_writer_meta_info, env, qname) \
+#define W2C_SCHEMA_WRITER_META_INFO_REGISTER_NILLABLE_QNAME(schema_writer_meta_info, env, qname) \
       ((schema_writer_meta_info)->ops->register_nillable_qname(schema_writer_meta_info, env, qname))
 
-#define W2C_SCHEMA_WRITER_META_INOF_REGISTER_MAPPING(schema_writer_meta_info, \
+#define W2C_SCHEMA_WRITER_META_INFO_IS_NILLABLE(schema_writer_meta_info, env, qname) \
+      ((schema_writer_meta_info)->ops->is_nillable(schema_writer_meta_info, env, qname))
+
+#define W2C_SCHEMA_WRITER_META_INFO_REGISTER_MAPPING(schema_writer_meta_info, \
                                        env, qname, schema_name, class_name, type) \
       ((schema_writer_meta_info)->ops->register_mapping(schema_writer_meta_info, \
                                        env, qname, schema_name, class_name, type)) 
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_SCHEMAQNAME4QNAME(schema_writer_meta_info, env, qname) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_SCHEMAQNAME4QNAME(schema_writer_meta_info, env, qname) \
       ((schema_writer_meta_info)->ops->get_schemaqname4qname(schema_writer_meta_info, env, qname))
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_CLASSNAME4QNAME(schema_writer_meta_info, env, qname) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_CLASSNAME4QNAME(schema_writer_meta_info, env, qname) \
       ((schema_writer_meta_info)->ops->get_classname4qname(schema_writer_meta_info, env, qname))
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_ATTRI_STATUS4QNAME(schema_writer_meta_info, env, qname) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_ATTRI_STATUS4QNAME(schema_writer_meta_info, env, qname) \
       ((schema_writer_meta_info)->ops->get_attri_status4qname(schema_writer_meta_info, env, qname))
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_ANY_STATUS4QNAME(schema_writer_meta_info, env, qname) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_ANY_STATUS4QNAME(schema_writer_meta_info, env, qname) \
       ((schema_writer_meta_info)->ops->get_any_status4qname(schema_writer_meta_info, env, qname))
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_ARRAY_STATUS4QNAME(schema_writer_meta_info, env, qname) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_ARRAY_STATUS4QNAME(schema_writer_meta_info, env, qname) \
       ((schema_writer_meta_info)->ops->get_array_status4qname(schema_writer_meta_info, env, qname))
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_BINARY_STATUS4QNAME(schema_writer_meta_info, env, qname) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_BINARY_STATUS4QNAME(schema_writer_meta_info, env, qname) \
       ((schema_writer_meta_info)->ops->get_binary_status4qname(schema_writer_meta_info, env, qname))
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_ANY_ATTRI_STATUS4QNAME(schema_writer_meta_info, env, qname) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_ANY_ATTRI_STATUS4QNAME(schema_writer_meta_info, env, qname) \
       ((schema_writer_meta_info)->ops->get_any_attri_status4qname(schema_writer_meta_info, env, qname))
 
-#define W2C_SCHEMA_WRITER_META_INOF_ADD_MIN_OCCURS(schema_writer_meta_info, env, qname, min_occurs) \
+#define W2C_SCHEMA_WRITER_META_INFO_ADD_MIN_OCCURS(schema_writer_meta_info, env, qname, min_occurs) \
       ((schema_writer_meta_info)->ops->add_min_occurs(schema_writer_meta_info, env, qname, min_occurs))
 
-#define W2C_SCHEMA_WRITER_META_INOF_ADD_MAX_OCCURS(schema_writer_meta_info, env, qname, max_occurs) \
+#define W2C_SCHEMA_WRITER_META_INFO_ADD_MAX_OCCURS(schema_writer_meta_info, env, qname, max_occurs) \
       ((schema_writer_meta_info)->ops->add_max_occurs(schema_writer_meta_info, env, qname, max_occurs))
 
-#define W2C_SCHEMA_WRITER_META_INOF_REGISTER_QNAME_INDEX(schema_writer_meta_info, env, qname, index) \
+#define W2C_SCHEMA_WRITER_META_INFO_REGISTER_QNAME_INDEX(schema_writer_meta_info, env, qname, index) \
       ((schema_writer_meta_info)->ops->register_qname_index(schema_writer_meta_info, env, qname, index))
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_MIN_OCCURS(schema_writer_meta_info, env, qname) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_MIN_OCCURS(schema_writer_meta_info, env, qname) \
       ((schema_writer_meta_info)->ops->get_min_occurs(schema_writer_meta_info, env, qname))
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_MAX_OCCURS(schema_writer_meta_info, env, qname) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_MAX_OCCURS(schema_writer_meta_info, env, qname) \
       ((schema_writer_meta_info)->ops->get_max_occurs(schema_writer_meta_info, env, qname))
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_QNAME_ARRAY(schema_writer_meta_info, env) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_QNAME_ARRAY(schema_writer_meta_info, env) \
       ((schema_writer_meta_info)->ops->get_qname_array(schema_writer_meta_info, env))
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_ORDERED_QNAME_ARRAY(schema_writer_meta_info, env) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_ORDERED_QNAME_ARRAY(schema_writer_meta_info, env) \
       ((schema_writer_meta_info)->ops->get_ordered_qname_array(schema_writer_meta_info, env))
 
-#define W2C_SCHEMA_WRITER_META_INOF_GET_ORDER_START_POINT(schema_writer_meta_info, env) \
+#define W2C_SCHEMA_WRITER_META_INFO_GET_ORDER_START_POINT(schema_writer_meta_info, env) \
       ((schema_writer_meta_info)->ops->get_order_start_point(schema_writer_meta_info, env))
 
-#define W2C_SCHEMA_WRITER_META_INOF_ADD_STATUS(schema_writer_meta_info, env, type, mask) \
+#define W2C_SCHEMA_WRITER_META_INFO_ADD_STATUS(schema_writer_meta_info, env, type, mask) \
       ((schema_writer_meta_info)->ops->add_status(schema_writer_meta_info, env, type, mask))
 
+#define W2C_SCHEMA_WRITER_META_INFO_ADD_ENUM_FACET(schema_writer_meta_info, env, enum_facet) \
+      ((schema_writer_meta_info)->ops->add_enum_facet(schema_writer_meta_info, env, enum_facet))
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_string.h Wed Sep 27 06:16:04 2006
@@ -24,6 +24,8 @@
 
 #include <stdio.h>
 #include <axis2_utils.h>
+#include <axis2_string.h>
+#include <axis2_qname.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -71,6 +73,7 @@
  * all letters convert to simple.
  * @param name name to convert
  * @param env pointer to the environment. MUST NOT be NULL
+ * @return	c simple name	
  */
 AXIS2_EXTERN axis2_char_t*
 w2c_string_make_c_simple_name( axis2_char_t *name,
@@ -82,12 +85,21 @@
  * all letters convert to capital.
  * @param name name to convert
  * @param env pointer to the environment. MUST NOT be NULL
+ * @return	c macro name	
  */
 AXIS2_EXTERN axis2_char_t*
 w2c_string_make_c_macro_name(axis2_char_t *name,
                                const axis2_env_t *env);
 
-
+/**
+ * get a hash key from the qname.
+ * @param qname qname to make the key
+ * @param env pointer to the environment. MUST NOT be NULL
+ * @return	newly create hash key
+ */
+AXIS2_EXTERN axis2_char_t*
+w2c_string_make_key_from_qname(axis2_qname_t *qname,
+                               const axis2_env_t *env);
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_typemapper.h Wed Sep 27 06:16:04 2006
@@ -42,7 +42,7 @@
 typedef struct w2c_typemapper w2c_typemapper_t;
 typedef struct w2c_typemapper_ops w2c_typemapper_ops_t;
 
-  struct w2c_typemapper_ops
+AXIS2_DECLARE_DATA  struct w2c_typemapper_ops
 {
    /**
     * free w2c_typemapper.
@@ -114,9 +114,31 @@
     get_default_qname)(w2c_typemapper_t *typemapper,
           const axis2_env_t *env);
 
+   /**
+    * retrieve the qname 2 typename hash.
+    * @param  typemapper pointer to typemapper struct
+    * @param  env Environment. MUST NOT be NULL
+    * @param the qname 2 typename hash
+    */
+    axis2_hash_t* (AXIS2_CALL *
+    get_all)(w2c_typemapper_t *typemapper,
+          const axis2_env_t *env);
+   
+   /**
+    * retrieve whether the type is primitive.
+    * @param  typemapper pointer to typemapper struct
+    * @param  env Environment. MUST NOT be NULL
+    * @param  qname qname in wsdl to find the mapping
+    * @return whether the type is primitive
+    */
+    axis2_bool_t (AXIS2_CALL *
+    is_primitive)(w2c_typemapper_t *typemapper,
+          const axis2_env_t *env,
+          axis2_qname_t *qname);
+
 };
 
-  struct w2c_typemapper
+AXIS2_DECLARE_DATA  struct w2c_typemapper
 {
      struct w2c_typemapper_ops *ops;
 };
@@ -153,6 +175,13 @@
 
 #define W2C_TYPEMAPPER_GET_DEFAULT_QNAME(typemapper, env)\
       ((typemapper)->ops->get_default_qname(typemapper, env))
+
+#define W2C_TYPEMAPPER_GET_ALL(typemapper, env)\
+      ((typemapper)->ops->get_all(typemapper, env))
+
+#define W2C_TYPEMAPPER_IS_PRIMITIVE(typemapper, env, qname)\
+      ((typemapper)->ops->is_primitive(typemapper, env, qname))
+
 /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_writer.h?view=diff&rev=450430&r1=450429&r2=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_writer.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_writer.h Wed Sep 27 06:16:04 2006
@@ -43,7 +43,7 @@
 typedef struct w2c_writer w2c_writer_t;
 typedef struct w2c_writer_ops w2c_writer_ops_t;
 
-  struct w2c_writer_ops
+AXIS2_DECLARE_DATA  struct w2c_writer_ops
 {
    /**
     * free w2c_writer.
@@ -100,7 +100,7 @@
 
 };
 
-  struct w2c_writer
+AXIS2_DECLARE_DATA  struct w2c_writer
 {
      struct w2c_writer_ops *ops;
 };

Added: webservices/axis2/trunk/c/tools/codegen/src/schema/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/Makefile.am?view=auto&rev=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/Makefile.am (added)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/Makefile.am Wed Sep 27 06:16:04 2006
@@ -0,0 +1,40 @@
+SUBDIRS= compiler writer 
+
+prglibdir=$(prefix)/lib/codegen
+prgbindir=$(prefix)/bin
+
+prgbin_PROGRAMS = x2c
+
+x2c_SOURCES =  xsd2code.c
+x2c_LDADD =  \
+             $(top_builddir)/src/wsdl/libw2c_codegen.la \
+             $(top_builddir)/src/schema/compiler/libw2c_schema.la \
+             -L$(AXIS2C_HOME)/lib \
+             -laxis2_util \
+             -laxis2_axiom \
+             -laxis2_parser \
+			 -laxis2_xml_schema \
+             -lxml2 \
+             -lxslt \
+			 $(NULL)
+
+prglib_LTLIBRARIES = \
+             libw2c_databinding_adb_ext.la
+
+libw2c_databinding_adb_ext_la_SOURCES = databinding_adb_ext.c
+
+libw2c_databinding_adb_ext_la_LIBADD = \
+                 $(top_builddir)/src/util/libw2c_util.la \
+                 $(top_builddir)/src/schema/compiler/libw2c_schema.la \
+                 -L$(AXIS2C_HOME)/lib \
+                 -laxis2_util \
+                 -laxis2_axiom \
+                 -lwoden_wsdl \
+                 -lwoden \
+                 -laxis2_xml_schema
+
+
+INCLUDES = -I$(top_builddir)/include \
+                        @UTILINC@ \
+                        @XMLSCHEMAINC@ \
+                        @AXIOMINC@

Added: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/Makefile.am?view=auto&rev=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/Makefile.am (added)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/Makefile.am Wed Sep 27 06:16:04 2006
@@ -0,0 +1,24 @@
+samplesdir=$(prefix)/conf
+samples_DATA= schema-config.properties 
+
+prglibdir=$(prefix)/lib
+prglib_LTLIBRARIES = libw2c_schema.la
+
+libw2c_schema_la_SOURCES = \
+	schema_compiler.c  \
+	schema_compiler_options.c  \
+	schema_property_loader.c  \
+	schema_writer_meta_info.c
+
+libw2c_schema_la_LIBADD = \
+                 $(top_builddir)/src/wsdl/libw2c_codegen.la \
+                 -L$(AXIS2C_HOME)/lib \
+                 -laxis2_util \
+                 -laxis2_axiom \
+                 -laxis2_xml_schema
+
+
+INCLUDES = -I$(top_builddir)/include \
+                        @UTILINC@ \
+                        @XMLSCHEMAINC@ \
+                        @AXIOMINC@

Added: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema-config.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema-config.properties?view=auto&rev=450430
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema-config.properties (added)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema-config.properties Wed Sep 27 06:16:04 2006
@@ -0,0 +1,32 @@
+###############################################################################
+##########################Schema Compiler properties   ########################
+###############################################################################
+#
+# all the keys are prefixed with the language name.
+#
+# The writer class
+# The writer is the class used by the schema compiler to write the beans
+# and should implement the w2c_schema_writer
+# inteface
+#
+c.schema.writer.class=w2c_schema_c_writer
+#
+# writer template
+# The bean writers template is it's own responsibilty. (A bean writer provider
+# may choose not to use a template at all!) However the property loader will
+# load the following templates (reference) and provide it and in the case when the
+# bean writer is not statically bound to a template, this'll be useful.
+#
+c.schema.writer.template=c/CADBBeanTemplate
+
+#
+# The type map to be used by the schema compiler
+#
+c.schema.typemap=c.adb.typemap.xml
+
+#
+# Some other language specific parameters
+#
+
+c.default.class=axiom_node_t*
+c.default.array=axis2_array_list_t*



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