axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r518623 [10/17] - in /webservices/axis2/trunk/c: build/win32/ include/ modules/core/clientapi/ modules/core/deployment/ modules/core/engine/ modules/core/phaseresolver/ modules/core/receivers/ modules/core/transport/http/receiver/ modules/c...
Date Thu, 15 Mar 2007 13:16:11 GMT
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h Thu Mar 15 06:16:07 2007
@@ -49,188 +49,153 @@
     
     /** Type name for struct axis2_arch_fila_data */
     typedef struct axis2_arch_file_data axis2_arch_file_data_t;
-    /** Type name for struct axis2_arch_fila_data_ops */
-    typedef struct axis2_arch_file_data_ops axis2_arch_file_data_ops_t;
 
-    /**
-     * Arch File Data ops struct
-     * Encapsulator struct for ops of axis2_arch_file_data
+    /** 
+     * De-allocate memory
+     * @param arch_file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
-    struct axis2_arch_file_data_ops
-    {
-        /** 
-         * De-allocate memory
-         * @param arch_file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                free)(
-                    axis2_arch_file_data_t *arch_file_data,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         */
-        axis2_char_t *(AXIS2_CALL *
-                get_msg_recv)(
-                    const axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         * @param msg_recv pointer to message receiver
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_msg_recv)(
-                    axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env,
-                    axis2_char_t *msg_recv);
-
-        /**
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         * @return the name of the contained file.
-         */
-        axis2_char_t *(AXIS2_CALL *
-                get_name)(
-                    const axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env);
-        /**
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         * @return the service name. if contained file is not null this is the
-         * file name. else this is the name property
-         */
-        axis2_char_t *(AXIS2_CALL *
-                get_svc_name)(
-                    const axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         */
-        int (AXIS2_CALL *
-                get_type)(
-                    const axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         */
-        axis2_file_t *(AXIS2_CALL *
-                get_file)(
-                    const axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         */
-        axis2_char_t *(AXIS2_CALL *
-                get_module_name)(
-                    const axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         * @param module_name pointer to module_name
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_module_name)(
-                    axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env,
-                    axis2_char_t *module_name);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         */
-        axis2_char_t *(AXIS2_CALL *
-                get_module_dll_name)(
-                    const axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_module_dll_name)(
-                    axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env,
-                    axis2_char_t *module_dll_name);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_svc)(
-                    axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env,
-                    struct axis2_svc *svc_desc);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         */
-        struct axis2_svc *(AXIS2_CALL *
-                get_svc)(
-                    const axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env,
-                    axis2_char_t *svc_name);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         */
-        axis2_hash_t *(AXIS2_CALL *
-                get_svc_map)(
-                    const axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         */
-        axis2_array_list_t *(AXIS2_CALL *
-                get_deployable_svcs)(
-                    const axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param file_data pointer to arch_file_data
-         * @param env pointer to environment struct
-         * @param deployable_svcs pointer to deployable services
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_deployable_svcs)(
-                    axis2_arch_file_data_t *file_data,
-                    const axis2_env_t *env,
-                    axis2_array_list_t *deployable_svcs);
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_arch_file_data_free(axis2_arch_file_data_t *arch_file_data,
+        const axis2_env_t *env);
 
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    axis2_arch_file_data_get_msg_recv(const axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env);
 
-    };
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     * @param msg_recv pointer to message receiver
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_arch_file_data_set_msg_recv(axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env,
+        axis2_char_t *msg_recv);
 
     /**
-     * Arch File Data struct 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     * @return the name of the contained file.
      */
-    struct axis2_arch_file_data
-    {
-        /** Ops of Arch File Data */
-        axis2_arch_file_data_ops_t *ops;
-    };
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    axis2_arch_file_data_get_name(const axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env);
+
+    /**
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     * @return the service name. if contained file is not null this is the
+     * file name. else this is the name property
+     */
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    axis2_arch_file_data_get_svc_name(const axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env);
+
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN int AXIS2_CALL
+    axis2_arch_file_data_get_type(const axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env);
+
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN axis2_file_t *AXIS2_CALL
+    axis2_arch_file_data_get_file(const axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env);
+
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    axis2_arch_file_data_get_module_name(const axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env);
+
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     * @param module_name pointer to module_name
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_arch_file_data_set_module_name(axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env,
+        axis2_char_t *module_name);
+
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    axis2_arch_file_data_get_module_dll_name(const axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env);
+
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_arch_file_data_set_module_dll_name(axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env,
+        axis2_char_t *module_dll_name);
+
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_arch_file_data_add_svc(axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env,
+        struct axis2_svc *svc_desc);
+
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN struct axis2_svc *AXIS2_CALL
+    axis2_arch_file_data_get_svc(const axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env,
+        axis2_char_t *svc_name);
+
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
+    axis2_arch_file_data_get_svc_map(const axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env);
+
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+    axis2_arch_file_data_get_deployable_svcs(const axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env);
+
+    /** 
+     * @param file_data pointer to arch_file_data
+     * @param env pointer to environment struct
+     * @param deployable_svcs pointer to deployable services
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_arch_file_data_set_deployable_svcs(axis2_arch_file_data_t *file_data,
+        const axis2_env_t *env,
+        axis2_array_list_t *deployable_svcs);
 
     /**
      * Creates arch file data struct
@@ -238,8 +203,7 @@
      * @return pointer to newly created arch file data
      */
     AXIS2_EXTERN axis2_arch_file_data_t *AXIS2_CALL
-    axis2_arch_file_data_create(
-        const axis2_env_t *env);
+    axis2_arch_file_data_create(const axis2_env_t *env);
 
     /**
      * Creates arch file data struct
@@ -249,8 +213,7 @@
      * @return pointer to newly created arch file data
      */
     AXIS2_EXTERN axis2_arch_file_data_t *AXIS2_CALL
-    axis2_arch_file_data_create_with_type_and_file(
-        const axis2_env_t *env,
+    axis2_arch_file_data_create_with_type_and_file(const axis2_env_t *env,
         int type,
         axis2_file_t *file);
 
@@ -262,94 +225,73 @@
      * @return pointer to newly created arch file data
      */
     AXIS2_EXTERN axis2_arch_file_data_t *AXIS2_CALL
-    axis2_arch_file_data_create_with_type_and_name(
-        const axis2_env_t *env,
+    axis2_arch_file_data_create_with_type_and_name(const axis2_env_t *env,
         int type,
         const axis2_char_t *name);
 
-/*************************** Function macros **********************************/
-
-/** Frees the arch file data struct.
-    @sa axis2_arch_file_data_ops#free */
+/** Frees the arch file data struct. */
 #define AXIS2_ARCH_FILE_DATA_FREE(arch_file_data, env) \
-      ((arch_file_data)->ops->free (arch_file_data, env))
+      axis2_arch_file_data_free (arch_file_data, env)
 
-/** Gets the message receiver.
-    @sa axis2_arch_file_data_ops#get_msg_recv */
+/** Gets the message receiver. */
 #define AXIS2_ARCH_FILE_DATA_GET_MSG_RECV(arch_file_data, env) \
-      ((arch_file_data)->ops->get_msg_recv (arch_file_data, env))
+      axis2_arch_file_data_get_msg_recv (arch_file_data, env)
 
-/** Sets the message receiver.
-    @sa axis2_arch_file_data_ops#set_msg_recv */
+/** Sets the message receiver. */
 #define AXIS2_ARCH_FILE_DATA_SET_MSG_RECV(arch_file_data, env, msg_recv) \
-      ((arch_file_data)->ops->set_msg_recv (arch_file_data, env, msg_recv))
+      axis2_arch_file_data_set_msg_recv (arch_file_data, env, msg_recv)
 
-/** Gets the name.
-    @sa axis2_arch_file_data_ops#get_name */
+/** Gets the name. */
 #define AXIS2_ARCH_FILE_DATA_GET_NAME(arch_file_data, env) \
-      ((arch_file_data)->ops->get_name (arch_file_data, env))
+      axis2_arch_file_data_get_name (arch_file_data, env)
 
-/** Gets the service name.
-    @sa axis2_arch_file_data_ops#get_svc_name */
+/** Gets the service name. */
 #define AXIS2_ARCH_FILE_DATA_GET_SVC_NAME(arch_file_data, env) \
-      ((arch_file_data)->ops->get_svc_name (arch_file_data, env))
+      axis2_arch_file_data_get_svc_name (arch_file_data, env)
 
-/** Gets the type.
-    @sa axis2_arch_file_data_ops#get_type */
+/** Gets the type. */
 #define AXIS2_ARCH_FILE_DATA_GET_TYPE(arch_file_data, env) \
-      ((arch_file_data)->ops->get_type (arch_file_data, env))
+      axis2_arch_file_data_get_type (arch_file_data, env)
 
-/** Gets the file.
-    @sa axis2_arch_file_data_ops#get_file */
+/** Gets the file. */
 #define AXIS2_ARCH_FILE_DATA_GET_FILE(arch_file_data, env) \
-      ((arch_file_data)->ops->get_file (arch_file_data, env))
+      axis2_arch_file_data_get_file (arch_file_data, env)
 
-/** Gets the module name.
-    @sa axis2_arch_file_data_ops#get_module */
+/** Gets the module name. */
 #define AXIS2_ARCH_FILE_DATA_GET_MODULE_NAME(arch_file_data, env) \
-      ((arch_file_data)->ops->get_module_name (arch_file_data, env))
+      axis2_arch_file_data_get_module_name (arch_file_data, env)
 
-/** Sets the module name.
-    @sa axis2_arch_file_data_ops#set_module_name */
+/** Sets the module name. */
 #define AXIS2_ARCH_FILE_DATA_SET_MODULE_NAME(arch_file_data, env, module_name) \
-      ((arch_file_data)->ops->set_module_name (arch_file_data, env, module_name))
+      axis2_arch_file_data_set_module_name (arch_file_data, env, module_name)
 
-/** Gets the module dll name.
-    @sa axis2_arch_file_data_ops#get_module_dll_name */
+/** Gets the module dll name. */
 #define AXIS2_ARCH_FILE_DATA_GET_MODULE_DLL_NAME(arch_file_data, env) \
-      ((arch_file_data)->ops->get_module_dll_name (arch_file_data, env))
+      axis2_arch_file_data_get_module_dll_name (arch_file_data, env)
 
-/** Sets the module dll name.
-    @sa axis2_arch_file_data_ops#set_module_dll_name */
+/** Sets the module dll name. */
 #define AXIS2_ARCH_FILE_DATA_SET_MODULE_DLL_NAME(arch_file_data, env, class_name) \
-      ((arch_file_data)->ops->set_module_dll_name (arch_file_data, env, class_name))
+      axis2_arch_file_data_set_module_dll_name (arch_file_data, env, class_name)
 
-/** Adds the service.
-    @sa axis2_arch_file_data_ops#add_svc */
+/** Adds the service. */
 #define AXIS2_ARCH_FILE_DATA_ADD_SVC(arch_file_data, env, svc_desc) \
-      ((arch_file_data)->ops->add_svc (arch_file_data, env, svc_desc))
+      axis2_arch_file_data_add_svc (arch_file_data, env, svc_desc)
 
-/** Gets the service.
-    @sa axis2_arch_file_data_ops#get_svc */
+/** Gets the service. */
 #define AXIS2_ARCH_FILE_DATA_GET_SVC(arch_file_data, env, svc_name) \
-      ((arch_file_data)->ops->get_svc (arch_file_data, env, svc_name))
+      axis2_arch_file_data_get_svc (arch_file_data, env, svc_name)
 
-/** Gets the service map.
-    @sa axis2_arch_file_data_ops#get_svc_map */
+/** Gets the service map. */
 #define AXIS2_ARCH_FILE_DATA_GET_SVC_MAP(arch_file_data, env) \
-      ((arch_file_data)->ops->get_svc_map (arch_file_data, env))
+      axis2_arch_file_data_get_svc_map (arch_file_data, env)
 
-/** Gets the deployable services.
-    @sa axis2_arch_file_data_ops#get_deployable_svcs */
+/** Gets the deployable services. */
 #define AXIS2_ARCH_FILE_DATA_GET_DEPLOYABLE_SVCS(arch_file_data, env) \
-      ((arch_file_data)->ops->get_deployable_svcs (arch_file_data, env))
+      axis2_arch_file_data_get_deployable_svcs (arch_file_data, env)
 
-/** Sets the deployable services.
-    @sa axis2_arch_file_data_ops#set_deployable_svcs */
+/** Sets the deployable services. */
 #define AXIS2_ARCH_FILE_DATA_SET_DEPLOYABLE_SVCS(arch_file_data, env, deployable_svcs) \
-      ((arch_file_data)->ops->set_deployable_svcs (arch_file_data, env, deployable_svcs))
-
-/*************************** End of function macros ***************************/
+      axis2_arch_file_data_set_deployable_svcs (arch_file_data, env, deployable_svcs)
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h Thu Mar 15 06:16:07 2007
@@ -51,109 +51,86 @@
     struct axis2_conf;
     struct axis2_arch_file_data;
     struct axis2_dep_engine;
+
     /** Type name for struct axis2_arch_reader */
     typedef struct axis2_arch_reader axis2_arch_reader_t;
-    /** Type name for struct axis2_arch_reader_ops */
-    typedef struct axis2_arch_reader_ops axis2_arch_reader_ops_t;
+
+    /** 
+     * De-allocate memory
+     * @param arch_reader pointer to arch reader
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_arch_reader_free(axis2_arch_reader_t *arch_reader,
+        const axis2_env_t *env);
+
 
     /**
-     * Arch Reader ops struct
-     * Encapsulator struct for ops of axis2_arch_reader
+     * To create a ServiceDescrption <code>AxisService</code>   using given wsdl.
+     * If the service.wsdl is there in the arcive file AxisService will be creted 
+     * using that, else default AxisService will be created
+     * @param arch_reader pointer to arch reader
+     * @param env pointer to environment struct
+     * @param file pointer to file
      */
-    struct axis2_arch_reader_ops
-    {
-        /** 
-         * De-allocate memory
-         * @param arch_reader pointer to arch reader
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                free)(
-                    axis2_arch_reader_t *arch_reader,
-                    const axis2_env_t *env);
-
-
-        /**
-         * To create a ServiceDescrption <code>AxisService</code>   using given wsdl.
-         * If the service.wsdl is there in the arcive file AxisService will be creted 
-         * using that, else default AxisService will be created
-         * @param arch_reader pointer to arch reader
-         * @param env pointer to environment struct
-         * @param file pointer to file
-         */
-        struct axis2_svc *(AXIS2_CALL *
-                create_svc)(
-                    axis2_arch_reader_t *arch_reader,
-                    const axis2_env_t *env,
-                    struct axis2_arch_file_data *file);
-
-        /**
-         * it take two arguments filename and refereance to DeployEngine
-         * @param arch_reader pointer to arch reader
-         * @param env pointer to environment struct
-         * @param file_name pointer to file name
-         * @param dep_engine pointer to deployment engine
-         * @param svc_grp pointer to service group
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                process_svc_grp)(
-                    axis2_arch_reader_t *arch_reader,
-                    const axis2_env_t *env,
-                    axis2_char_t *file_name,
-                    struct axis2_dep_engine *dep_engine,
-                    axis2_svc_grp_t *svc_grp);
-
-        /** 
-         * @param arch_reader pointer to arch reader
-         * @param env pointer to environment struct
-         * @param file_path pointer to file path
-         * @param dep_engine pointer to deployment engine
-         * @param svc_grp pointer to service group
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                build_svc_grp)(
-                    axis2_arch_reader_t *arch_reader,
-                    const axis2_env_t *env,
-                    axis2_char_t *file_path,
-                    struct axis2_dep_engine *dep_engine,
-                    struct axis2_svc_grp *svc_grp);
-
-        /** 
-         * @param arch_reader pointer to arch reader
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                read_module_arch)(
-                    axis2_arch_reader_t *arch_reader,
-                    const axis2_env_t *env,
-                    axis2_char_t *file_path,
-                    struct axis2_dep_engine *dep_engine,
-                    axis2_module_desc_t *module);
-
-        /** 
-         * @param arch_reader pointer to arch reader
-         * @param env pointer to environment struct
-         * @param module_name pointer to module name
-         */
-        axis2_file_t *(AXIS2_CALL *
-                create_module_arch)(
-                    axis2_arch_reader_t *arch_reader,
-                    const axis2_env_t *env,
-                    axis2_char_t *module_name);
-    };
+    AXIS2_EXTERN struct axis2_svc *AXIS2_CALL
+    axis2_arch_reader_create_svc(axis2_arch_reader_t *arch_reader,
+        const axis2_env_t *env,
+        struct axis2_arch_file_data *file);
 
     /**
-     *Arch Reader struct 
+     * it take two arguments filename and refereance to DeployEngine
+     * @param arch_reader pointer to arch reader
+     * @param env pointer to environment struct
+     * @param file_name pointer to file name
+     * @param dep_engine pointer to deployment engine
+     * @param svc_grp pointer to service group
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_arch_reader_process_svc_grp(axis2_arch_reader_t *arch_reader,
+        const axis2_env_t *env,
+        axis2_char_t *file_name,
+        struct axis2_dep_engine *dep_engine,
+        axis2_svc_grp_t *svc_grp);
+
+    /** 
+     * @param arch_reader pointer to arch reader
+     * @param env pointer to environment struct
+     * @param file_path pointer to file path
+     * @param dep_engine pointer to deployment engine
+     * @param svc_grp pointer to service group
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_arch_reader_build_svc_grp(axis2_arch_reader_t *arch_reader,
+        const axis2_env_t *env,
+        axis2_char_t *file_path,
+        struct axis2_dep_engine *dep_engine,
+        struct axis2_svc_grp *svc_grp);
+
+    /** 
+     * @param arch_reader pointer to arch reader
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_arch_reader_read_module_arch(axis2_arch_reader_t *arch_reader,
+        const axis2_env_t *env,
+        axis2_char_t *file_path,
+        struct axis2_dep_engine *dep_engine,
+        axis2_module_desc_t *module);
+
+    /** 
+     * @param arch_reader pointer to arch reader
+     * @param env pointer to environment struct
+     * @param module_name pointer to module name
      */
-    struct axis2_arch_reader
-    {
-        /** Operations of arch reader */
-        axis2_arch_reader_ops_t *ops;
-    };
+    AXIS2_EXTERN axis2_file_t *AXIS2_CALL
+    axis2_arch_reader_create_module_arch(axis2_arch_reader_t *arch_reader,
+        const axis2_env_t *env,
+        axis2_char_t *module_name);
 
     /**
      * Creates arch reader struct
@@ -161,43 +138,32 @@
      * @return pointer to newly created arch reader
      */
     AXIS2_EXTERN axis2_arch_reader_t *AXIS2_CALL
-    axis2_arch_reader_create(
-        const axis2_env_t *env);
+    axis2_arch_reader_create(const axis2_env_t *env);
 
 
-/*************************** Function macros **********************************/
-
-/** Frees the arch reader.
-    @sa axis2_arch_reader_ops#free */
+/** Frees the arch reader. */
 #define AXIS2_ARCH_READER_FREE(arch_reader, env) \
-      ((arch_reader)->ops->free (arch_reader, env))
+      axis2_arch_reader_free (arch_reader, env)
 
-/** Creates the service.
-    @sa axis2_arch_reader_ops#create_svc */
+/** Creates the service. */
 #define AXIS2_ARCH_READER_CREATE_SVC(arch_reader, env, file) \
-      ((arch_reader)->ops->create_svc (arch_reader, env, file))
+      axis2_arch_reader_create_svc (arch_reader, env, file)
 
-/** Process service group.
-    @sa axis2_arch_reader_ops#process_svc_grp */
+/** Process service group. */
 #define AXIS2_ARCH_READER_PROCESS_SVC_GRP(arch_reader, env, file_path, dep_engine, svc_grp) \
-      ((arch_reader)->ops->process_svc_grp (arch_reader, env, file_path, dep_engine, svc_grp))
+      axis2_arch_reader_process_svc_grp (arch_reader, env, file_path, dep_engine, svc_grp)
 
-/** Builds the service group.
-    @sa axis2_arch_reader_ops#build_svc_grp */
+/** Builds the service group. */
 #define AXIS2_ARCH_READER_BUILD_SVC_GRP(arch_reader, env, file_name, dep_engine, svc_grp) \
-      ((arch_reader)->ops->build_svc_grp (arch_reader, env, file_name, dep_engine, svc_grp))
+      axis2_arch_reader_build_svc_grp (arch_reader, env, file_name, dep_engine, svc_grp)
 
-/** Reads the module archive.
-    @sa axis2_arch_reader_ops#read_module_arch */
+/** Reads the module archive.*/
 #define AXIS2_ARCH_READER_READ_MODULE_ARCH(arch_reader, env, file_path, dep_engine, module) \
-      ((arch_reader)->ops->read_module_arch (arch_reader, env, file_path, dep_engine, module))
+      axis2_arch_reader_read_module_arch (arch_reader, env, file_path, dep_engine, module)
 
-/** Creates the module archive.
-    @sa axis2_arch_reader_ops#create_module_arch */
+/** Creates the module archive. */
 #define AXIS2_ARCH_READER_CREATE_MODULE_ARCH(arch_reader, env, module_name) \
-      ((arch_reader)->ops->create_module_arch (arch_reader, env, module_name))
-
-/*************************** End of function macros ***************************/
+      axis2_arch_reader_create_module_arch (arch_reader, env, module_name)
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h Thu Mar 15 06:16:07 2007
@@ -49,59 +49,37 @@
     struct axis2_dep_engine;
     /** Type name for struct axis2_conf_builder */
     typedef struct axis2_conf_builder axis2_conf_builder_t;
-    /** Type name for struct axis2_conf_builder_ops */
-    typedef struct axis2_conf_builder_ops axis2_conf_builder_ops_t;
 
-    /**
-     * Conf Builder ops struct
-     * Encapsulator struct for ops of axis2_conf_builder
+    /** 
+     * De-allocate memory
+     * @param conf_builder pointer to configuration builder
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
-    struct axis2_conf_builder_ops
-    {
-        /** 
-         * De-allocate memory
-         * @param conf_builder pointer to configuration builder
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                free)(
-                    axis2_conf_builder_t *conf_builder,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param conf_builder pointer to configuration builder
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                populate_conf)(
-                    axis2_conf_builder_t *conf_builder,
-                    const axis2_env_t *env);
-
-        /**
-         * To get the list og modules that is requird to be engage globally
-         * @param conf_builder pointer to configuration builder
-         * @param env pointer to environment struct
-         * @param module_refs pointer to module refs
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                process_module_refs)(
-                    axis2_conf_builder_t *conf_builder,
-                    const axis2_env_t *env,
-                    axiom_children_qname_iterator_t *module_refs);
-    };
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_conf_builder_free(axis2_conf_builder_t *conf_builder,
+        const axis2_env_t *env);
+
+    /** 
+     * @param conf_builder pointer to configuration builder
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_conf_builder_populate_conf(axis2_conf_builder_t *conf_builder,
+        const axis2_env_t *env);
 
     /**
-     * Conf Builder struct 
+     * To get the list og modules that is requird to be engage globally
+     * @param conf_builder pointer to configuration builder
+     * @param env pointer to environment struct
+     * @param module_refs pointer to module refs
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
-    struct axis2_conf_builder
-    {
-        /** Operations of conf builder */
-        axis2_conf_builder_ops_t *ops;
-        struct axis2_desc_builder *desc_builder;
-    };
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_conf_builder_process_module_refs(axis2_conf_builder_t *conf_builder,
+        const axis2_env_t *env,
+        axiom_children_qname_iterator_t *module_refs);
 
     /**
      * Creates conf builder struct
@@ -109,8 +87,7 @@
      * @return pointer to newly created conf builder
      */
     AXIS2_EXTERN axis2_conf_builder_t *AXIS2_CALL
-    axis2_conf_builder_create (
-        const axis2_env_t *env);
+    axis2_conf_builder_create (const axis2_env_t *env);
 
     /**
      * Creates conf builder struct
@@ -122,31 +99,23 @@
      */
 
     AXIS2_EXTERN axis2_conf_builder_t *AXIS2_CALL
-    axis2_conf_builder_create_with_file_and_dep_engine_and_conf(
-        const axis2_env_t *env,
+    axis2_conf_builder_create_with_file_and_dep_engine_and_conf(const axis2_env_t *env,
         axis2_char_t *file,
         struct axis2_dep_engine *dep_engine,
         axis2_conf_t *conf);
 
-/*************************** Function macros **********************************/
-
-/** Frees the conf builder
-    @sa axis2_conf_builder_ops#free */
+/** Frees the conf builder */
 #define AXIS2_CONF_BUILDER_FREE(conf_builder, env) \
-      ((conf_builder)->ops->free (conf_builder, env))
+      axis2_conf_builder_free (conf_builder, env)
 
-/** Populate conf.
-    @sa axis2_conf_builder_ops#populate_conf */
+/** Populate conf. */
 #define AXIS2_CONF_BUILDER_POPULATE_CONF(conf_builder, env) \
-      ((conf_builder)->ops->populate_conf (conf_builder, env))
+      axis2_conf_builder_populate_conf (conf_builder, env)
 
-/** Process module refs.
-    @sa axis2_conf_builder_ops#process_module_refs */
+/** Process module refs. */
 #define AXIS2_CONF_BUILDER_PROCESS_MODULE_REFS(conf_builder, env, module_refs) \
-      ((conf_builder)->ops->process_module_refs (conf_builder, env, module_refs))
-
+      axis2_conf_builder_process_module_refs (conf_builder, env, module_refs)
 
-/*************************** End of function macros ***************************/
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h Thu Mar 15 06:16:07 2007
@@ -52,249 +52,211 @@
 
     /** Type name for struct axis2_dep_engine */
     typedef struct axis2_dep_engine axis2_dep_engine_t;
-    /** Type name for struct axis2_dep_engine_ops */
-    typedef struct axis2_dep_engine_ops axis2_dep_engine_ops_t;
+
+    /** 
+     * De-allocate memory
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dep_engine_free(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env);
+
+
+    /**
+     * while parsing the axis2.xml the module refferences have to be stored some 
+     * where , since at that time none of module availble (they load after parsing 
+     * the document)
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @param module_qname <code>QName</code>
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dep_engine_add_module(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env,
+        axis2_qname_t *module_qname);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @param module_name pointer to module name
+     */
+    AXIS2_EXTERN struct axis2_module_desc *AXIS2_CALL
+    axis2_dep_engine_get_module(const axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env,
+        axis2_qname_t *module_name);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN struct axis2_arch_file_data *AXIS2_CALL
+    axis2_dep_engine_get_current_file_item(const axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @param file pointer to file
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dep_engine_add_ws_to_deploy(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env,
+        struct axis2_arch_file_data *file);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @param file pointer to file
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dep_engine_add_ws_to_undeploy(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env,
+        struct axis2_ws_info *file);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN struct axis2_phases_info *AXIS2_CALL
+    axis2_dep_engine_get_phases_info(const axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env);
+
+    /**
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @return AxisConfiguration <code>AxisConfiguration</code>
+     */
+    AXIS2_EXTERN struct axis2_conf *AXIS2_CALL
+    axis2_dep_engine_get_axis_conf(const axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN struct axis2_conf *AXIS2_CALL
+    axis2_dep_engine_load(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN struct axis2_conf *AXIS2_CALL
+    axis2_dep_engine_load_client(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env,
+        const axis2_char_t *client_home);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @param dll_name pointer to dll_name
+     */
+    AXIS2_EXTERN void *AXIS2_CALL
+    axis2_dep_engine_get_handler_dll(const axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env,
+        axis2_char_t *dll_name);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dep_engine_do_deploy(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dep_engine_undeploy(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+    axis2_dep_engine_is_hot_update(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @param phases_info pointer to phases info
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dep_engine_set_phases_info(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env,
+        struct axis2_phases_info *phases_info);
 
     /**
-     * Deployment Engine ops struct
-     * Encapsulator struct for ops of axis2_dep_engine
+     * This method is used to fill a axisservice object using services.xml , first it should create
+     * an axisservice object using WSDL and then fill that using given servic.xml and load all the requed
+     * class and build the chains , finally add the  servicecontext to EngineContext and axisservice into
+     * EngineConfiguration
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @param svc pointer to service
+     * @param file_name pointer to file name
      */
-    struct axis2_dep_engine_ops
-    {
-        /** 
-         * De-allocate memory
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                free)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env);
-
-
-        /**
-         * while parsing the axis2.xml the module refferences have to be stored some 
-         * where , since at that time none of module availble (they load after parsing 
-         * the document)
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @param module_qname <code>QName</code>
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_module)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env,
-                    axis2_qname_t *module_qname);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @param module_name pointer to module name
-         */
-        struct axis2_module_desc *(AXIS2_CALL *
-                get_module)(
-                    const axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env,
-                    axis2_qname_t *module_name);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         */
-        struct axis2_arch_file_data *(AXIS2_CALL *
-                get_current_file_item)(
-                    const axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @param file pointer to file
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_ws_to_deploy)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env,
-                    struct axis2_arch_file_data *file);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @param file pointer to file
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_ws_to_undeploy)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env,
-                    struct axis2_ws_info *file);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         */
-        struct axis2_phases_info *(AXIS2_CALL *
-                get_phases_info)(
-                    const axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env);
-
-        /**
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @return AxisConfiguration <code>AxisConfiguration</code>
-         */
-        struct axis2_conf *(AXIS2_CALL *
-                get_axis_conf)(
-                    const axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         */
-        struct axis2_conf *(AXIS2_CALL *
-                load)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         */
-        struct axis2_conf *(AXIS2_CALL *
-                load_client)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env,
-                    const axis2_char_t *client_home);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @param dll_name pointer to dll_name
-         */
-        void *(AXIS2_CALL *
-                get_handler_dll)(
-                    const axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env,
-                    axis2_char_t *dll_name);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                do_deploy)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                undeploy)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         */
-        axis2_bool_t (AXIS2_CALL *
-                is_hot_update)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @param phases_info pointer to phases info
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_phases_info)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env,
-                    struct axis2_phases_info *phases_info);
-
-        /**
-         * This method is used to fill a axisservice object using services.xml , first it should create
-         * an axisservice object using WSDL and then fill that using given servic.xml and load all the requed
-         * class and build the chains , finally add the  servicecontext to EngineContext and axisservice into
-         * EngineConfiguration
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @param svc pointer to service
-         * @param file_name pointer to file name
-         */
-        struct axis2_svc *(AXIS2_CALL *
-                build_svc)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env,
-                    struct axis2_svc *svc,
-                    axis2_char_t *file_name);
-
-        /**
-         * This method can be used to build ModuleDescription for a given module archiev file
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @param module_archive pointer to module archive
-         * @param conf pointer to conf
-         */
-        struct axis2_module_desc *(AXIS2_CALL *
-                build_module)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env,
-                    axis2_file_t *module_archive,
-                    struct axis2_conf *conf);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         */
-        axis2_char_t *(AXIS2_CALL *
-                get_repos_path)(
-                    const axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @param file_data pointer to file data
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_current_file_item)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env,
-                    struct axis2_arch_file_data *file_data);
-
-        /** 
-         * @param dep_engine pointer to deployment engine
-         * @param env pointer to environment struct
-         * @param arch_reader pointer to arch reader
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_arch_reader)(
-                    axis2_dep_engine_t *dep_engine,
-                    const axis2_env_t *env,
-                    struct axis2_arch_reader *arch_reader);
-    };
+    AXIS2_EXTERN struct axis2_svc *AXIS2_CALL
+    axis2_dep_engine_build_svc(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env,
+        struct axis2_svc *svc,
+        axis2_char_t *file_name);
 
     /**
-     * Deployment Engine struct 
+     * This method can be used to build ModuleDescription for a given module archiev file
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @param module_archive pointer to module archive
+     * @param conf pointer to conf
      */
-    struct axis2_dep_engine
-    {
-        /** Operations of deployment engine */
-        axis2_dep_engine_ops_t *ops;
-    };
+    AXIS2_EXTERN struct axis2_module_desc *AXIS2_CALL
+    axis2_dep_engine_build_module(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env,
+        axis2_file_t *module_archive,
+        struct axis2_conf *conf);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    axis2_dep_engine_get_repos_path(const axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @param file_data pointer to file data
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dep_engine_set_current_file_item(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env,
+        struct axis2_arch_file_data *file_data);
+
+    /** 
+     * @param dep_engine pointer to deployment engine
+     * @param env pointer to environment struct
+     * @param arch_reader pointer to arch reader
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dep_engine_set_arch_reader(axis2_dep_engine_t *dep_engine,
+        const axis2_env_t *env,
+        struct axis2_arch_reader *arch_reader);
 
     /**
      * No param constructor is need to deploye module and service programatically
@@ -302,8 +264,7 @@
      * @return pointer to newly created deployment engine
      */
     AXIS2_EXTERN axis2_dep_engine_t *AXIS2_CALL
-    axis2_dep_engine_create(
-        const axis2_env_t *env);
+    axis2_dep_engine_create(const axis2_env_t *env);
 
     /**
      * Creates description builder struct
@@ -314,8 +275,7 @@
      * @return pointer to newly created deployment engine
      */
     AXIS2_EXTERN axis2_dep_engine_t *AXIS2_CALL
-    axis2_dep_engine_create_with_repos_name(
-        const axis2_env_t *env,
+    axis2_dep_engine_create_with_repos_name(const axis2_env_t *env,
         const axis2_char_t *repos_path);
 
     /**
@@ -326,114 +286,89 @@
      * @return pointer to newly created deployment engine
      */
     AXIS2_EXTERN axis2_dep_engine_t *AXIS2_CALL
-    axis2_dep_engine_create_with_repos_name_and_svr_xml_file(
-        const axis2_env_t *env,
+    axis2_dep_engine_create_with_repos_name_and_svr_xml_file(const axis2_env_t *env,
         const axis2_char_t *repos_path,
         const axis2_char_t *svr_xml_file);
 
-/*************************** Function macros **********************************/
-
-/** Frees the deployment engine.
-    @sa axis2_dep_engine_ops#free */
+/** Frees the deployment engine. */
 #define AXIS2_DEP_ENGINE_FREE(dep_engine, env) \
-      ((dep_engine)->ops->free (dep_engine, env))
+      axis2_dep_engine_free (dep_engine, env)
 
-/** Adds the module.
-    @sa axis2_dep_engine_ops#add_module */
+/** Adds the module. */
 #define AXIS2_DEP_ENGINE_ADD_MODULE(dep_engine, env, module_qname) \
-      ((dep_engine)->ops->add_module (dep_engine, env, module_qname))
+      axis2_dep_engine_add_module (dep_engine, env, module_qname)
 
-/** Get module.
-    @sa axis2_dep_engine_ops#get_module */
+/** Get module. */
 #define AXIS2_DEP_ENGINE_GET_MODULE(dep_engine, env, module_qname) \
-      ((dep_engine)->ops->get_module (dep_engine, env, module_qname))
+      axis2_dep_engine_get_module (dep_engine, env, module_qname)
 
-/** Gets the current file item.
-    @sa axis2_dep_engine_ops#get_current_file_item */
+/** Gets the current file item. */
 #define AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(dep_engine, env) \
-      ((dep_engine)->ops->get_current_file_item (dep_engine, env))
+      axis2_dep_engine_get_current_file_item (dep_engine, env)
 
-/** Adds web service to deploy.
-    @sa axis2_dep_engine_ops#add_ws_to_deploy */
+/** Adds web service to deploy. */
 #define AXIS2_DEP_ENGINE_ADD_WS_TO_DEPLOY(dep_engine, env, file) \
-      ((dep_engine)->ops->add_ws_to_deploy (dep_engine, env, file))
+      axis2_dep_engine_add_ws_to_deploy (dep_engine, env, file)
 
-/** Adds web service to undelploy
-    @sa axis2_dep_engine_ops#add_ws_to_undeploy */
+/** Adds web service to undelploy */
 #define AXIS2_DEP_ENGINE_ADD_WS_TO_UNDEPLOY(dep_engine, env, file) \
-      ((dep_engine)->ops->add_ws_to_undeploy (dep_engine, env, file))
+      axis2_dep_engine_add_ws_to_undeploy (dep_engine, env, file)
 
-/** Do deploy.
-    @sa axis2_dep_engine_ops#do_deploy */
+/** Do deploy. */
 #define AXIS2_DEP_ENGINE_DO_DEPLOY(dep_engine, env) \
-      ((dep_engine)->ops->do_deploy (dep_engine, env))
+      axis2_dep_engine_do_deploy (dep_engine, env)
 
-/** Undeploy.
-    @sa axis2_dep_engine_ops#undeploy */
+/** Undeploy. */
 #define AXIS2_DEP_ENGINE_UNDEPLOY(dep_engine, env) \
-      ((dep_engine)->ops->undeploy (dep_engine, env))
+      axis2_dep_engine_undeploy (dep_engine, env)
 
-/** Gets the phases infomation..
-    @sa axis2_dep_engine_ops#get_phases_info */
+/** Gets the phases infomation. */
 #define AXIS2_DEP_ENGINE_GET_PHASES_INFO(dep_engine, env) \
-      ((dep_engine)->ops->get_phases_info (dep_engine, env))
+      axis2_dep_engine_get_phases_info (dep_engine, env)
 
-/** Gets the axis2 configuration.
-    @sa axis2_dep_engine_ops#get_axis2_conf */
+/** Gets the axis2 configuration. */
 #define AXIS2_DEP_ENGINE_GET_AXIS2_CONF(dep_engine, env) \
-      ((dep_engine)->ops->get_axis_conf (dep_engine, env))
+      axis2_dep_engine_get_axis_conf (dep_engine, env)
 
-/** Load.
-    @sa axis2_dep_engine_ops#load */
+/** Load.*/
 #define AXIS2_DEP_ENGINE_LOAD(dep_engine, env) \
-      ((dep_engine)->ops->load (dep_engine, env))
+      axis2_dep_engine_load (dep_engine, env)
 
-/** Loads the client.
-    @sa axis2_dep_engine_ops#load_client */
+/** Loads the client. */
 #define AXIS2_DEP_ENGINE_LOAD_CLIENT(dep_engine, env, client_home) \
-      ((dep_engine)->ops->load_client (dep_engine, env, client_home))
+      axis2_dep_engine_load_client (dep_engine, env, client_home)
 
-/** Gets the handler dll.
-    @sa axis2_dep_engine_ops#get_handler_dll */
+/** Gets the handler dll. */
 #define AXIS2_DEP_ENGINE_GET_HANDLER_DLL(dep_engine, env, dll_name) \
-      ((dep_engine)->ops->get_handler_dll (dep_engine, env, dll_name))
+      axis2_dep_engine_get_handler_dll (dep_engine, env, dll_name)
 
-/** Is hot update.
-    @sa axis2_dep_engine_ops#is_hot_update */
+/** Is hot update. */
 #define AXIS2_DEP_ENGINE_IS_HOT_UPDATE(dep_engine, env) \
-      ((dep_engine)->ops->is_hot_update (dep_engine, env))
+      axis2_dep_engine_is_hot_update (dep_engine, env)
 
-/** Sets phases info.
-    @sa axis2_dep_engine_ops#set_phases_info */
+/** Sets phases info. */
 #define AXIS2_DEP_ENGINE_SET_PHASES_INFO(dep_engine, env, phases_info) \
-      ((dep_engine)->ops->set_phases_info (dep_engine, env, phases_info))
+      axis2_dep_engine_set_phases_info (dep_engine, env, phases_info)
 
-/** Build the service.
-    @sa axis2_dep_engine_ops#build_svc */
+/** Build the service. */
 #define AXIS2_DEP_ENGINE_BUILD_SVC(dep_engine, env, svc, file_name) \
-      ((dep_engine)->ops->build_svc (dep_engine, env, svc, file_name))
+      axis2_dep_engine_build_svc (dep_engine, env, svc, file_name)
 
-/** Builds the module.
-    @sa axis2_dep_engine_ops#build_module */
+/** Builds the module. */
 #define AXIS2_DEP_ENGINE_BUILD_MODULE(dep_engine, env, module_archive, conf) \
-      ((dep_engine)->ops->build_module (dep_engine, env, module_archive, conf))
+      axis2_dep_engine_build_module (dep_engine, env, module_archive, conf)
 
-/** Gets the repos path.
-    @sa axis2_dep_engine_ops#get_repos_path */
+/** Gets the repos path. */
 #define AXIS2_DEP_ENGINE_GET_REPOS_PATH(dep_engine, env) \
-      ((dep_engine)->ops->get_repos_path (dep_engine, env))
+      axis2_dep_engine_get_repos_path (dep_engine, env)
 
-/** Sets the current file item.
-    @sa axis2_dep_engine_ops#set_current_file_item */
+/** Sets the current file item. */
 #define AXIS2_DEP_ENGINE_SET_CURRENT_FILE_ITEM(dep_engine, env, file_data) \
-      ((dep_engine)->ops->set_current_file_item (dep_engine, env, file_data))
+      axis2_dep_engine_set_current_file_item (dep_engine, env, file_data)
 
-/** Sets the arch reader.
-    @sa axis2_dep_engine_ops#set_arch_reader */
+/** Sets the arch reader. */
 #define AXIS2_DEP_ENGINE_SET_ARCH_READER(dep_engine, env, arch_reader) \
-      ((dep_engine)->ops->set_arch_reader (dep_engine, env, arch_reader))
-
-/*************************** End of function macros ***************************/
+      axis2_dep_engine_set_arch_reader (dep_engine, env, arch_reader)
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h Thu Mar 15 06:16:07 2007
@@ -62,179 +62,152 @@
 
     /** Type name for struct axis2_desc_builder */
     typedef struct axis2_desc_builder axis2_desc_builder_t;
-    /** Type name for struct axis2_desc_builder_ops  */
-    typedef struct axis2_desc_builder_ops axis2_desc_builder_ops_t;
+
+    /** 
+     * De-allocate memory
+     * @param desc_builder pointer to desc builder
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_desc_builder_free(axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env);
 
     /**
-     * Description Builder ops struct
-     * Encapsulator struct for ops of axis2_desc_builder
+     * This will creat OMElemnt for a given descrition document (axis2.xml , 
+     * services.xml and module.xml)
+     * @param desc_builder pointer to desc builder
+     * @param env pointer to environment struct
+     * @return OMElement <code>OMElement</code>
      */
-    struct axis2_desc_builder_ops
-    {
-        /** 
-         * De-allocate memory
-         * @param desc_builder pointer to desc builder
-         * @param env pointer to environment struct
-         */
-        axis2_status_t (AXIS2_CALL *
-                free)(
-                    axis2_desc_builder_t *desc_builder,
-                    const axis2_env_t *env);
-
-        /**
-         * This will creat OMElemnt for a given descrition document (axis2.xml , 
-         * services.xml and module.xml)
-         * @param desc_builder pointer to desc builder
-         * @param env pointer to environment struct
-         * @return OMElement <code>OMElement</code>
-         */
-        axiom_node_t *(AXIS2_CALL *
-                build_OM)(
-                    axis2_desc_builder_t *desc_builder,
-                    const axis2_env_t *env);
-
-        /**
-         * To process Flow elements in services.xml
-         * @param desc_builder pointer to desc builder
-         * @param env pointer to environment struct
-         * @param flow_element <code>axiom_element_t</code>
-         * @param parent pointer to parent
-         * @param node pointer to node
-         * @return flow
-         */
-        axis2_flow_t *(AXIS2_CALL *
-                process_flow)(
-                    axis2_desc_builder_t *desc_builder,
-                    const axis2_env_t *env,
-                    axiom_element_t *flow_element,
-                    axis2_param_container_t *parent,
-                    axiom_node_t *node);
-
-        /**
-         * To process Handler element
-         * @param handler_element    <code>OMElement</code>
-         * @param desc_builder pointer to desc builder
-         * @param env pointer to environment struct
-         * @param handler_element pointer to handler element
-         * @param parent pointer to parent
-         */
-        axis2_handler_desc_t *(AXIS2_CALL *
-                process_handler)(
-                    axis2_desc_builder_t *desc_builder,
-                    const axis2_env_t *env,
-                    axiom_node_t *handler_element,
-                    axis2_param_container_t *parent);
-
-        /**
-         * To get the Param out from the OM
-         * @param desc_builder pointer to desc builder
-         * @param env pointer to environment struct
-         * @param params <code>axis2_param_t</code>
-         * @param param_container <code>axis2_param_container_t</code>
-         * @param parent <code>axis2_param_container_t</code>
-         */
-        axis2_status_t (AXIS2_CALL *
-                process_params)(
-                    axis2_desc_builder_t *desc_builder,
-                    const axis2_env_t *env,
-                    axiom_children_qname_iterator_t *params,
-                    axis2_param_container_t *param_container,
-                    axis2_param_container_t *parent );
-
-
-        /**
-         * @param desc_builder pointer to desc builder
-         * @param env pointer to environment struct
-         * @param module_refs pointer to module refs
-         * @param op pointer to op
-         */
-        axis2_status_t (AXIS2_CALL *
-                process_op_module_refs)(
-                    axis2_desc_builder_t *desc_builder,
-                    const axis2_env_t *env,
-                    axiom_children_qname_iterator_t *module_refs,
-                    axis2_op_t *op);
-
-        /**
-         * @param desc_builder pointer to desc builder
-         * @param env pointer to environment struct
-         * @param recv_element pointer to recv element
-         */
-        axis2_msg_recv_t *(AXIS2_CALL *
-                load_msg_recv)(
-                    axis2_desc_builder_t *desc_builder,
-                    const axis2_env_t *env,
-                    axiom_element_t *recv_element);
-
-        /**
-         * This method is used to retrive service name form the arechive file name
-         * if the archive file name is service1.aar , then axis service name would be service1
-         * @param desc_builder pointer to desc builder
-         * @param env pointer to environment struct
-         * @param file_name pointer to file name
-         */
-        axis2_char_t *(AXIS2_CALL *
-                get_short_file_name)(
-                    const axis2_desc_builder_t *desc_builder,
-                    const axis2_env_t *env,
-                    axis2_char_t *file_name);
-
-        /**
-         * @param desc_builder pointer to desc builder
-         * @param env pointer to environment struct
-         * @param short_file_name pointer to short file name
-         */
-        axis2_char_t *(AXIS2_CALL *
-                get_file_name_without_prefix)(
-                    const axis2_desc_builder_t *desc_builder,
-                    const axis2_env_t *env,
-                    axis2_char_t *short_file_name);
-
-        /**
-         * this method is to get the value of attribue
-         * eg xsd:anyVal --> anyVal
-         * @param desc_builder pointer to desc builder
-         * @param env pointer to environment struct
-         * @param in pointer to in
-         */
-        axis2_char_t *(AXIS2_CALL *
-                get_value)(
-                    const axis2_desc_builder_t *desc_builder,
-                    const axis2_env_t *env,
-                    axis2_char_t *in);
-        /**
-         * Populate the Axis2 Operation with details from the actionMapping,
-         * outputActionMapping and faultActionMapping elements from the operation
-         * element.
-         *
-         * @param operation
-         * @param op_desc
-         */
-        axis2_status_t (AXIS2_CALL *
-                process_action_mappings)(
-                    axis2_desc_builder_t *desc_builder,
-                    const axis2_env_t *env,
-                    axiom_node_t *op_node,
-                    axis2_op_t *op_desc);
+    AXIS2_EXTERN axiom_node_t *AXIS2_CALL
+    axis2_desc_builder_build_om(axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env);
 
-    };
+    /**
+     * To process Flow elements in services.xml
+     * @param desc_builder pointer to desc builder
+     * @param env pointer to environment struct
+     * @param flow_element <code>axiom_element_t</code>
+     * @param parent pointer to parent
+     * @param node pointer to node
+     * @return flow
+     */
+    AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
+    axis2_desc_builder_process_flow(axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axiom_element_t *flow_element,
+        axis2_param_container_t *parent,
+        axiom_node_t *node);
 
     /**
+     * To process Handler element
+     * @param handler_element    <code>OMElement</code>
+     * @param desc_builder pointer to desc builder
      * @param env pointer to environment struct
+     * @param handler_element pointer to handler element
+     * @param parent pointer to parent
      */
-    struct axis2_msg_recv *AXIS2_CALL
-    axis2_desc_builder_load_default_msg_recv(
-        const axis2_env_t *env);
+    AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
+    axis2_desc_builder_process_handler(axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axiom_node_t *handler_element,
+        axis2_param_container_t *parent);
+
+    /**
+     * To get the Param out from the OM
+     * @param desc_builder pointer to desc builder
+     * @param env pointer to environment struct
+     * @param params <code>axis2_param_t</code>
+     * @param param_container <code>axis2_param_container_t</code>
+     * @param parent <code>axis2_param_container_t</code>
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_desc_builder_process_params(axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axiom_children_qname_iterator_t *params,
+        axis2_param_container_t *param_container,
+        axis2_param_container_t *parent );
+
+
+    /**
+     * @param desc_builder pointer to desc builder
+     * @param env pointer to environment struct
+     * @param module_refs pointer to module refs
+     * @param op pointer to op
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_desc_builder_process_op_module_refs(axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axiom_children_qname_iterator_t *module_refs,
+        axis2_op_t *op);
 
     /**
-     * Description builder struct 
+     * @param desc_builder pointer to desc builder
+     * @param env pointer to environment struct
+     * @param recv_element pointer to recv element
      */
-    struct axis2_desc_builder
-    {
-        /** Operations of description builder */
-        axis2_desc_builder_ops_t *ops;
-        struct axis2_dep_engine *engine;
-    };
+    AXIS2_EXTERN axis2_msg_recv_t *AXIS2_CALL
+    axis2_desc_builder_load_msg_recv(axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axiom_element_t *recv_element);
+
+    /**
+     * This method is used to retrive service name form the arechive file name
+     * if the archive file name is service1.aar , then axis service name would be service1
+     * @param desc_builder pointer to desc builder
+     * @param env pointer to environment struct
+     * @param file_name pointer to file name
+     */
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    axis2_desc_builder_get_short_file_name(const axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axis2_char_t *file_name);
+
+    /**
+     * @param desc_builder pointer to desc builder
+     * @param env pointer to environment struct
+     * @param short_file_name pointer to short file name
+     */
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    axis2_desc_builder_get_file_name_without_prefix(const axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axis2_char_t *short_file_name);
+
+    /**
+     * this method is to get the value of attribue
+     * eg xsd:anyVal --> anyVal
+     * @param desc_builder pointer to desc builder
+     * @param env pointer to environment struct
+     * @param in pointer to in
+     */
+    AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+    axis2_desc_builder_get_value(const axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axis2_char_t *in);
+
+    /**
+     * Populate the Axis2 Operation with details from the actionMapping,
+     * outputActionMapping and faultActionMapping elements from the operation
+     * element.
+     *
+     * @param operation
+     * @param op_desc
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_desc_builder_process_action_mappings(axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env,
+        axiom_node_t *op_node,
+        axis2_op_t *op_desc);
+
+    /**
+     * @param env pointer to environment struct
+     */
+    AXIS2_EXTERN struct axis2_msg_recv *AXIS2_CALL
+    axis2_desc_builder_load_default_msg_recv(const axis2_env_t *env);
+
+    AXIS2_EXTERN struct axis2_dep_engine *AXIS2_CALL
+    axis2_desc_builder_get_dep_engine(const axis2_desc_builder_t *desc_builder,
+        const axis2_env_t *env);
 
     /**
      * Creates description builder struct
@@ -242,8 +215,7 @@
      * @return pointer to newly created description builder
      */
     AXIS2_EXTERN axis2_desc_builder_t *AXIS2_CALL
-    axis2_desc_builder_create(
-        const axis2_env_t *env);
+    axis2_desc_builder_create(const axis2_env_t *env);
 
     /**
      * Creates description builder struct
@@ -252,8 +224,7 @@
      * @return pointer to newly created description builder
      */
     AXIS2_EXTERN axis2_desc_builder_t *AXIS2_CALL
-    axis2_desc_builder_create_with_dep_engine(
-        const axis2_env_t *env,
+    axis2_desc_builder_create_with_dep_engine(const axis2_env_t *env,
         struct axis2_dep_engine *engine);
     /**
      * Creates description builder struct
@@ -263,71 +234,57 @@
      * @return pointer to newly created description builder
      */
     AXIS2_EXTERN axis2_desc_builder_t *AXIS2_CALL
-    axis2_desc_builder_create_with_file_and_dep_engine(
-        const axis2_env_t *env,
+    axis2_desc_builder_create_with_file_and_dep_engine(const axis2_env_t *env,
         axis2_char_t *file_name,
         struct axis2_dep_engine *engine);
 
-/*************************** Function macros **********************************/
-
-/** Frees the description builder.
-    @sa axis2_desc_builder_ops#free */
+/** Frees the description builder. */
 #define AXIS2_DESC_BUILDER_FREE(desc_builder, env) \
-      ((desc_builder)->ops->free (desc_builder, env))
+      axis2_desc_builder_free (desc_builder, env)
 
-/** Build om.
-    @sa axis2_desc_builder_ops#build_om */
+/** Build om. */
 #define AXIS2_DESC_BUILDER_BUILD_OM(desc_builder, env) \
-      ((desc_builder)->ops->build_OM (desc_builder, env))
+      axis2_desc_builder_build_om (desc_builder, env)
 
-/** Process flow.
-    @sa axis2_desc_builder_ops#process_flow */
+/** Process flow. */
 #define AXIS2_DESC_BUILDER_PROCESS_FLOW(desc_builder, env, flow_element, \
-        parent, node) ((desc_builder)->ops->process_flow (desc_builder, env, \
-            flow_element, parent, node))
+        parent, node) axis2_desc_builder_process_flow (desc_builder, env, \
+            flow_element, parent, node)
 
-/** Process handler.
-    @sa axis2_desc_builder_ops#get_svc */
+/** Process handler. */
 #define AXIS2_DESC_BUILDER_PROCESS_HANDLER(desc_builder, env, handler_element, \
-        parent) ((desc_builder)->ops->process_handler (desc_builder, \
-            env, handler_element, parent))
+        parent) axis2_desc_builder_process_handler (desc_builder, \
+            env, handler_element, parent)
 
-/** Process params.
-    @sa axis2_desc_builder_ops#get_svc */
+/** Process params. */
 #define AXIS2_DESC_BUILDER_PROCESS_PARAMS(desc_builder, env, params, \
-        param_container, parent) ((desc_builder)->ops->process_params \
-            (desc_builder, env, params, param_container, parent))
+        param_container, parent) axis2_desc_builder_process_params \
+            (desc_builder, env, params, param_container, parent)
 
