You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2007/03/05 05:11:57 UTC

svn commit: r514539 [1/8] - in /webservices/axis2/trunk/c: include/ modules/core/deployment/ modules/core/description/ modules/core/engine/ modules/core/transport/http/receiver/ modules/core/transport/http/sender/

Author: samisa
Date: Sun Mar  4 20:11:56 2007
New Revision: 514539

URL: http://svn.apache.org/viewvc?view=rev&rev=514539
Log:
Removed ops from description hierarchy

Modified:
    webservices/axis2/trunk/c/include/axis2_desc.h
    webservices/axis2/trunk/c/include/axis2_flow.h
    webservices/axis2/trunk/c/include/axis2_flow_container.h
    webservices/axis2/trunk/c/include/axis2_handler_desc.h
    webservices/axis2/trunk/c/include/axis2_module_desc.h
    webservices/axis2/trunk/c/include/axis2_msg.h
    webservices/axis2/trunk/c/include/axis2_op.h
    webservices/axis2/trunk/c/include/axis2_phase_rule.h
    webservices/axis2/trunk/c/include/axis2_svc.h
    webservices/axis2/trunk/c/include/axis2_svc_grp.h
    webservices/axis2/trunk/c/include/axis2_transport_in_desc.h
    webservices/axis2/trunk/c/include/axis2_transport_out_desc.h
    webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
    webservices/axis2/trunk/c/modules/core/description/desc.c
    webservices/axis2/trunk/c/modules/core/description/flow.c
    webservices/axis2/trunk/c/modules/core/description/flow_container.c
    webservices/axis2/trunk/c/modules/core/description/handler_desc.c
    webservices/axis2/trunk/c/modules/core/description/module_desc.c
    webservices/axis2/trunk/c/modules/core/description/msg.c
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/description/phase_rule.c
    webservices/axis2/trunk/c/modules/core/description/svc.c
    webservices/axis2/trunk/c/modules/core/description/svc_grp.c
    webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
    webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
    webservices/axis2/trunk/c/modules/core/engine/conf.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c