-/** Process op module refs.
-    @sa axis2_desc_builder_ops#get_svc */
+/** Process op module refs. */
 #define AXIS2_DESC_BUILDER_PROCESS_OP_MODULE_REFS(desc_builder, env, \
-        module_refs, op) ((desc_builder)->ops->process_op_module_refs \
-            (desc_builder, env, module_refs, op))
+        module_refs, op) axis2_desc_builder_process_op_module_refs \
+            (desc_builder, env, module_refs, op)
 
-/** Loads the message receiver.
-    @sa axis2_desc_builder_ops#get_svc */
+/** Loads the message receiver. */
 #define AXIS2_DESC_BUILDER_LOAD_MSG_RECV(desc_builder, env, recv_element) \
-      ((desc_builder)->ops->load_msg_recv (desc_builder, env, recv_element))
+      axis2_desc_builder_load_msg_recv (desc_builder, env, recv_element)
 
-/** Gets the short file name.
-    @sa axis2_desc_builder_ops#get_svc */
+/** Gets the short file name. */
 #define AXIS2_DESC_BUILDER_GET_SHORT_FILE_NAME(desc_builder, env, file_name) \
-      ((desc_builder)->ops->get_short_file_name (desc_builder, env, file_name))
+      axis2_desc_builder_get_short_file_name (desc_builder, env, file_name)
 
-/** Gets the file name without prefix.
-    @sa axis2_desc_builder_ops#get_svc */
+/** Gets the file name without prefix. */
 #define AXIS2_DESC_BUILDER_GET_FILE_NAME_WITHOUT_PREFIX(desc_builder, env, file_name) \
-      ((desc_builder)->ops->get_file_name_without_prefix (desc_builder, env, file_name))
+      axis2_desc_builder_get_file_name_without_prefix (desc_builder, env, file_name)
 
-/** Gets the value.
-    @sa axis2_desc_builder_ops#get_svc */
+/** Gets the value. */
 #define AXIS2_DESC_BUILDER_GET_VALUE(desc_builder, env, in) \
-      ((desc_builder)->ops->get_value (desc_builder, env, in))
+      axis2_desc_builder_get_value (desc_builder, env, in)
 
-/** Process Action Mappings.
-    @sa axis2_desc_builder_ops#process_action_mappings */
+/** Process Action Mappings. */
 #define AXIS2_DESC_BUILDER_PROCESS_ACTION_MAPPINGS(desc_builder, env, op_node, op_desc) \
-      ((desc_builder)->ops->process_action_mappings (desc_builder, env, op_node, op_desc))
+      axis2_desc_builder_process_action_mappings (desc_builder, env, op_node, op_desc)
 
 /*************************** End of function macros ***************************/
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h Thu Mar 15 06:16:07 2007
@@ -45,46 +45,25 @@
     
     /** Type name for struct axis2_module_builder */
     typedef struct axis2_module_builder axis2_module_builder_t;