Modified: webservices/axis2/trunk/c/include/axis2_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_desc.h?view=diff&rev=514539&r1=514538&r2=514539
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_desc.h Sun Mar  4 20:11:56 2007
@@ -39,144 +39,116 @@
 {
 #endif
 
-    /** Type name of struct axis2_desc_ops */
-    typedef struct axis2_desc_ops axis2_desc_ops_t;
     /** Type name of struct axis2_desc */
     typedef struct axis2_desc axis2_desc_t;
 
+    /** 
+     * Frees description struct.
+     * @param desc pointer to description
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    axis2_status_t AXIS2_CALL
+    axis2_desc_free(axis2_desc_t *desc,
+        const axis2_env_t *env);
+
+    /**
+     * Adds given parameter to the list of parameters.
+     * @param desc pointer to description
+     * @param env pointer to environment struct
+     * @param param pointer to parameter
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    axis2_status_t AXIS2_CALL
+    axis2_desc_add_param(axis2_desc_t *desc,
+        const axis2_env_t *env,
+        axis2_param_t *param);
+
+    /**
+     * Gets named parameter.
+     * @param desc pointer to description
+     * @param env pointer to environment struct
+     * @param param_name parameter name string
+     * @return pointer to named parameter, NULL if it does not exist
+     */
+    axis2_param_t *AXIS2_CALL
+    axis2_desc_get_param(const axis2_desc_t *desc,
+        const axis2_env_t *env,
+        const axis2_char_t *param_name);
+
     /**
-     * description ops struct.
-     * Encapsulator struct for ops of axis2_desc.
+     * Gets all parameters stored in description.
+     * @param desc pointer to description
+     * @param env pointer to environment struct
+     * @return pointer to array list containing the list of parameters
      */
-     struct axis2_desc_ops
-    {
-        /** 
-         * Frees description struct.
-         * @param desc pointer to description
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                free)(
-                    axis2_desc_t *desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Adds given parameter to the list of parameters.
-         * @param desc pointer to description
-         * @param env pointer to environment struct
-         * @param param pointer to parameter
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_param)(
-                    axis2_desc_t *desc,
-                    const axis2_env_t *env,
-                    axis2_param_t *param);
-
-        /**
-         * Gets named parameter.
-         * @param desc pointer to description
-         * @param env pointer to environment struct
-         * @param param_name parameter name string
-         * @return pointer to named parameter, NULL if it does not exist
-         */
-        axis2_param_t *(AXIS2_CALL *
-                get_param) (
-                    const axis2_desc_t *desc,
-                    const axis2_env_t *env,
-                    const axis2_char_t *param_name);
-
-        /**
-         * Gets all parameters stored in description.
-         * @param desc pointer to description
-         * @param env pointer to environment struct
-         * @return pointer to array list containing the list of parameters
-         */
-        axis2_array_list_t *(AXIS2_CALL *
-                get_all_params)(
-                    const axis2_desc_t *desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Checks if a named parameter is locked.
-         * @param desc pointer to description
-         * @param env pointer to environment struct
-         * @param param_name parameter name string
-         * @return AXIS2_TRUE if parameter is locked, else AXIS2_FALSE
-         */
-        axis2_bool_t (AXIS2_CALL *
-                is_param_locked)(
-                    const axis2_desc_t *desc,
-                    const axis2_env_t *env,
-                    const axis2_char_t *param_name);
-
-        /**
-         * Adds child to the description. The type of children is based on the
-         * level of the description hierarchy. As an example, service has 
-         * children of type operation, service group has children of type 
-         * service
-         * @param desc pointer to description
-         * @param env pointer to environment struct
-         * @param key key with which the child is to be added
-         * @param child child to be added
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_child)(
-                    const axis2_desc_t *desc,
-                    const axis2_env_t *env,
-                    const axis2_char_t *key,
-                    const void *child);
-
-        /**
-         * Gets all children. 
-         * @param desc pointer to description
-         * @param env pointer to environment struct
-         * @return pointer to hash map containing children
-         */
-        axis2_hash_t *(AXIS2_CALL *
-                get_all_children)(
-                    const axis2_desc_t *desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Gets child with given key.
-         * @param desc pointer to description
-         * @param env pointer to environment struct
-         * @param key key with which the child is stored
-         * @return pointer to child, returned as a void* value, need to cast to 
-         * correct type
-         */
-        void *(AXIS2_CALL *
-                get_child)(
-                    const axis2_desc_t *desc,
-                    const axis2_env_t *env,
-                    const axis2_char_t *key);
-
-        /**
-         * Removes the name child.
-         * @param desc pointer to description
-         * @param env pointer to environment struct
-         * @param key key that represents the child to be removed
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                remove_child)(
-                    const axis2_desc_t *desc,
-                    const axis2_env_t *env,
-                    const axis2_char_t *key);
-    };
-
-    /**
-     * description struct.
-     */
-     struct axis2_desc
-    {
-        /** operations of message */
-        axis2_desc_ops_t *ops;
+    axis2_array_list_t *AXIS2_CALL
+    axis2_desc_get_all_params(const axis2_desc_t *desc,
+        const axis2_env_t *env);
 
-    };
+    /**
+     * Checks if a named parameter is locked.
+     * @param desc pointer to description
+     * @param env pointer to environment struct
+     * @param param_name parameter name string
+     * @return AXIS2_TRUE if parameter is locked, else AXIS2_FALSE
+     */
+    axis2_bool_t AXIS2_CALL
+    axis2_desc_is_param_locked(const axis2_desc_t *desc,
+        const axis2_env_t *env,
+        const axis2_char_t *param_name);
+
+    /**
+     * Adds child to the description. The type of children is based on the
+     * level of the description hierarchy. As an example, service has 
+     * children of type operation, service group has children of type 
+     * service
+     * @param desc pointer to description
+     * @param env pointer to environment struct
+     * @param key key with which the child is to be added
+     * @param child child to be added
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    axis2_status_t AXIS2_CALL
+    axis2_desc_add_child(const axis2_desc_t *desc,
+        const axis2_env_t *env,
+        const axis2_char_t *key,
+        const void *child);
+
+    /**
+     * Gets all children. 
+     * @param desc pointer to description
+     * @param env pointer to environment struct
+     * @return pointer to hash map containing children
+     */
+    axis2_hash_t *AXIS2_CALL
+    axis2_desc_get_all_children(const axis2_desc_t *desc,
+        const axis2_env_t *env);
+
+    /**
+     * Gets child with given key.
+     * @param desc pointer to description
+     * @param env pointer to environment struct
+     * @param key key with which the child is stored
+     * @return pointer to child, returned as a void* value, need to cast to 
+     * correct type
+     */
+    void *AXIS2_CALL
+    axis2_desc_get_child(const axis2_desc_t *desc,
+        const axis2_env_t *env,
+        const axis2_char_t *key);
+
+    /**
+     * Removes the name child.
+     * @param desc pointer to description
+     * @param env pointer to environment struct
+     * @param key key that represents the child to be removed
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    axis2_status_t AXIS2_CALL
+    axis2_desc_remove_child(const axis2_desc_t *desc,
+        const axis2_env_t *env,
+        const axis2_char_t *key);
 
     /**
      * Creates a description struct instance.    
@@ -184,53 +156,43 @@
      * @return pointer to newly created description
      */
     AXIS2_EXTERN axis2_desc_t *AXIS2_CALL
-    axis2_desc_create (
-        const axis2_env_t *env);
+    axis2_desc_create (const axis2_env_t *env);
 
-/** Frees the desc.
-    @sa axis2_desc_ops#free */
+/** Frees the desc. */
 #define AXIS2_DESC_FREE(desc, env) \
-        ((desc)->ops->free (desc, env))
+        axis2_desc_free (desc, env)
 
-/** Adds given parameter.
-    @sa axis2_desc_ops#add_param*/
+/** Adds given parameter. */
 #define AXIS2_DESC_ADD_PARAM(desc, env, param) \
-      ((desc)->ops->add_param (desc, env, param))
+      axis2_desc_add_param (desc, env, param)
 
-/** Gets named parameter.
-    @sa axis2_desc_ops#get_param */
+/** Gets named parameter. */
 #define AXIS2_DESC_GET_PARAM(desc, env, key) \
-      ((desc)->ops->get_param (desc, env, key))
+      axis2_desc_get_param (desc, env, key)
 
-/** Gets the map of all parameters.
-    @sa axis2_desc_ops#get_all_params */
+/** Gets the map of all parameters. */
 #define AXIS2_DESC_GET_ALL_PARAMS(desc, env) \
-      ((desc)->ops->get_all_params (desc, env))
+      axis2_desc_get_all_params (desc, env)
 
-/** Checks if named parameter is locked.
-    @sa axis2_desc_ops#is_param_locked */
+/** Checks if named parameter is locked. */
 #define AXIS2_DESC_IS_PARAM_LOCKED(desc, env, param_name) \
-        ((desc)->ops->is_param_locked(desc, env, param_name))
+        axis2_desc_is_param_locked(desc, env, param_name)
 
-/** Adds child with given key.
-    @sa axis2_desc_ops#add_child */
+/** Adds child with given key. */
 #define AXIS2_DESC_ADD_CHILD(desc, env, key, child) \
-    ((desc)->ops->add_child(desc, env, key, child))
+    axis2_desc_add_child(desc, env, key, child)
 
-/** Gets the map of all children.
-    @sa axis2_desc_ops#get_all_children */
+/** Gets the map of all children. */
 #define AXIS2_DESC_GET_ALL_CHILDREN(desc, env) \
-    ((desc)->ops->get_all_children(desc, env))
+    axis2_desc_get_all_children(desc, env)
 
-/** Gets child with given key.
-    @sa axis2_desc_ops#get_child */
+/** Gets child with given key. */
 #define AXIS2_DESC_GET_CHILD(desc, env, key) \
-    ((desc)->ops->get_child(desc, env, key))
+    axis2_desc_get_child(desc, env, key)
 
-/** Removes child with given key.
-    @sa axis2_desc_ops#remove_child */
+/** Removes child with given key. */
 #define AXIS2_DESC_REMOVE_CHILD(desc, env, key) \
-    ((desc)->ops->remove_child(desc, env, key))
+    axis2_desc_remove_child(desc, env, key)
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/include/axis2_flow.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_flow.h?view=diff&rev=514539&r1=514538&r2=514539
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_flow.h (original)
+++ webservices/axis2/trunk/c/include/axis2_flow.h Sun Mar  4 20:11:56 2007
@@ -45,75 +45,53 @@
 {
 #endif
 
-    /** Type name for struct axis2_flow_ops */
-    typedef struct axis2_flow_ops axis2_flow_ops_t;
     /** Type name for struct axis2_flow */
     typedef struct axis2_flow axis2_flow_t;
 
 
+    /** 
+     * Frees flow struct.
+     * @param flow pointer to flow
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_flow_free(axis2_flow_t *flow,
+        const axis2_env_t *env);
+
+    /**
+     * Adds a handler description to flow.
+     * @param flow pointer to flow
+     * @param env pointer to environment struct
+     * @param handler pointer to handler description
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_flow_add_handler(axis2_flow_t *flow,
+        const axis2_env_t *env,
+        axis2_handler_desc_t *handler);
+
     /**
-     * flow ops struct.
-     * Encapsulator struct for ops of axis2_flow.
+     * Gets handler description at given index.
+     * @param flow pointer to flow
+     * @param env pointer to environment struct
+     * @param index index of the handler
+     * @return pointer to handler description
      */
-    struct axis2_flow_ops
-    {
-        /** 
-         * Frees flow struct.
-         * @param flow pointer to flow
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                free)(
-                    axis2_flow_t *flow,
-                    const axis2_env_t *env);
-
-        /**
-         * Adds a handler description to flow.
-         * @param flow pointer to flow
-         * @param env pointer to environment struct
-         * @param handler pointer to handler description
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_handler)(
-                    axis2_flow_t *flow,
-                    const axis2_env_t *env,
-                    axis2_handler_desc_t *handler);
-
-        /**
-         * Gets handler description at given index.
-         * @param flow pointer to flow
-         * @param env pointer to environment struct
-         * @param index index of the handler
-         * @return pointer to handler description
-         */
-        axis2_handler_desc_t *(AXIS2_CALL *
-                get_handler)(
-                    const axis2_flow_t *flow,
-                    const axis2_env_t *env,
-                    const int index);
-
-        /**
-         * Gets handler count.
-         * @param flow pointer to flow
-         * @param env pointer to environment struct
-         * @return handler count
-         */
-        int (AXIS2_CALL *
-                get_handler_count)(
-                    const axis2_flow_t *flow,
-                    const axis2_env_t *env);
-    };
+    AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
+    axis2_flow_get_handler(const axis2_flow_t *flow,
+        const axis2_env_t *env,
+        const int index);
 
     /**
-     * flow struct.
+     * Gets handler count.
+     * @param flow pointer to flow
+     * @param env pointer to environment struct
+     * @return handler count
      */
-    struct axis2_flow
-    {
-        /** Operations of flow */
-        axis2_flow_ops_t *ops;
-    };
+    AXIS2_EXTERN int AXIS2_CALL
+    axis2_flow_get_handler_count(const axis2_flow_t *flow,
+        const axis2_env_t *env);
 
     /**
      * Creates flow struct.
@@ -121,8 +99,7 @@
      * @return pointer to newly created flow
      */
     AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
-    axis2_flow_create (
-        const axis2_env_t *env);
+    axis2_flow_create (const axis2_env_t *env);
 
     /**
      * Frees flow passed as void pointer. This method would cast the void 
@@ -132,29 +109,24 @@
      * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_flow_free_void_arg (
-        void *flow,
+    axis2_flow_free_void_arg (void *flow,
         const axis2_env_t *env);
 
 
-/** Frees flow.
-    @sa axis2_flow_ops#free */
-#define AXIS2_FLOW_FREE(flow, env) ((flow)->ops->free (flow, env))
+/** Frees flow. */
+#define AXIS2_FLOW_FREE(flow, env) axis2_flow_free (flow, env)
 
-/** Adds handler.
-    @sa axis2_flow_ops#add_handler */
+/** Adds handler. */
 #define AXIS2_FLOW_ADD_HANDLER(flow, env, handler) \
-      ((flow)->ops->add_handler (flow, env, handler))
+      axis2_flow_add_handler (flow, env, handler)
 
-/** Gets handler at given index.
-    @sa axis2_flow_ops#get_handler */
+/** Gets handler at given index. */
 #define AXIS2_FLOW_GET_HANDLER(flow, env, index) \
-      ((flow)->ops->get_handler (flow, env, index))
+      axis2_flow_get_handler (flow, env, index)
 
-/** Gets handler count.
-    @sa axis2_flow_ops#get_handler_count */
+/** Gets handler count. */
 #define AXIS2_FLOW_GET_HANDLER_COUNT(flow, env) \
-      ((flow)->ops->get_handler_count (flow, env))
+      axis2_flow_get_handler_count (flow, env)
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_flow_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_flow_container.h?view=diff&rev=514539&r1=514538&r2=514539
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_flow_container.h (original)
+++ webservices/axis2/trunk/c/include/axis2_flow_container.h Sun Mar  4 20:11:56 2007
@@ -45,137 +45,111 @@
 {
 #endif
 
-    /** Type name for struct axis2_flow_container_ops */
-    typedef struct axis2_flow_container_ops axis2_flow_container_ops_t;
     /** Type name for struct axis2_flow_container */
     typedef struct axis2_flow_container axis2_flow_container_t;
 
 
+    /** 
+     * Frees flow container.
+     * @param flow_container pointer to flow container
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_flow_container_free(axis2_flow_container_t *flow_container,
+        const axis2_env_t *env);
+
+    /**
+     * Gets in flow.
+     * @param flow_container pointer to flow container
+     * @param env pointer to environment struct
+     * @return pointer to in flow, returns a reference, not a cloned copy
+     */
+    AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
+    axis2_flow_container_get_in_flow(const axis2_flow_container_t *flow_container,
+        const axis2_env_t *env);
+
+    /**
+     * Sets in flow.
+     * @param flow_container pointer to flow container
+     * @param env pointer to environment struct
+     * @param in_flow pointer to in flow struct, flow container assumes 
+     * ownership of struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_flow_container_set_in_flow(axis2_flow_container_t *flow_container,
+        const axis2_env_t *env,
+        axis2_flow_t *in_flow);
+
+    /**
+     * Gets out flow.
+     * @param flow_container pointer to flow container
+     * @param env pointer to environment struct
+     * @return out flow, returns a reference, not a cloned copy
+     */
+    AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
+    axis2_flow_container_get_out_flow(const axis2_flow_container_t *flow_container,
+        const axis2_env_t *env);
+
+    /**
+     * Sets out flow.
+     * @param flow_container pointer to flow container
+     * @param env pointer to environment struct
+     * @param out_flow pointer to out flow, flow container assumes 
+     * ownership of struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_flow_container_set_out_flow(axis2_flow_container_t *flow_container,
+        const axis2_env_t *env,
+        axis2_flow_t *out_flow);
+
+    /**
+     * Gets fault in flow.
+     * @param flow_container pointer to flow container
+     * @param env pointer to environment struct
+     * @return fault in flow, returns a reference, not a cloned copy
+     */
+    AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
+    axis2_flow_container_get_fault_in_flow(const axis2_flow_container_t *flow_container,
+        const axis2_env_t *env);
+
     /**
-     * flow container ops struct.
-     * Encapsulator struct for ops of axis2_flow_container.
+     * Sets fault in flow.
+     * @param flow_container pointer to flow container
+     * @param env pointer to environment struct
+     * @param falut_in_flow pointer to falut in flow, flow container assumes 
+     * ownership of struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
-    struct axis2_flow_container_ops
-    {
-        /** 
-         * Frees flow container.
-         * @param flow_container pointer to flow container
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                free)(
-                    axis2_flow_container_t *flow_container,
-                    const axis2_env_t *env);
-
-        /**
-         * Gets in flow.
-         * @param flow_container pointer to flow container
-         * @param env pointer to environment struct
-         * @return pointer to in flow, returns a reference, not a cloned copy
-         */
-        axis2_flow_t *(AXIS2_CALL *
-                get_in_flow)(
-                    const axis2_flow_container_t *flow_container,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets in flow.
-         * @param flow_container pointer to flow container
-         * @param env pointer to environment struct
-         * @param in_flow pointer to in flow struct, flow container assumes 
-         * ownership of struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_in_flow)(
-                    axis2_flow_container_t *flow_container,
-                    const axis2_env_t *env,
-                    axis2_flow_t *in_flow);
-
-        /**
-         * Gets out flow.
-         * @param flow_container pointer to flow container
-         * @param env pointer to environment struct
-         * @return out flow, returns a reference, not a cloned copy
-         */
-        axis2_flow_t *(AXIS2_CALL *
-                get_out_flow)(
-                    const axis2_flow_container_t *flow_container,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets out flow.
-         * @param flow_container pointer to flow container
-         * @param env pointer to environment struct
-         * @param out_flow pointer to out flow, flow container assumes 
-         * ownership of struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_out_flow)(
-                    axis2_flow_container_t *flow_container,
-                    const axis2_env_t *env,
-                    axis2_flow_t *out_flow);
-
-        /**
-         * Gets fault in flow.
-         * @param flow_container pointer to flow container
-         * @param env pointer to environment struct
-         * @return fault in flow, returns a reference, not a cloned copy
-         */
-        axis2_flow_t *(AXIS2_CALL *
-                get_fault_in_flow)(
-                    const axis2_flow_container_t *flow_container,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets fault in flow.
-         * @param flow_container pointer to flow container
-         * @param env pointer to environment struct
-         * @param falut_in_flow pointer to falut in flow, flow container assumes 
-         * ownership of struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_fault_in_flow)(
-                    axis2_flow_container_t *flow_container,
-                    const axis2_env_t *env,
-                    axis2_flow_t *falut_in_flow);
-        /**
-         * Gets fault out flow.
-         * @param flow_container pointer to flow container
-         * @param env pointer to environment struct
-         * @return fault out flow, returns a reference, not a cloned copy
-         */
-        axis2_flow_t *(AXIS2_CALL *
-                get_fault_out_flow)(
-                    const axis2_flow_container_t *flow_container,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets fault out flow.
-         * @param flow_container pointer to flow container
-         * @param env pointer to environment struct
-         * @param fault_out_flow pointer to fault out flow, flow container assumes 
-         * ownership of struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_fault_out_flow)(
-                    axis2_flow_container_t *flow_container,
-                    const axis2_env_t *env,
-                    axis2_flow_t *fault_out_flow);
-    };
-
-    /**
-     * flow container struct.
-     */
-    struct axis2_flow_container
-    {
-        /** Operations of flow container struct */
-        axis2_flow_container_ops_t *ops;
-    };
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_flow_container_set_fault_in_flow(axis2_flow_container_t *flow_container,
+        const axis2_env_t *env,
+        axis2_flow_t *falut_in_flow);
+
+    /**
+     * Gets fault out flow.
+     * @param flow_container pointer to flow container
+     * @param env pointer to environment struct
+     * @return fault out flow, returns a reference, not a cloned copy
+     */
+    AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
+    axis2_flow_container_get_fault_out_flow(const axis2_flow_container_t *flow_container,
+        const axis2_env_t *env);
+
+    /**
+     * Sets fault out flow.
+     * @param flow_container pointer to flow container
+     * @param env pointer to environment struct
+     * @param fault_out_flow pointer to fault out flow, flow container assumes 
+     * ownership of struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_flow_container_set_fault_out_flow(axis2_flow_container_t *flow_container,
+        const axis2_env_t *env,
+        axis2_flow_t *fault_out_flow);
 
     /**
      * Creates flow container struct.
@@ -183,54 +157,44 @@
      * @return pointer to newly created flow container
      */
     AXIS2_EXTERN axis2_flow_container_t *AXIS2_CALL
-    axis2_flow_container_create (
-        const axis2_env_t *env);
+    axis2_flow_container_create (const axis2_env_t *env);
 
 
-/** Frees flow container.
-    @sa axis2_flow_container_ops#free */
+/** Frees flow container. */
 #define AXIS2_FLOW_CONTAINER_FREE(flow_container, env) \
-        ((flow_container)->ops->free (flow_container, env))
+        axis2_flow_container_free (flow_container, env)
 
-/** Gets in flow.
-    @sa axis2_flow_container_ops#get_in_flow */
+/** Gets in flow. */
 #define AXIS2_FLOW_CONTAINER_GET_IN_FLOW(flow_container, env) \
-        ((flow_container)->ops->get_in_flow (flow_container, env))
+        axis2_flow_container_get_in_flow (flow_container, env)
 
-/** Sets in flow.
-    @sa axis2_flow_container_ops#set_in_flow */
+/** Sets in flow. */
 #define AXIS2_FLOW_CONTAINER_SET_IN_FLOW(flow_container, env, in_flow) \
-        ((flow_container)->ops->set_in_flow (flow_container, env, in_flow))
+        axis2_flow_container_set_in_flow (flow_container, env, in_flow)
 
-/** Gets out flow.
-    @sa axis2_flow_container_ops#get_out_flow */
+/** Gets out flow. */
 #define AXIS2_FLOW_CONTAINER_GET_OUT_FLOW(flow_container, env) \
-        ((flow_container)->ops->get_out_flow (flow_container, env))
+        axis2_flow_container_get_out_flow (flow_container, env)
 
-/** Sets out flow.
-    @sa axis2_flow_container_ops#set_out_flow */
+/** Sets out flow. */
 #define AXIS2_FLOW_CONTAINER_SET_OUT_FLOW(flow_container, env, out_flow) \
-        ((flow_container)->ops->set_out_flow (flow_container, env, out_flow))
+        axis2_flow_container_set_out_flow (flow_container, env, out_flow)
 
-/** Gets fault in flow.
-    @sa axis2_flow_container_ops#get_fault_in_flow */
+/** Gets fault in flow. */
 #define AXIS2_FLOW_CONTAINER_GET_FAULT_IN_FLOW(flow_container, env) \
-        ((flow_container)->ops->get_fault_in_flow (flow_container, env))
+        axis2_flow_container_get_fault_in_flow (flow_container, env)
 
-/** Sets fault in flow.
-    @sa axis2_flow_container_ops#set_fault_in_flow */
+/** Sets fault in flow. */
 #define AXIS2_FLOW_CONTAINER_SET_FAULT_IN_FLOW(flow_container, env, fault_in_flow) \
-        ((flow_container)->ops->set_fault_in_flow (flow_container, env, fault_in_flow))
+        axis2_flow_container_set_fault_in_flow (flow_container, env, fault_in_flow)
 
-/** Gets fault out flow.
-    @sa axis2_flow_container_ops#get_fault_out_flow */
+/** Gets fault out flow. */
 #define AXIS2_FLOW_CONTAINER_GET_FAULT_OUT_FLOW(flow_container, env) \
-        ((flow_container)->ops->get_fault_out_flow (flow_container, env))
+        axis2_flow_container_get_fault_out_flow (flow_container, env)
 
-/** Sets fault out flow.
-    @sa axis2_flow_container_ops#set_fault_out_flow */
+/** Sets fault out flow. */
 #define AXIS2_FLOW_CONTAINER_SET_FAULT_OUT_FLOW(flow_container, env, fault_out_flow) \
-        ((flow_container)->ops->set_fault_out_flow (flow_container, env, fault_out_flow))
+        axis2_flow_container_set_fault_out_flow (flow_container, env, fault_out_flow)
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_handler_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_handler_desc.h?view=diff&rev=514539&r1=514538&r2=514539
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler_desc.h Sun Mar  4 20:11:56 2007
@@ -47,221 +47,194 @@
 
     /** Type name for struct axis2_handler_desc */
     typedef struct axis2_handler_desc axis2_handler_desc_t;
-    /** Type name for struct axis2_handler_desc_ops  */
-    typedef struct axis2_handler_desc_ops axis2_handler_desc_ops_t;
 
     /**
-     * handler description ops struct.
-     * Encapsulator struct for ops of axis2_handler_desc.
+     * Gets QName.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @return pointer to QName, returns a reference, not a cloned copy
      */
-    struct axis2_handler_desc_ops
-    {
-        /**
-         * Gets QName.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @return pointer to QName, returns a reference, not a cloned copy
-         */
-        const axis2_string_t *(AXIS2_CALL *
-                get_name)(
-                    const axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets QName.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @param name pointer to string representing handler name 
-         * of QName
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_name)(
-                    axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env,
-                    axis2_string_t *name);
-
-        /**
-         * Gets phase rules.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @return pointer to phase rule struct containing phase rules
-         */
-        axis2_phase_rule_t *(AXIS2_CALL *
-                get_rules)(
-                    const axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets phase rules.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @param phase_rule pointer to phase rule struct, handler description
-         * assumes ownership of the struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_rules)(
-                    axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env,
-                    axis2_phase_rule_t *phase_rule);
-
-        /**
-         * Gets named parameter.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @param name parameter name string 
-         * @return pointer to parameter if found, else NULL. Return a reference
-         * not a cloned copy
-         */
-        axis2_param_t *(AXIS2_CALL *
-                get_param)(
-                    const axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env,
-                    const axis2_char_t *name);
-
-        /**
-         * Adds given parameter to the parameter list.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @param param pointer to param
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_param)(
-                    axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env,
-                    axis2_param_t *param);
-
-        /**
-         * Gets all parameters stored within handler description.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @return pointer to array list containing parameters, returns a 
-         * reference, not a cloned copy
-         */
-        axis2_array_list_t *(AXIS2_CALL *
-                get_all_params)(
-                    const axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Checks if the named parameter is locked at any level
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @param param_name parameter name string 
-         * @return AXIS2_TRUE if the parameter is locked, else AXIS2_FALSE
-         */
-        axis2_bool_t (AXIS2_CALL *
-                is_param_locked)(
-                    const axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env, 
-                    const axis2_char_t *param_name);
-
-        /**
-         * Gets the handler associated with the handler description.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @return pointer to handler, returns a reference, not a cloned copy
-         */
-        axis2_handler_t *(AXIS2_CALL *
-                get_handler)(
-                    const axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets the handler associated with the handler description.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @param handler pointer to handler, handler description assumes
-         * the ownership of the handler
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_handler)(
-                    axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env,
-                    axis2_handler_t *handler);
-
-        /**
-         * Gets the class name. Class name is the name of the shared library 
-         * file that contains the implementation of the handler.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @return class name string
-         */
-        const axis2_char_t *(AXIS2_CALL *
-                get_class_name)(
-                    const axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets the class name. Class name is the name of the shared library 
-         * file that contains the implementation of the handler.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @param class_name class name string
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_class_name)(
-                    axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env,
-                    const axis2_char_t *class_name);
-
-        /**
-         * Gets the parent. Parent of handler description is of type parameter
-         * container.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @return pointer to parent parameter container, returns a reference,
-         * not a cloned copy
-         */
-        axis2_param_container_t *(AXIS2_CALL *
-                get_parent)(
-                    const axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Gets the parent. Parent of handler description is of type parameter
-         * container.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @param parent pointer to parent parameter container struct, handler
-         * description assumes ownership of struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_parent)(
-                    axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env,
-                    axis2_param_container_t *parent);
-
-        /**
-         * Frees handler description.
-         * @param handler_desc pointer to handler description
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                free)(
-                    axis2_handler_desc_t *handler_desc,
-                    const axis2_env_t *env);
-
-    };
-
-    /**
-     * handler description struct
-     */
-    struct axis2_handler_desc
-    {
-        /** handler description related ops */
-        axis2_handler_desc_ops_t *ops;
+    AXIS2_EXTERN const axis2_string_t *AXIS2_CALL
+    axis2_handler_desc_get_name(const axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env);
 
-        /** parameter container */
-        axis2_param_container_t *param_container;
+    /**
+     * Sets QName.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @param name pointer to string representing handler name 
+     * of QName
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_handler_desc_set_name(axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env,
+        axis2_string_t *name);
+
+    /**
+     * Gets phase rules.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @return pointer to phase rule struct containing phase rules
+     */
+    AXIS2_EXTERN axis2_phase_rule_t *AXIS2_CALL
+    axis2_handler_desc_get_rules(const axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Sets phase rules.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @param phase_rule pointer to phase rule struct, handler description
+     * assumes ownership of the struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_handler_desc_set_rules(axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env,
+        axis2_phase_rule_t *phase_rule);
+
+    /**
+     * Gets named parameter.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @param name parameter name string 
+     * @return pointer to parameter if found, else NULL. Return a reference
+     * not a cloned copy
+     */
+    AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+    axis2_handler_desc_get_param(const axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env,
+        const axis2_char_t *name);
+
+    /**
+     * Adds given parameter to the parameter list.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @param param pointer to param
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_handler_desc_add_param(axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env,
+        axis2_param_t *param);
+
+    /**
+     * Gets all parameters stored within handler description.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @return pointer to array list containing parameters, returns a 
+     * reference, not a cloned copy
+     */
+    AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+    axis2_handler_desc_get_all_params(const axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Checks if the named parameter is locked at any level
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @param param_name parameter name string 
+     * @return AXIS2_TRUE if the parameter is locked, else AXIS2_FALSE
+     */
+    AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+    axis2_handler_desc_is_param_locked(const axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env, 
+        const axis2_char_t *param_name);
+
+    /**
+     * Gets the handler associated with the handler description.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @return pointer to handler, returns a reference, not a cloned copy
+     */
+    AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
+    axis2_handler_desc_get_handler(const axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Sets the handler associated with the handler description.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @param handler pointer to handler, handler description assumes
+     * the ownership of the handler
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_handler_desc_set_handler(axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env,
+        axis2_handler_t *handler);
+
+    /**
+     * Gets the class name. Class name is the name of the shared library 
+     * file that contains the implementation of the handler.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @return class name string
+     */
+    AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
+    axis2_handler_desc_get_class_name(const axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Sets the class name. Class name is the name of the shared library 
+     * file that contains the implementation of the handler.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @param class_name class name string
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_handler_desc_set_class_name(axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env,
+        const axis2_char_t *class_name);
 
-    };
+    /**
+     * Gets the parent. Parent of handler description is of type parameter
+     * container.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @return pointer to parent parameter container, returns a reference,
+     * not a cloned copy
+     */
+    AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+    axis2_handler_desc_get_parent(const axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Gets the parent. Parent of handler description is of type parameter
+     * container.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @param parent pointer to parent parameter container struct, handler
+     * description assumes ownership of struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_handler_desc_set_parent(axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env,
+        axis2_param_container_t *parent);
+
+    /**
+     * Frees handler description.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_handler_desc_free(axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Gets the param container.
+     * @param handler_desc pointer to handler description
+     * @param env pointer to environment struct
+     * @return pointer to parameter container, returns a reference,
+     * not a cloned copy
+     */
+    AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+    axis2_handler_desc_get_param_container(const axis2_handler_desc_t *handler_desc,
+        const axis2_env_t *env);
 
 
     /**
@@ -275,70 +248,57 @@
     axis2_handler_desc_create(const axis2_env_t *env, 
         axis2_string_t *name);
 
-/** Gets handler associated with handler description.
-    @sa axis2_handler_desc_ops#get_handler */
+/** Gets handler associated with handler description. */
 #define AXIS2_HANDLER_DESC_GET_HANDLER(handler_desc, env) \
-        ((handler_desc)->ops->get_handler(handler_desc, env))
+        axis2_handler_desc_get_handler(handler_desc, env)
 
-/** Sets handler associated with handler description.
-    @sa axis2_handler_desc_ops#set_handler */
+/** Sets handler associated with handler description. */
 #define AXIS2_HANDLER_DESC_SET_HANDLER(handler_desc, env, handler) \
-        ((handler_desc)->ops->set_handler(handler_desc, env, handler))
+        axis2_handler_desc_set_handler(handler_desc, env, handler)
 
-/** Gets rules.
-    @sa axis2_handler_desc_ops#get_rules */
+/** Gets rules. */
 #define AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env) \
-        ((handler_desc)->ops->get_rules(handler_desc, env))
+        axis2_handler_desc_get_rules(handler_desc, env)
 
-/** Sets rules.
-    @sa axis2_handler_desc_ops#set_rules */
+/** Sets rules. */
 #define AXIS2_HANDLER_DESC_SET_RULES(handler_desc, env, rules) \
-        ((handler_desc)->ops->set_rules(handler_desc, env, rules))
+        axis2_handler_desc_set_rules(handler_desc, env, rules)
 
-/** Gets QName.
-    @sa axis2_handler_desc_ops#get_name */
+/** Gets QName. */
 #define AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env) \
-        ((handler_desc)->ops->get_name(handler_desc, env))
+        axis2_handler_desc_get_name(handler_desc, env)
 
-/** Sets QName.
-    @sa axis2_handler_desc_ops#set_name */
+/** Sets QName. */
 #define AXIS2_HANDLER_DESC_SET_NAME(handler_desc, env, name) \
-        ((handler_desc)->ops->set_name(handler_desc, env, name))
+        axis2_handler_desc_set_name(handler_desc, env, name)
 
-/** Gets parameter with given name.
-    @sa axis2_handler_desc_ops#get_param */
+/** Gets parameter with given name. */
 #define AXIS2_HANDLER_DESC_GET_PARAM(handler_desc, env, name) \
-        ((handler_desc)->ops->get_param(handler_desc, env, name))
+        axis2_handler_desc_get_param(handler_desc, env, name)
 
-/** Adds parameter to parameter list.
-    @sa axis2_handler_desc_ops#add_param */
+/** Adds parameter to parameter list. */
 #define AXIS2_HANDLER_DESC_ADD_PARAM(handler_desc, env, param) \
-        ((handler_desc)->ops->add_param(handler_desc, env, param))
+        axis2_handler_desc_add_param(handler_desc, env, param)
 
-/** Gets class name of handler.
-    @sa axis2_handler_desc_ops#get_class_name */
+/** Gets class name of handler. */
 #define AXIS2_HANDLER_DESC_GET_CLASS_NAME(handler_desc, env) \
-        ((handler_desc)->ops->get_class_name(handler_desc, env))
+        axis2_handler_desc_get_class_name(handler_desc, env)
 
-/** Sets class name of handler.
-    @sa axis2_handler_desc_ops#set_class_name */
+/** Sets class name of handler. */
 #define AXIS2_HANDLER_DESC_SET_CLASS_NAME(handler_desc, env, class_name) \
-        ((handler_desc)->ops->set_class_name(handler_desc, env, class_name))
+        axis2_handler_desc_set_class_name(handler_desc, env, class_name)
 
-/** Gets parent.
-    @sa axis2_handler_desc_ops#get_parent */
+/** Gets parent. */
 #define AXIS2_HANDLER_DESC_GET_PARENT(handler_desc, env) \
-        ((handler_desc)->ops->get_parent(handler_desc, env))
+        axis2_handler_desc_get_parent(handler_desc, env)
 
-/** Sets parent.
-    @sa axis2_handler_desc_ops#set_parent */
+/** Sets parent. */
 #define AXIS2_HANDLER_DESC_SET_PARENT(handler_desc, env, parent) \
-        ((handler_desc)->ops->set_parent(handler_desc, env, parent))
+        axis2_handler_desc_set_parent(handler_desc, env, parent)
 
-/** Frees handler description.
-    @sa axis2_handler_desc_ops#free */
+/** Frees handler description. */
 #define AXIS2_HANDLER_DESC_FREE(handler_desc, env) \
-        ((handler_desc)->ops->free(handler_desc, env))
+        axis2_handler_desc_free(handler_desc, env)
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_module_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_module_desc.h?view=diff&rev=514539&r1=514538&r2=514539
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_module_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_module_desc.h Sun Mar  4 20:11:56 2007
@@ -46,304 +46,261 @@
 {
 #endif
 
-    /** Type name for struct axis2_module_desc_ops */
-    typedef struct axis2_module_desc_ops axis2_module_desc_ops_t;
     /** Type name for struct axis2_module_desc */
     typedef struct axis2_module_desc axis2_module_desc_t;
 
     struct axis2_op;
     struct axis2_conf;
 
+    /**
+     * Frees module description.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_desc_free(axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Gets flow representing in flow.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @return pointer to flow that represents in flow, returns a reference
+     * not a cloned copy
+     */
+    AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
+    axis2_module_desc_get_in_flow(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Sets flow representing in flow.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param in_flow pointer to flow representing in flow, module assumes 
+     * ownership of flow
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_desc_set_in_flow(axis2_module_desc_t *module_desc,
+        const axis2_env_t *env,
+        axis2_flow_t *in_flow);
+
+    /**
+     * Gets flow representing out flow.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @return pointer to flow that represents out flow, returns a reference
+     * not a cloned copy         
+     */
+    AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
+    axis2_module_desc_get_out_flow(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Sets flow representing out flow.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param out_flow pointer to flow representing out flow, module assumes 
+     * ownership of flow
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_desc_set_out_flow(axis2_module_desc_t *module_desc,
+        const axis2_env_t *env,
+        axis2_flow_t *out_flow);
+
+    /**
+     * Gets flow representing fault in flow.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @return pointer to flow that represents fault in flow, returns a reference
+     * not a cloned copy         
+     */
+    AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
+    axis2_module_desc_get_fault_in_flow(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Sets flow representing fault in flow.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param falut_in_flow pointer to flow representing fault in flow, 
+     * module assumes ownership of flow
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_desc_set_fault_in_flow(axis2_module_desc_t *module_desc,
+        const axis2_env_t *env,
+        axis2_flow_t *falut_in_flow);
+
+    /**
+     * Gets flow representing fault out flow.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @return pointer to flow that represents fault out flow, returns a 
+     * reference not a cloned copy         
+     */
+    AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
+    axis2_module_desc_get_fault_out_flow(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Sets flow representing fault out flow.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param fault_out_flow pointer to flow representing fault out flow, 
+     * module assumes ownership of flow
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_desc_set_fault_out_flow(axis2_module_desc_t *module_desc,
+        const axis2_env_t *env,
+        axis2_flow_t *fault_out_flow);
+
+    /**
+     * Gets module QName.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @return pointer to QName
+     */
+    AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+    axis2_module_desc_get_qname(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Sets module QName.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param qname pointer to qname
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_desc_set_qname(axis2_module_desc_t *module_desc,
+        const axis2_env_t *env,
+        const axis2_qname_t *qname);
+
+    /**
+     * Adds given operation to module.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param op pointer to operation, module assumes ownership of operation
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_desc_add_op(axis2_module_desc_t *module_desc,
+        const axis2_env_t *env,
+        struct axis2_op *op);
+
+    /**
+     * Gets all operations associated with module.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @return pointer to hash map containing the operations
+     */
+    AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
+    axis2_module_desc_get_all_ops(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Gets parent which is of type configuration.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @return pointer to configuration, returns a reference not a 
+     * cloned copy
+     */
+    AXIS2_EXTERN struct axis2_conf *AXIS2_CALL
+    axis2_module_desc_get_parent(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Sets parent which is of type configuration.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param parent pointer to parent configuration, module does not assume
+     * the ownership of configuration
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_desc_set_parent(axis2_module_desc_t *module_desc,
+        const axis2_env_t *env,
+        struct axis2_conf *parent);
+
+    /**
+     * Add parameter
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param param pointer to parameter struct
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_desc_add_param(axis2_module_desc_t *module_desc,
+        const axis2_env_t *env,
+        axis2_param_t *param);
+
+    /**
+     * Gets parameter with given name.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param name parameter name string
+     * @return pointer to parameter corresponding to given name
+     */
+    AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+    axis2_module_desc_get_param(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env,
+        const axis2_char_t *name);
+
+    /**
+     * Gets all parameters associated with module.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param pointer to array list containing all parameters
+     */
+    AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+    axis2_module_desc_get_all_params(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
+
+    /**
+     * Checks if a given parameter is locked.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param param_name parameter name string 
+     * @return AXIS2_TRUE if named parameter is locked, else AXIS2_FALSE
+     */
+    AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+    axis2_module_desc_is_param_locked(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env,
+        const axis2_char_t *param_name);
+
+    /**
+     * Gets module associated with module description.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @return pointer to module
+     */
+    AXIS2_EXTERN struct axis2_module *AXIS2_CALL
+    axis2_module_desc_get_module(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
 
     /**
-     * module description ops struct.
-     * Encapsulator struct for ops of axis2_module_desc.
+     * @param module_desc pointer to module description
+     * @param env pointer to environment struct
+     * @param module pointer to module, module description assumes ownership
+     * of module
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
-    struct axis2_module_desc_ops
-    {
-        /**
-         * Frees module description.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                free)(
-                    axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Gets flow representing in flow.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @return pointer to flow that represents in flow, returns a reference
-         * not a cloned copy
-         */
-        axis2_flow_t *(AXIS2_CALL *
-                get_in_flow)(
-                    const axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets flow representing in flow.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param in_flow pointer to flow representing in flow, module assumes 
-         * ownership of flow
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_in_flow)(
-                    axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env,
-                    axis2_flow_t *in_flow);
-
-        /**
-         * Gets flow representing out flow.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @return pointer to flow that represents out flow, returns a reference
-         * not a cloned copy         
-         */
-        axis2_flow_t *(AXIS2_CALL *
-                get_out_flow)(
-                    const axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets flow representing out flow.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param out_flow pointer to flow representing out flow, module assumes 
-         * ownership of flow
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_out_flow)(
-                    axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env,
-                    axis2_flow_t *out_flow);
-
-        /**
-         * Gets flow representing fault in flow.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @return pointer to flow that represents fault in flow, returns a reference
-         * not a cloned copy         
-         */
-        axis2_flow_t *(AXIS2_CALL *
-                get_fault_in_flow)(
-                    const axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets flow representing fault in flow.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param falut_in_flow pointer to flow representing fault in flow, 
-         * module assumes ownership of flow
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_fault_in_flow)(
-                    axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env,
-                    axis2_flow_t *falut_in_flow);
-
-        /**
-         * Gets flow representing fault out flow.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @return pointer to flow that represents fault out flow, returns a 
-         * reference not a cloned copy         
-         */
-        axis2_flow_t *(AXIS2_CALL *
-                get_fault_out_flow)(
-                    const axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets flow representing fault out flow.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param fault_out_flow pointer to flow representing fault out flow, 
-         * module assumes ownership of flow
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_fault_out_flow)(
-                    axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env,
-                    axis2_flow_t *fault_out_flow);
-
-        /**
-         * Gets module QName.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @return pointer to QName
-         */
-        const axis2_qname_t *(AXIS2_CALL *
-                get_qname)(
-                    const axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets module QName.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param qname pointer to qname
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_qname)(
-                    axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env,
-                    const axis2_qname_t *qname);
-
-        /**
-         * Adds given operation to module.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param op pointer to operation, module assumes ownership of operation
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_op)(
-                    axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env,
-                    struct axis2_op *op);
-
-        /**
-         * Gets all operations associated with module.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @return pointer to hash map containing the operations
-         */
-        axis2_hash_t *(AXIS2_CALL *
-                get_all_ops)(
-                    const axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Gets parent which is of type configuration.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @return pointer to configuration, returns a reference not a 
-         * cloned copy
-         */
-        struct axis2_conf *(AXIS2_CALL *
-                get_parent)(
-                    const axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Sets parent which is of type configuration.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param parent pointer to parent configuration, module does not assume
-         * the ownership of configuration
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_parent)(
-                    axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env,
-                    struct axis2_conf *parent);
-
-        /**
-         * Add parameter
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param param pointer to parameter struct
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                add_param)(
-                    axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env,
-                    axis2_param_t *param);
-
-        /**
-         * Gets parameter with given name.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param name parameter name string
-         * @return pointer to parameter corresponding to given name
-         */
-        axis2_param_t *(AXIS2_CALL *
-                get_param)(
-                    const axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env,
-                    const axis2_char_t *name);
-
-        /**
-         * Gets all parameters associated with module.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param pointer to array list containing all parameters
-         */
-        axis2_array_list_t *(AXIS2_CALL *
-                get_all_params)(
-                    const axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * Checks if a given parameter is locked.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param param_name parameter name string 
-         * @return AXIS2_TRUE if named parameter is locked, else AXIS2_FALSE
-         */
-        axis2_bool_t (AXIS2_CALL *
-                is_param_locked)(
-                    const axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env,
-                    const axis2_char_t *param_name);
-
-        /**
-         * Gets module associated with module description.
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @return pointer to module
-         */
-        struct axis2_module *(AXIS2_CALL *
-                get_module)(
-                    const axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env);
-
-        /**
-         * @param module_desc pointer to module description
-         * @param env pointer to environment struct
-         * @param module pointer to module, module description assumes ownership
-         * of module
-         * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-         */
-        axis2_status_t (AXIS2_CALL *
-                set_module)(
-                    axis2_module_desc_t *module_desc,
-                    const axis2_env_t *env,
-                    struct axis2_module *module);
-
-    };
-
-    /**
-     * module description struct.
-     */
-    struct axis2_module_desc
-    {
-        /** operations of module description */
-        axis2_module_desc_ops_t *ops;
-        /** 
-         * flow container that encapsulates the flows associated with the 
-         * module 
-         */
-        axis2_flow_container_t *flow_container;
-        /** 
-         * parameter container that stores all the parameters associated with 
-         * the module 
-         */
-        axis2_param_container_t *params;
-    };
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_module_desc_set_module(axis2_module_desc_t *module_desc,
+        const axis2_env_t *env,
+        struct axis2_module *module);
+
+    AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+    axis2_module_desc_get_param_container(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_flow_container_t *AXIS2_CALL
+    axis2_module_desc_get_flow_container(const axis2_module_desc_t *module_desc,
+        const axis2_env_t *env);
 
     /**
      * Creates module description struct instance.
@@ -351,8 +308,7 @@
      * @return pointer to newly created module description
      */
     AXIS2_EXTERN axis2_module_desc_t *AXIS2_CALL
-    axis2_module_desc_create (
-        const axis2_env_t *env);
+    axis2_module_desc_create (const axis2_env_t *env);
 
     /**
      * Creates module description struct instance with given QName.
@@ -361,8 +317,7 @@
      * @return pointer to newly created module description
      */
     AXIS2_EXTERN axis2_module_desc_t *AXIS2_CALL
-    axis2_module_desc_create_with_qname(
-        const axis2_env_t *env,
+    axis2_module_desc_create_with_qname(const axis2_env_t *env,
         const axis2_qname_t *qname);
 
     /**
@@ -374,115 +329,93 @@
      * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
      */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_module_desc_free_void_arg(
-        void *module_desc,
+    axis2_module_desc_free_void_arg(void *module_desc,
         const axis2_env_t *env);
 
 
-/** Frees module description.
-    @sa axis2_module_desc_ops#free */
+/** Frees module description. */
 #define AXIS2_MODULE_DESC_FREE(module_desc, env) \
-      ((module_desc)->ops->free(module_desc, env))
+      axis2_module_desc_free(module_desc, env)
 
-/** Gets in flow.
-    @sa axis2_module_desc_ops#get_in_flow */
+/** Gets in flow. */
 #define AXIS2_MODULE_DESC_GET_IN_FLOW(module_desc, env) \
-        ((module_desc)->ops->get_in_flow (module_desc, env))
+        axis2_module_desc_get_in_flow (module_desc, env)
 
-/** Sets in flow.
-    @sa axis2_module_desc_ops#set_in_flow */
+/** Sets in flow. */
 #define AXIS2_MODULE_DESC_SET_IN_FLOW(module_desc, env, in_flow) \
-        ((module_desc)->ops->set_in_flow (module_desc, env, in_flow))
+        axis2_module_desc_set_in_flow (module_desc, env, in_flow)
 
-/** Gets out flow.
-    @sa axis2_module_desc_ops#get_out_flow */
+/** Gets out flow. */
 #define AXIS2_MODULE_DESC_GET_OUT_FLOW(module_desc, env) \
-      ((module_desc)->ops->get_out_flow (module_desc, env))
+      axis2_module_desc_get_out_flow (module_desc, env)
 
-/** Sets out flow.
-    @sa axis2_module_desc_ops#set_out_flow */
+/** Sets out flow. */
 #define AXIS2_MODULE_DESC_SET_OUT_FLOW(module_desc, env, out_flow) \
-      ((module_desc)->ops->set_out_flow (module_desc, env, out_flow))
+      axis2_module_desc_set_out_flow (module_desc, env, out_flow)
 
-/** Gets fault in flow.
-    @sa axis2_module_desc_ops#get_fault_in_flow */
+/** Gets fault in flow. */
 #define AXIS2_MODULE_DESC_GET_FAULT_IN_FLOW(module_desc, env) \
-      ((module_desc)->ops->get_fault_in_flow (module_desc, env))
+      axis2_module_desc_get_fault_in_flow (module_desc, env)
 
-/** Sets fault in flow.
-    @sa axis2_module_desc_ops#set_fault_in_flow */
+/** Sets fault in flow. */
 #define AXIS2_MODULE_DESC_SET_FAULT_IN_FLOW(module_desc, env, falut_in_flow) \
-        ((module_desc)->ops->set_fault_in_flow(module_desc , env, falut_in_flow))
+        axis2_module_desc_set_fault_in_flow(module_desc , env, falut_in_flow)
 
-/** Gets fault out flow.
-    @sa axis2_module_desc_ops#get_fault_out_flow */
+/** Gets fault out flow. */
 #define AXIS2_MODULE_DESC_GET_FAULT_OUT_FLOW(module_desc, env) \
-        ((module_desc)->ops->get_fault_out_flow(module_desc , env))
+        axis2_module_desc_get_fault_out_flow(module_desc , env)
 
-/** Sets fault out flow.
-    @sa axis2_module_desc_ops#set_fault_out_flow */
+/** Sets fault out flow. */
 #define AXIS2_MODULE_DESC_SET_FAULT_OUT_FLOW(module_desc, env, falut_out_flow) \
-        ((module_desc)->ops->set_fault_out_flow(module_desc , env, falut_out_flow))
+        axis2_module_desc_set_fault_out_flow(module_desc , env, falut_out_flow)
 
-/** Gets QName.
-    @sa axis2_module_desc_ops#get_qname */
+/** Gets QName. */
 #define AXIS2_MODULE_DESC_GET_QNAME(module_desc, env) \
-        ((module_desc)->ops->get_qname(module_desc, env))
+        axis2_module_desc_get_qname(module_desc, env)
 
-/** Sets QName.
-    @sa axis2_module_desc_ops#set_qname */
+/** Sets QName. */
 #define AXIS2_MODULE_DESC_SET_QNAME(module_desc, env, qname) \
-        ((module_desc)->ops->set_qname(module_desc, env, qname))
+        axis2_module_desc_set_qname(module_desc, env, qname)
 
-/** Adds given operation to list of operations.
-    @sa axis2_module_desc_ops#add_op */
+/** Adds given operation to list of operations. */
 #define AXIS2_MODULE_DESC_ADD_OP(module_desc, env, op) \
-        ((module_desc)->ops->add_op(module_desc, env, op))
+        axis2_module_desc_add_op(module_desc, env, op)
 
-/** Gets list of all operations.
-    @sa axis2_module_desc_ops#get_all_ops */
+/** Gets list of all operations. */
 #define AXIS2_MODULE_DESC_GET_ALL_OPS(module_desc, env) \
-        ((module_desc)->ops->get_all_ops(module_desc, env))
+        axis2_module_desc_get_all_ops(module_desc, env)
 
-/** Gets parent.
-    @sa axis2_module_desc_ops#get_parent */
+/** Gets parent. */
 #define AXIS2_MODULE_DESC_GET_PARENT(module_desc, env) \
-        ((module_desc)->ops->get_parent(module_desc, env))
+        axis2_module_desc_get_parent(module_desc, env)
 
-/** Sets parent.
-    @sa axis2_module_desc_ops#set_parent */
+/** Sets parent. */
 #define AXIS2_MODULE_DESC_SET_PARENT(module_desc, env, parent) \
-        ((module_desc)->ops->set_parent(module_desc, env, parent))
+        axis2_module_desc_set_parent(module_desc, env, parent)
 
-/** Adds parameter.
-    @sa axis2_module_desc_ops#add_param */
+/** Adds parameter. */
 #define AXIS2_MODULE_DESC_ADD_PARAM(module_desc, env, param) \
-        ((module_desc)->ops->add_param(module_desc, env, param))
+        axis2_module_desc_add_param(module_desc, env, param)
 
-/** Gets named parameter.
-    @sa axis2_module_desc_ops#get_param */
+/** Gets named parameter. */
 #define AXIS2_MODULE_DESC_GET_PARAM(module_desc, env, name) \
-        ((module_desc)->ops->get_param(module_desc, env, name))
+        axis2_module_desc_get_param(module_desc, env, name)
 
-/** Get all parameters.
-    @sa axis2_module_desc_ops#get_all_params */
+/** Get all parameters. */
 #define AXIS2_MODULE_DESC_GET_ALL_PARAMS(module_desc, env) \
-        ((module_desc)->ops->get_all_params(module_desc, env))
+        axis2_module_desc_get_all_params(module_desc, env)
 
-/** Checks if named parameter is locked.
-    @sa axis2_module_desc_ops#is_param_locked */
+/** Checks if named parameter is locked. */
 #define AXIS2_MODULE_DESC_IS_PARAM_LOCKED(module_desc, env, param_name) \
-        ((module_desc)->ops->is_param_locked(module_desc, env, param_name))
+        axis2_module_desc_is_param_locked(module_desc, env, param_name)
 
-/** Gets module associated with module description.
-    @sa axis2_module_desc_ops#get_module */
+/** Gets module associated with module description. */
 #define AXIS2_MODULE_DESC_GET_MODULE(module_desc, env) \
-        ((module_desc)->ops->get_module(module_desc, env))
+        axis2_module_desc_get_module(module_desc, env)
 
-/** Sets module associated with module description.
-    @sa axis2_module_desc_ops#set_module */
+/** Sets module associated with module description. */
 #define AXIS2_MODULE_DESC_SET_MODULE(module_desc, env, module) \
-        ((module_desc)->ops->set_module(module_desc, env, module))
+        axis2_module_desc_set_module(module_desc, env, module)
 
 /** @} */
 



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