-    /** Type name for struct axis2_module_builder_ops */
-    typedef struct axis2_module_builder_ops axis2_module_builder_ops_t;
 
-    /**
-     * Module Builder ops struct
-     * Encapsulator struct for ops of axis2_module_builder
+    /** 
+     * De-allocate memory
+     * @param module_builder pointer to module builder
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
-    struct axis2_module_builder_ops
-    {
-        /** 
-         * De-allocate memory
-         * @param module_builder pointer to module builder
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                free)(
-                    axis2_module_builder_t *module_builder,
-                    const axis2_env_t *env);
-        /**
-         * @param module_builder pointer to module builder
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                populate_module)(
-                    axis2_module_builder_t *module_builder,
-                    const axis2_env_t *env);
-
-    };
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_builder_free(axis2_module_builder_t *module_builder,
+        const axis2_env_t *env);
 
     /**
-     * Module Builder struct 
+     * @param module_builder pointer to module builder
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
-    struct axis2_module_builder
-    {
-        /** Operations of Module Builder */
-        axis2_module_builder_ops_t *ops;
-        struct axis2_desc_builder *desc_builder;
-    };
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_builder_populate_module(axis2_module_builder_t *module_builder,
+        const axis2_env_t *env);
 
     /**
      * Creates module builder struct
@@ -92,8 +71,7 @@
      * @return pointer to newly created module builder
      */
     AXIS2_EXTERN axis2_module_builder_t *AXIS2_CALL
-    axis2_module_builder_create(
-        const axis2_env_t *env);
+    axis2_module_builder_create(const axis2_env_t *env);
 
     /**
      * Creates module builder struct
@@ -103,25 +81,18 @@
      * @return pointer to newly created module builder
      */
     AXIS2_EXTERN axis2_module_builder_t *AXIS2_CALL
-    axis2_module_builder_create_with_file_and_dep_engine_and_module(
-        const axis2_env_t *env,
+    axis2_module_builder_create_with_file_and_dep_engine_and_module(const axis2_env_t *env,
         axis2_char_t *file_name,
         struct axis2_dep_engine *dep_engine,
         axis2_module_desc_t *module);
 
-/*************************** Function macros **********************************/
-
-/** Frees the module builder
-    @sa axis2_module_builder_ops#free */
+/** Frees the module builder */
 #define AXIS2_MODULE_BUILDER_FREE(module_builder, env) \
-      ((module_builder)->ops->free (module_builder, env))
+      axis2_module_builder_free (module_builder, env)
 
-/** Populates the module.
-    @sa axis2_module_builder_ops#populate_module */
+/** Populates the module. */
 #define AXIS2_MODULE_BUILDER_POPULATE_MODULE(module_builder, env) \
-      ((module_builder)->ops->populate_module (module_builder, env))
-
-/*************************** End of function macros ***************************/
+      axis2_module_builder_populate_module (module_builder, env)
 
 /** @} */
 



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