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/15 14:16:11 UTC
svn commit: r518623 [11/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...
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h Thu Mar 15 06:16:07 2007
@@ -46,105 +46,78 @@
struct axis2_dep_engine;
/** Type name for struct axis2_repos_listener */
typedef struct axis2_repos_listener axis2_repos_listener_t;
- /** Type name for struct axis2_repos_listener_ops */
- typedef struct axis2_repos_listener_ops axis2_repos_listener_ops_t;
+
+ /**
+ * De-allocate memory
+ * @param repos_listener pointer to repos listener
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_repos_listener_free(axis2_repos_listener_t *repos_listener,
+ const axis2_env_t *env);
+
+ /**
+ * this method ask serachWS to serch for the folder to caheck
+ * for updates
+ * @param repos_listener pointer to repos listener
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_repos_listener_check_modules(axis2_repos_listener_t *listener,
+ const axis2_env_t *env);
+
+ /**
+ * this method ask serachWS to serch for the folder to caheck
+ * for updates
+ * @param repos_listener pointer to repos listener
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_repos_listener_check_svcs(axis2_repos_listener_t *listener,
+ const axis2_env_t *env);
/**
- * Repos Listener ops struct
- * Encapsulator struct for ops of axis2_repos_listener
+ * call to update method of WSInfoList object
+ * @param repos_listener pointer to repos listener
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- struct axis2_repos_listener_ops
- {
- /**
- * De-allocate memory
- * @param repos_listener pointer to repos listener
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_repos_listener_t *repos_listener,
- const axis2_env_t *env);
-
- /**
- * this method ask serachWS to serch for the folder to caheck
- * for updates
- * @param repos_listener pointer to repos listener
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- check_modules)(
- axis2_repos_listener_t *listener,
- const axis2_env_t *env);
-
- /**
- * this method ask serachWS to serch for the folder to caheck
- * for updates
- * @param repos_listener pointer to repos listener
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- check_svcs)(
- axis2_repos_listener_t *listener,
- const axis2_env_t *env);
-
- /**
- * call to update method of WSInfoList object
- * @param repos_listener pointer to repos listener
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- update)(
- axis2_repos_listener_t *listener,
- const axis2_env_t *env);
-
- /**
- * First it call to initalize method of WSInfoList to initilizat that.
- * then it call to checkModules to load all the module.jar s
- * and then it call to update() method inorder to update the Deployment engine and
- * engine regsitry
- * @param repos_listener pointer to repos listener
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- init)(
- axis2_repos_listener_t *listener,
- const axis2_env_t *env);
-
- /**
- * this is the actual method that is call from scheduler
- * @param repos_listener pointer to repos listener
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- start_listen)(
- axis2_repos_listener_t *listener,
- const axis2_env_t *env);
-
-
- };
-
- /**
- * Repos Listener struct
- */
- struct axis2_repos_listener
- {
- /** Operations of repos listener */
- axis2_repos_listener_ops_t *ops;
- };
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_repos_listener_update(axis2_repos_listener_t *listener,
+ const axis2_env_t *env);
+
+ /**
+ * First it call to initalize method of WSInfoList to initilizat that.
+ * then it call to checkModules to load all the module.jar s
+ * and then it call to update() method inorder to update the Deployment engine and
+ * engine regsitry
+ * @param repos_listener pointer to repos listener
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_repos_listener_init(axis2_repos_listener_t *listener,
+ const axis2_env_t *env);
+
+ /**
+ * this is the actual method that is call from scheduler
+ * @param repos_listener pointer to repos listener
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_repos_listener_start_listen(axis2_repos_listener_t *listener,
+ const axis2_env_t *env);
/**
* @param env pointer to environment struct
* @return pointer to newly created deployment engine
*/
AXIS2_EXTERN axis2_repos_listener_t *AXIS2_CALL
- axis2_repos_listener_create(
- const axis2_env_t *env);
+ axis2_repos_listener_create(const axis2_env_t *env);
/**
* @param env pointer to environment struct
@@ -153,46 +126,33 @@
* @return pointer to newly created deployment engine
*/
AXIS2_EXTERN axis2_repos_listener_t *AXIS2_CALL
- axis2_repos_listener_create_with_folder_name_and_dep_engine(
- const axis2_env_t *env,
+ axis2_repos_listener_create_with_folder_name_and_dep_engine(const axis2_env_t *env,
axis2_char_t *folder_name,
struct axis2_dep_engine *dep_engine);
-/*************************** Function macros **********************************/
-
-/** Frees the repos listener.
- @sa axis2_repos_listener_ops#free */
+/** Frees the repos listener. */
#define AXIS2_REPOS_LISTENER_FREE(repos_listener, env) \
- ((repos_listener)->ops->free (repos_listener, env))
+ axis2_repos_listener_free (repos_listener, env)
-/** Check modules.
- @sa axis2_repos_listener_ops#check_modules */
+/** Check modules. */
#define AXIS2_REPOS_LISTENER_CHECK_MODULES(repos_listener, env) \
- ((repos_listener)->ops->check_modules (repos_listener, env))
+ axis2_repos_listener_check_modules (repos_listener, env)
-/** Check the services.
- @sa axis2_repos_listener_ops#check_svcs */
+/** Check the services. */
#define AXIS2_REPOS_LISTENER_CHECK_SVCS(repos_listener, env) \
- ((repos_listener)->ops->check_svcs (repos_listener, env))
+ axis2_repos_listener_check_svcs (repos_listener, env)
-/** Update.
- @sa axis2_repos_listener_ops#update */
+/** Update. */
#define AXIS2_REPOS_LISTENER_UPDATE(repos_listener, env) \
- ((repos_listener)->ops->update (repos_listener, env))
+ axis2_repos_listener_update (repos_listener, env)
-/** Initialize the repos listener.
- @sa axis2_repos_listener_ops#init */
+/** Initialize the repos listener. */
#define AXIS2_REPOS_LISTENER_INIT(repos_listener, env) \
- ((repos_listener)->ops->init (repos_listener, env))
+ axis2_repos_listener_init (repos_listener, env)
-/** Start listen.
- @sa axis2_repos_listener_ops#start_listen */
+/** Start listen. */
#define AXIS2_REPOS_LISTENER_START_LISTEN(repos_listener, env) \
- ((repos_listener)->ops->start_listen (repos_listener, env))
-
-
-
-/*************************** End of function macros ***************************/
+ axis2_repos_listener_start_listen (repos_listener, env)
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h Thu Mar 15 06:16:07 2007
@@ -47,75 +47,55 @@
struct axis2_dep_engine;
/** Type name for struct axis2_svc_builder */
typedef struct axis2_svc_builder axis2_svc_builder_t;
- /** Type name for struct axis2_svc_builder_ops */
- typedef struct axis2_svc_builder_ops axis2_svc_builder_ops_t;
+
+ /**
+ * De-allocate memory
+ * @param svc_builder pointer to service builder
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_svc_builder_free(axis2_svc_builder_t *svc_builder,
+ const axis2_env_t *env);
/**
- * Service Builder ops struct
- * Encapsulator struct for ops of axis2_svc_builder
+ * top most method that is used to populate service from corresponding OM
+ * @param svc_builder pointer to service builder
+ * @param env pointer to environment struct
+ * @param svc_node pointer to service node
*/
- struct axis2_svc_builder_ops
- {
- /**
- * De-allocate memory
- * @param svc_builder pointer to service builder
- * @param env pointer to environment struct
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_svc_builder_t *svc_builder,
- const axis2_env_t *env);
-
- /**
- * top most method that is used to populate service from corresponding OM
- * @param svc_builder pointer to service builder
- * @param env pointer to environment struct
- * @param svc_node pointer to service node
- */
- axis2_status_t (AXIS2_CALL *
- populate_svc)(
- axis2_svc_builder_t *svc_builder,
- const axis2_env_t *env,
- axiom_node_t *svc_node);
-
- /**
- * @param svc_builder pointer to service builder
- * @param env pointer to environment struct
- * @param module_confs pointer to module configurations
- * @param parent pointer to parent
- * @param svc pointer to service
- */
- axis2_status_t (AXIS2_CALL *
- process_svc_module_conf)(
- axis2_svc_builder_t *svc_builder,
- const axis2_env_t *env,
- axiom_children_qname_iterator_t *module_confs,
- axis2_param_container_t *parent,
- axis2_svc_t *svc);
-
- /**
- * To get the list og modules that is requird to be engage globally
- * @param svc_builder pointer to service builder
- * @param env pointer to environment struct
- * @param module_refs pointer to module refs
- */
- axis2_status_t (AXIS2_CALL *
- process_module_refs)(
- axis2_svc_builder_t *svc_builder,
- const axis2_env_t *env,
- axiom_children_qname_iterator_t *module_refs);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_svc_builder_populate_svc(axis2_svc_builder_t *svc_builder,
+ const axis2_env_t *env,
+ axiom_node_t *svc_node);
- };
+ /**
+ * @param svc_builder pointer to service builder
+ * @param env pointer to environment struct
+ * @param module_confs pointer to module configurations
+ * @param parent pointer to parent
+ * @param svc pointer to service
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_svc_builder_process_svc_module_conf(axis2_svc_builder_t *svc_builder,
+ const axis2_env_t *env,
+ axiom_children_qname_iterator_t *module_confs,
+ axis2_param_container_t *parent,
+ axis2_svc_t *svc);
/**
- * Service Builder struct
+ * To get the list og modules that is requird to be engage globally
+ * @param svc_builder pointer to service builder
+ * @param env pointer to environment struct
+ * @param module_refs pointer to module refs
*/
- struct axis2_svc_builder
- {
- /** Operations of service builder */
- axis2_svc_builder_ops_t *ops;
- struct axis2_desc_builder *desc_builder;
- };
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_svc_builder_process_module_refs(axis2_svc_builder_t *svc_builder,
+ const axis2_env_t *env,
+ axiom_children_qname_iterator_t *module_refs);
+
+ AXIS2_EXTERN struct axis2_desc_builder *AXIS2_CALL
+ axis2_svc_builder_get_desc_builder(const axis2_svc_builder_t *svc_builder,
+ const axis2_env_t *env);
/**
* Creates svc builder struct
@@ -123,8 +103,7 @@
* @return pointer to newly created service builder
*/
AXIS2_EXTERN axis2_svc_builder_t *AXIS2_CALL
- axis2_svc_builder_create(
- const axis2_env_t *env);
+ axis2_svc_builder_create(const axis2_env_t *env);
/**
* Creates svc builder struct
@@ -135,8 +114,7 @@
* @return pointer to newly created service builder
*/
AXIS2_EXTERN axis2_svc_builder_t *AXIS2_CALL
- axis2_svc_builder_create_with_file_and_dep_engine_and_svc(
- const axis2_env_t *env,
+ axis2_svc_builder_create_with_file_and_dep_engine_and_svc(const axis2_env_t *env,
axis2_char_t *file_name,
struct axis2_dep_engine *dep_engine,
axis2_svc_t *svc);
@@ -149,30 +127,21 @@
* @return pointer to newly created service builder
*/
AXIS2_EXTERN axis2_svc_builder_t *AXIS2_CALL
- axis2_svc_builder_create_with_dep_engine_and_svc(
- const axis2_env_t *env,
+ axis2_svc_builder_create_with_dep_engine_and_svc(const axis2_env_t *env,
struct axis2_dep_engine *dep_engine,
axis2_svc_t *svc);
-/*************************** Function macros **********************************/
-
-/** Frees the service builder.
- @sa axis2_svc_builder_ops#free */
+/** Frees the service builder. */
#define AXIS2_SVC_BUILDER_FREE(svc_builder, env) \
- ((svc_builder)->ops->free (svc_builder, env))
+ axis2_svc_builder_free (svc_builder, env)
-/** Populates the service.
- @sa axis2_svc_builder_ops#populate_svc */
+/** Populates the service. */
#define AXIS2_SVC_BUILDER_POPULATE_SVC(svc_builder, env, svc_node) \
- ((svc_builder)->ops->populate_svc (svc_builder, env, svc_node))
+ axis2_svc_builder_populate_svc (svc_builder, env, svc_node)
-/** Process module refs.
- @sa axis2_svc_builder_ops#process_module_refs */
+/** Process module refs. */
#define AXIS2_SVC_BUILDER_PROCESS_MODULE_REFS(svc_builder, env, module_refs) \
- ((svc_builder)->ops->process_module_refs (svc_builder, env, module_refs))
-
-
-/*************************** End of function macros ***************************/
+ axis2_svc_builder_process_module_refs (svc_builder, env, module_refs)
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h Thu Mar 15 06:16:07 2007
@@ -43,63 +43,44 @@
/** Type name for struct axis2_svc_grp_builder */
typedef struct axis2_svc_grp_builder axis2_svc_grp_builder_t;
- /** Type name for struct axis2_svc_grp_builder_ops */
- typedef struct axis2_svc_grp_builder_ops axis2_svc_grp_builder_ops_t;
- /**
- * Service Group Builder ops struct
- * Encapsulator struct for ops of axis2_svc_grp_builder
+ /**
+ * De-allocate memory
+ * @param svc_grp_builder pointer to service group builder
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- struct axis2_svc_grp_builder_ops
- {
- /**
- * De-allocate memory
- * @param svc_grp_builder pointer to service group builder
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_svc_grp_builder_t *svc_grp_builder,
- const axis2_env_t *env);
-
- /**
- * @param grp_builder pointer to group builder
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- populate_svc_grp)(
- axis2_svc_grp_builder_t *grp_builder,
- const axis2_env_t *env,
- axis2_svc_grp_t *svc_grp);
-
- /**
- * To get the list og modules that is requird to be engage globally
- * @param grp_builder pointer to group builder
- * @param env pointer to environment struct
- * @param module_refs <code>axiom_children_qname_iterator_t</code>
- * @param svc_group pointer to service group
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- process_module_refs)(
- axis2_svc_grp_builder_t *grp_builder,
- const axis2_env_t *env,
- axiom_children_qname_iterator_t *module_refs ,
- axis2_svc_grp_t *svc_grp);
-
- };
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_svc_grp_builder_free(axis2_svc_grp_builder_t *svc_grp_builder,
+ const axis2_env_t *env);
+
+ /**
+ * @param grp_builder pointer to group builder
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_svc_grp_builder_populate_svc_grp(axis2_svc_grp_builder_t *grp_builder,
+ const axis2_env_t *env,
+ axis2_svc_grp_t *svc_grp);
/**
- * Service Group Builder struct
+ * To get the list og modules that is requird to be engage globally
+ * @param grp_builder pointer to group builder
+ * @param env pointer to environment struct
+ * @param module_refs <code>axiom_children_qname_iterator_t</code>
+ * @param svc_group pointer to service group
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- struct axis2_svc_grp_builder
- {
- /** Operations of Service Group Builder */
- axis2_svc_grp_builder_ops_t *ops;
- axis2_desc_builder_t *desc_builder;
- };
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_svc_grp_builder_process_module_refs(axis2_svc_grp_builder_t *grp_builder,
+ const axis2_env_t *env,
+ axiom_children_qname_iterator_t *module_refs ,
+ axis2_svc_grp_t *svc_grp);
+
+ AXIS2_EXTERN axis2_desc_builder_t *AXIS2_CALL
+ axis2_svc_grp_builder_get_desc_builder(const axis2_svc_grp_builder_t *svc_grp_builder,
+ const axis2_env_t *env);
/**
* Creates svc_grp builder struct
@@ -107,8 +88,7 @@
* @return pointer to newly created service group builder
*/
AXIS2_EXTERN axis2_svc_grp_builder_t *AXIS2_CALL
- axis2_svc_grp_builder_create (
- const axis2_env_t *env);
+ axis2_svc_grp_builder_create (const axis2_env_t *env);
/**
* Creates svc_grp builder struct
@@ -118,31 +98,23 @@
* @return pointer to newly created service group builder
*/
AXIS2_EXTERN axis2_svc_grp_builder_t *AXIS2_CALL
- axis2_svc_grp_builder_create_with_svc_and_dep_engine(
- const axis2_env_t *env,
+ axis2_svc_grp_builder_create_with_svc_and_dep_engine(const axis2_env_t *env,
axiom_node_t *svc,
axis2_dep_engine_t *dep_engine);
-/*************************** Function macros **********************************/
-
-/** Frees the service group builder.
- @sa axis2_svc_grp_builder_ops#free */
+/** Frees the service group builder. */
#define AXIS2_SVC_GRP_BUILDER_FREE(svc_grp_builder, env) \
- ((svc_grp_builder)->ops->free (svc_grp_builder, env))
+ axis2_svc_grp_builder_free (svc_grp_builder, env)
-/** Populates the service group.
- @sa axis2_svc_grp_builder_ops#populate_svc_grp */
+/** Populates the service group. */
#define AXIS2_SVC_GRP_BUILDER_POPULATE_SVC_GRP(svc_grp_builder, env, svc_grp) \
- ((svc_grp_builder)->ops->populate_svc_grp (svc_grp_builder, env, svc_grp))
+ axis2_svc_grp_builder_populate_svc_grp (svc_grp_builder, env, svc_grp)
-/** Process module refs.
- @sa axis2_svc_grp_builder_ops#process_module_refs */
+/** Process module refs. */
#define AXIS2_SVC_GRP_BUILDER_PROCESS_MODULE_REFS(svc_grp_builder, env, \
module_refs, svc_grp) \
- ((svc_grp_builder)->ops->process_module_refs (svc_grp_builder, env, \
- module_refs, svc_grp))
-
-/*************************** End of function macros ***************************/
+ axis2_svc_grp_builder_process_module_refs (svc_grp_builder, env, \
+ module_refs, svc_grp)
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h Thu Mar 15 06:16:07 2007
@@ -46,85 +46,60 @@
/** Type name for struct axis2_ws_info */
typedef struct axis2_ws_info axis2_ws_info_t;
- /** Type name for struct axis2_ws_info_ops */
- typedef struct axis2_ws_info_ops axis2_ws_info_ops_t;
- /**
- * Ws Info ops struct
- * Encapsulator struct for ops of axis2_ws_info
+ /**
+ * De-allocate memory
+ * @param ws_info pointer to ws info
+ * @param env pointer to environment struct
*/
- struct axis2_ws_info_ops
- {
- /**
- * De-allocate memory
- * @param ws_info pointer to ws info
- * @param env pointer to environment struct
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_ws_info_t *ws_info,
- const axis2_env_t *env);
-
- /**
- * @param ws_info pointer to ws info
- * @param env pointer to environment struct
- */
- axis2_char_t *(AXIS2_CALL *
- get_file_name)(
- const axis2_ws_info_t *ws_info,
- const axis2_env_t *env);
-
- /**
- * @param ws_info pointer to ws info
- * @param env pointer to environment struct
- * @param file_name pointer to file name
- */
- axis2_status_t (AXIS2_CALL *
- set_file_name)(
- axis2_ws_info_t *ws_info,
- const axis2_env_t *env,
- axis2_char_t *file_name);
-
- /**
- * @param ws_info pointer to ws info
- * @param env pointer to environment struct
- */
- long (AXIS2_CALL *
- get_last_modified_date)(
- const axis2_ws_info_t *ws_info,
- const axis2_env_t *env);
-
- /**
- * @param ws_info pointer to ws info
- * @param env pointer to environment struct
- * @param modified_data pointer to modified date
- */
- axis2_status_t (AXIS2_CALL *
- set_last_modified_date)(
- axis2_ws_info_t *ws_info,
- const axis2_env_t *env,
- long last_modified_date);
-
- /**
- * @param ws_info pointer to ws info
- * @param env pointer to environment struct
- */
- int (AXIS2_CALL *
- get_type)(
- const axis2_ws_info_t *ws_info,
- const axis2_env_t *env);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ws_info_free(axis2_ws_info_t *ws_info,
+ const axis2_env_t *env);
- };
+ /**
+ * @param ws_info pointer to ws info
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ axis2_ws_info_get_file_name(const axis2_ws_info_t *ws_info,
+ const axis2_env_t *env);
- /**
- * Ws Info struct
+ /**
+ * @param ws_info pointer to ws info
+ * @param env pointer to environment struct
+ * @param file_name pointer to file name
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ws_info_set_file_name(axis2_ws_info_t *ws_info,
+ const axis2_env_t *env,
+ axis2_char_t *file_name);
+
+ /**
+ * @param ws_info pointer to ws info
+ * @param env pointer to environment struct
+ */
+ AXIS2_EXTERN long AXIS2_CALL
+ axis2_ws_info_get_last_modified_date(const axis2_ws_info_t *ws_info,
+ const axis2_env_t *env);
+
+ /**
+ * @param ws_info pointer to ws info
+ * @param env pointer to environment struct
+ * @param modified_data pointer to modified date
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ws_info_set_last_modified_date(axis2_ws_info_t *ws_info,
+ const axis2_env_t *env,
+ long last_modified_date);
+
+ /**
+ * @param ws_info pointer to ws info
+ * @param env pointer to environment struct
*/
- struct axis2_ws_info
- {
- /** Operations of ws info */
- axis2_ws_info_ops_t *ops;
- };
+ AXIS2_EXTERN int AXIS2_CALL
+ axis2_ws_info_get_type(const axis2_ws_info_t *ws_info,
+ const axis2_env_t *env);
/**
* Creates description builder struct
@@ -134,8 +109,7 @@
* @return pointer to newly created ws info
*/
AXIS2_EXTERN axis2_ws_info_t *AXIS2_CALL
- axis2_ws_info_create_with_file_name_and_last_modified_date(
- const axis2_env_t *env,
+ axis2_ws_info_create_with_file_name_and_last_modified_date(const axis2_env_t *env,
axis2_char_t *file_name,
long last_modified_date);
@@ -146,46 +120,34 @@
* @param type type
*/
AXIS2_EXTERN axis2_ws_info_t *AXIS2_CALL
- axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
- const axis2_env_t *env,
+ axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(const axis2_env_t *env,
axis2_char_t *file_name,
long last_modified_date,
int type);
-/*************************** Function macros **********************************/
-
-/** Frees the ws info.
- @sa axis2_ws_info_ops#free */
+/** Frees the ws info. */
#define AXIS2_WS_INFO_FREE(ws_info, env) \
- ((ws_info)->ops->free (ws_info, env))
+ axis2_ws_info_free (ws_info, env)
-/** Gets the file name.
- @sa axis2_ws_info_ops#get_file_name */
+/** Gets the file name. */
#define AXIS2_WS_INFO_GET_FILE_NAME(ws_info, env) \
- ((ws_info)->ops->get_file_name (ws_info, env))
+ axis2_ws_info_get_file_name (ws_info, env)
-/** Set file name.
- @sa axis2_ws_info_ops#set_file_name */
+/** Set file name. */
#define AXIS2_WS_INFO_SET_FILE_NAME(ws_info, env, file_name) \
- ((ws_info)->ops->set_file_name (ws_info, env, file_name))
+ axis2_ws_info_set_file_name (ws_info, env, file_name)
-/** Gets the last modified date.
- @sa axis2_ws_info_ops#get_last_modified_date */
+/** Gets the last modified date. */
#define AXIS2_WS_INFO_GET_LAST_MODIFIED_DATE(ws_info, env) \
- ((ws_info)->ops->get_last_modified_date (ws_info, env))
+ axis2_ws_info_get_last_modified_date (ws_info, env)
-/** Sets the last modified date.
- @sa axis2_ws_info_ops#set_last_modified_date */
+/** Sets the last modified date. */
#define AXIS2_WS_INFO_SET_LAST_MODIFIED_DATE(ws_info, env, last_modified_date) \
- ((ws_info)->ops->set_last_modified_date (ws_info, env, last_modified_date))
+ axis2_ws_info_set_last_modified_date (ws_info, env, last_modified_date)
-/** Get type.
- @sa axis2_ws_info_ops#get_type */
+/** Get type. */
#define AXIS2_WS_INFO_GET_TYPE(ws_info, env) \
- ((ws_info)->ops->get_type (ws_info, env))
-
-
-/*************************** End of function macros ***************************/
+ axis2_ws_info_get_type (ws_info, env)
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h Thu Mar 15 06:16:07 2007
@@ -52,137 +52,109 @@
/** Type name for struct axis2_ws_info_list */
typedef struct axis2_ws_info_list axis2_ws_info_list_t;
- /** Type name for struct axis2_ws_info_list_ops */
- typedef struct axis2_ws_info_list_ops axis2_ws_info_list_ops_t;
+
+ /**
+ * De-allocate memory
+ * @param ws_info_list pointer to ws info list
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ws_info_list_free(axis2_ws_info_list_t *ws_info_list,
+ const axis2_env_t *env);
+
+ /**
+ * This method is used to initialize the vector
+ * @param info_list pointer to ws info list
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ws_info_list_init(axis2_ws_info_list_t *info_list,
+ const axis2_env_t *env);
+
+ /**
+ * First it check whether the file is already available in the
+ * system call isFileExist , if it is not deployed yet then it will add
+ * that to jarlist and to the deployment engine as new service or module
+ * in adding new item to jarlist it first create optimice and requird object to
+ * keep those infor call WSInfo and that will be added to jarist and actual
+ * jar file will be added to DeploymentEngine
+ * <p/>
+ * If it is alredy exsit then it check whether it has been updated
+ * then change the last update date of the wsInfo and added two entries to
+ * DeploymentEngine one for New Deployment and other for undeployment
+ * @param info_list pointer to ws info list
+ * @param env pointer to environment struct
+ * @param file actual jar files for either Module or service
+ * @param type indicate either Service or Module
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ws_info_list_add_ws_info_item(axis2_ws_info_list_t *info_list,
+ const axis2_env_t *env,
+ axis2_file_t *file,
+ int type);
/**
- * Ws Info List ops struct
- * Encapsulator struct for ops of axis2_ws_info_list
+ * This method is used to check whether the file exist and if so
+ * it will return related wsinfo object to the file, else return null;
+ * @param info_list pointer to ws info list
+ * @param env pointer to environment struct
+ * @param file_name pointer to file name
*/
- struct axis2_ws_info_list_ops
- {
- /**
- * De-allocate memory
- * @param ws_info_list pointer to ws info list
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_ws_info_list_t *ws_info_list,
- const axis2_env_t *env);
-
- /**
- * This method is used to initialize the vector
- * @param info_list pointer to ws info list
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- init)(
- axis2_ws_info_list_t *info_list,
- const axis2_env_t *env);
-
- /**
- * First it check whether the file is already available in the
- * system call isFileExist , if it is not deployed yet then it will add
- * that to jarlist and to the deployment engine as new service or module
- * in adding new item to jarlist it first create optimice and requird object to
- * keep those infor call WSInfo and that will be added to jarist and actual
- * jar file will be added to DeploymentEngine
- * <p/>
- * If it is alredy exsit then it check whether it has been updated
- * then change the last update date of the wsInfo and added two entries to
- * DeploymentEngine one for New Deployment and other for undeployment
- * @param info_list pointer to ws info list
- * @param env pointer to environment struct
- * @param file actual jar files for either Module or service
- * @param type indicate either Service or Module
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- add_ws_info_item)(
- axis2_ws_info_list_t *info_list,
- const axis2_env_t *env,
- axis2_file_t *file,
- int type);
-
- /**
- * This method is used to check whether the file exist and if so
- * it will return related wsinfo object to the file, else return null;
- * @param info_list pointer to ws info list
- * @param env pointer to environment struct
- * @param file_name pointer to file name
- */
- axis2_ws_info_t *(AXIS2_CALL *
- get_file_item)(
- axis2_ws_info_list_t *info_list,
- const axis2_env_t *env,
- axis2_char_t *file_name);
-
- /**
- * compare the last update dates of both files and if those differ
- * it will assumed as the file has been modified
- * @param info_list pointer to ws info list
- * @param env pointer to environment struct
- * @param file pointer to file
- * @param ws_info pointer to ws info
- */
- axis2_bool_t (AXIS2_CALL *
- is_modified)(
- axis2_ws_info_list_t *info_list,
- const axis2_env_t *env,
- axis2_file_t *file,
- struct axis2_ws_info *ws_info);
-
- /**
- * to check whether the file is alredy in the list
- * @param info_list pointer to ws info list
- * @param env pointer to environment struct
- * @param file_name pointer to file name
- */
- axis2_bool_t (AXIS2_CALL *
- is_file_exist)(
- axis2_ws_info_list_t *info_list,
- const axis2_env_t *env,
- axis2_char_t *file_name);
-
- /**
- * this is to check , undeploye WS
- * What this relly does is it check older jars files and
- * current jars. If name of the old jar file does not exit in the currentjar
- * list then it is assumed that the jar file has been removed
- * that is hot undeployment
- * @param env pointer to environment struct
- * @param file_name pointer to file name
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- check_for_undeploy)(
- axis2_ws_info_list_t *info_list,
- const axis2_env_t *env);
-
-
- /**
- * @param env pointer to environment struct
- * @param file_name pointer to file name
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- update)(
- axis2_ws_info_list_t *info_list,
- const axis2_env_t *env);
-
- };
-
- /**
- * Ws Info List struct
- */
- struct axis2_ws_info_list
- {
- /** Operations of ws info list */
- axis2_ws_info_list_ops_t *ops;
- };
+ AXIS2_EXTERN axis2_ws_info_t *AXIS2_CALL
+ axis2_ws_info_list_get_file_item(axis2_ws_info_list_t *info_list,
+ const axis2_env_t *env,
+ axis2_char_t *file_name);
+
+ /**
+ * compare the last update dates of both files and if those differ
+ * it will assumed as the file has been modified
+ * @param info_list pointer to ws info list
+ * @param env pointer to environment struct
+ * @param file pointer to file
+ * @param ws_info pointer to ws info
+ */
+ AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+ axis2_ws_info_list_is_modified(axis2_ws_info_list_t *info_list,
+ const axis2_env_t *env,
+ axis2_file_t *file,
+ struct axis2_ws_info *ws_info);
+
+ /**
+ * to check whether the file is alredy in the list
+ * @param info_list pointer to ws info list
+ * @param env pointer to environment struct
+ * @param file_name pointer to file name
+ */
+ AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+ axis2_ws_info_list_is_file_exist(axis2_ws_info_list_t *info_list,
+ const axis2_env_t *env,
+ axis2_char_t *file_name);
+
+ /**
+ * this is to check , undeploye WS
+ * What this relly does is it check older jars files and
+ * current jars. If name of the old jar file does not exit in the currentjar
+ * list then it is assumed that the jar file has been removed
+ * that is hot undeployment
+ * @param env pointer to environment struct
+ * @param file_name pointer to file name
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ws_info_list_check_for_undeploy(axis2_ws_info_list_t *info_list,
+ const axis2_env_t *env);
+
+ /**
+ * @param env pointer to environment struct
+ * @param file_name pointer to file name
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_ws_info_list_update(axis2_ws_info_list_t *info_list,
+ const axis2_env_t *env);
/**
* Creates ws info list struct
@@ -191,52 +163,40 @@
* @return pointer to newly created ws info list
*/
AXIS2_EXTERN axis2_ws_info_list_t *AXIS2_CALL
- axis2_ws_info_list_create_with_dep_engine(
- const axis2_env_t *env,
+ axis2_ws_info_list_create_with_dep_engine(const axis2_env_t *env,
struct axis2_dep_engine *dep_engine);
-
-/*************************** Function macros **********************************/
-
-/** Frees the ws info list.
- @sa axis2_ws_info_list_ops#free */
+/** Frees the ws info list. */
#define AXIS2_WS_INFO_LIST_FREE(ws_info_list, env) \
- ((ws_info_list)->ops->free (ws_info_list, env))
+ axis2_ws_info_list_free (ws_info_list, env)
-/** Initialize the ws info list.
- @sa axis2_ws_info_list_ops#init */
+/** Initialize the ws info list. */
#define AXIS2_WS_INFO_LIST_INIT(ws_info_list, env) \
- ((ws_info_list)->ops->init (ws_info_list, env))
+ axis2_ws_info_list_init (ws_info_list, env)
-/** Add ws info item.
- @sa axis2_ws_info_list_ops#add_ws_info_item */
+/** Add ws info item. */
#define AXIS2_WS_INFO_LIST_ADD_WS_INFO_ITEM(ws_info_list, env, file, type) \
- ((ws_info_list)->ops->add_ws_info_item (ws_info_list, env, file, type))
+ axis2_ws_info_list_add_ws_info_item (ws_info_list, env, file, type)
-/** Get file item.
- @sa axis2_ws_info_list_ops#get_file_item */
+/** Get file item. */
#define AXIS2_WS_INFO_LIST_GET_FILE_ITEM(ws_info_list, env, file_name) \
- ((ws_info_list)->ops->get_file_item (ws_info_list, env, file_name))
+ axis2_ws_info_list_get_file_item (ws_info_list, env, file_name)
-/** Is modified.
- @sa axis2_ws_info_list_ops#is_modified */
+/** Is modified. */
#define AXIS2_WS_INFO_LIST_IS_MODIFIED(ws_info_list, env, file, ws_info) \
- ((ws_info_list)->ops->is_modified (ws_info_list, env, file, ws_info))
+ axis2_ws_info_list_is_modified (ws_info_list, env, file, ws_info)
-/** Is file exist.
- @sa axis2_ws_info_list_ops#is_file_exist */
+/** Is file exist. */
#define AXIS2_WS_INFO_LIST_IS_FILE_EXIST(ws_info_list, env, file_name) \
- ((ws_info_list)->ops->is_file_exist (ws_info_list, env, file_name))
+ axis2_ws_info_list_is_file_exist (ws_info_list, env, file_name)
-/** Check for undeploy.
- @sa axis2_ws_info_list_ops#check_for_undeploy */
+/** Check for undeploy. */
#define AXIS2_WS_INFO_LIST_CHECK_FOR_UNDEPLOY(ws_info_list, env) \
- ((ws_info_list)->ops->check_for_undeploy (ws_info_list, env))
+ axis2_ws_info_list_check_for_undeploy (ws_info_list, env)
-/** Update.
- @sa axis2_ws_info_list_ops#update */
+/** Update. */
#define AXIS2_WS_INFO_LIST_UPDATE(ws_info_list, env) \
- ((ws_info_list)->ops->update (ws_info_list, env))
+ axis2_ws_info_list_update (ws_info_list, env)
/*************************** End of function macros ***************************/
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Thu Mar 15 06:16:07 2007
@@ -24,56 +24,29 @@
#include <axis2_utils.h>
#include <axis2_transport_receiver.h>
-typedef struct axis2_conf_builder_impl
+struct axis2_conf_builder
{
- axis2_conf_builder_t conf_builder;
axis2_conf_t *conf;
-
-}
-axis2_conf_builder_impl_t;
-
-#define AXIS2_INTF_TO_IMPL(conf_builder) \
- ((axis2_conf_builder_impl_t *) conf_builder)
-
-/************************* Function prototypes ********************************/
-
-axis2_status_t AXIS2_CALL
-axis2_conf_builder_free(
- axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_conf_builder_populate_conf(
- axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env);
-
-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);
+ struct axis2_desc_builder *desc_builder;
+};
static axis2_status_t
-axis2_conf_builder_process_disp_order(
- axis2_conf_builder_t *conf_builder,
+axis2_conf_builder_process_disp_order(axis2_conf_builder_t *conf_builder,
const axis2_env_t *env,
- axiom_node_t *disp_order);
+ axiom_node_t *disp_order_node);
static axis2_status_t
-axis2_conf_builder_process_phase_orders(
- axis2_conf_builder_t *conf_builder,
+axis2_conf_builder_process_phase_orders(axis2_conf_builder_t *conf_builder,
const axis2_env_t *env,
axiom_children_qname_iterator_t *phase_orders);
static axis2_array_list_t *
-axis2_conf_builder_get_phase_list(
- axis2_conf_builder_t *conf_builder,
+axis2_conf_builder_get_phase_list(axis2_conf_builder_t *conf_builder,
const axis2_env_t *env,
- axiom_node_t *phase_orders);
+ axiom_node_t *phase_orders_node);
static axis2_status_t
-axis2_conf_builder_process_transport_senders(
- axis2_conf_builder_t *conf_builder,
+axis2_conf_builder_process_transport_senders(axis2_conf_builder_t *conf_builder,
const axis2_env_t *env,
axiom_children_qname_iterator_t *trs_senders);
@@ -83,51 +56,34 @@
const axis2_env_t *env,
axiom_children_qname_iterator_t *trs_recvs);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
axis2_conf_builder_process_default_module_versions(
axis2_conf_builder_t *conf_builder,
const axis2_env_t *env,
axiom_children_qname_iterator_t *module_versions);
-/************************** End of function prototypes ************************/
AXIS2_EXTERN axis2_conf_builder_t *AXIS2_CALL
axis2_conf_builder_create(
const axis2_env_t *env)
{
- axis2_conf_builder_impl_t *conf_builder_impl = NULL;
+ axis2_conf_builder_t *conf_builder = NULL;
AXIS2_ENV_CHECK(env, NULL);
- conf_builder_impl = (axis2_conf_builder_impl_t *) AXIS2_MALLOC(env->
- allocator, sizeof(axis2_conf_builder_impl_t));
-
-
- if (NULL == conf_builder_impl)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
+ conf_builder = (axis2_conf_builder_t *) AXIS2_MALLOC(env->
+ allocator, sizeof(axis2_conf_builder_t));
- conf_builder_impl->conf = NULL;
- conf_builder_impl->conf_builder.ops = NULL;
- conf_builder_impl->conf_builder.ops =
- AXIS2_MALLOC(env->allocator, sizeof(axis2_conf_builder_ops_t));
- if (NULL == conf_builder_impl->conf_builder.ops)
+ if (NULL == conf_builder)
{
- axis2_conf_builder_free(&(conf_builder_impl->conf_builder), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- conf_builder_impl->conf_builder.ops->free = axis2_conf_builder_free;
- conf_builder_impl->conf_builder.ops->populate_conf =
- axis2_conf_builder_populate_conf;
- conf_builder_impl->conf_builder.ops->process_module_refs =
- axis2_conf_builder_process_module_refs;
+ conf_builder->conf = NULL;
- return &(conf_builder_impl->conf_builder);
+ return conf_builder;
}
AXIS2_EXTERN axis2_conf_builder_t *AXIS2_CALL
@@ -137,64 +93,50 @@
axis2_dep_engine_t *engine,
axis2_conf_t *conf)
{
- axis2_conf_builder_impl_t *builder_impl = NULL;
+ axis2_conf_builder_t *conf_builder = NULL;
AXIS2_ENV_CHECK(env, NULL);
- builder_impl = (axis2_conf_builder_impl_t *) axis2_conf_builder_create(
+ conf_builder = (axis2_conf_builder_t *) axis2_conf_builder_create(
env);
- if (NULL == builder_impl)
+ if (NULL == conf_builder)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- builder_impl->conf_builder.desc_builder =
+ conf_builder->desc_builder =
axis2_desc_builder_create_with_file_and_dep_engine(env, file, engine);
- builder_impl->conf = conf;
+ conf_builder->conf = conf;
- return &(builder_impl->conf_builder);
+ return conf_builder;
}
-/***************************Function implementation****************************/
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_conf_builder_free(
axis2_conf_builder_t *conf_builder,
const axis2_env_t *env)
{
- axis2_conf_builder_impl_t *conf_builder_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- conf_builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
-
if (conf_builder->desc_builder)
{
AXIS2_DESC_BUILDER_FREE(conf_builder->desc_builder, env);
- conf_builder->desc_builder = NULL;
}
- if (conf_builder->ops)
+ if (conf_builder)
{
- AXIS2_FREE(env->allocator, conf_builder->ops);
- conf_builder->ops = NULL;
- }
-
- if (conf_builder_impl)
- {
- AXIS2_FREE(env->allocator, conf_builder_impl);
- conf_builder_impl = NULL;
+ AXIS2_FREE(env->allocator, conf_builder);
}
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_conf_builder_populate_conf(
axis2_conf_builder_t *conf_builder,
const axis2_env_t *env)
{
- axis2_conf_builder_impl_t *builder_impl = NULL;
axis2_qname_t *qparamst = NULL;
axis2_qname_t *qmsgrecv = NULL;
axis2_qname_t *qdisporder = NULL;
@@ -218,7 +160,6 @@
axis2_param_t *param = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
conf_node = AXIS2_DESC_BUILDER_BUILD_OM(conf_builder->desc_builder, env);
if (!conf_node)
@@ -233,7 +174,8 @@
conf_node);
AXIS2_QNAME_FREE(qparamst, env);
AXIS2_DESC_BUILDER_PROCESS_PARAMS(conf_builder->desc_builder, env, itr,
- builder_impl->conf->param_container, builder_impl->conf->param_container);
+ axis2_conf_get_param_container(conf_builder->conf, env),
+ axis2_conf_get_param_container(conf_builder->conf, env));
/* process Message Reciver */
qmsgrecv = axis2_qname_create(env, AXIS2_MESSAGERECEIVER, NULL, NULL);
msg_recvs = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
@@ -261,7 +203,7 @@
qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
mep_att = AXIOM_ELEMENT_GET_ATTRIBUTE(msg_recv_element, env, qmep);
att_value = axiom_attribute_get_value(mep_att, env);
- AXIS2_CONF_ADD_MSG_RECV(builder_impl->conf, env, att_value, msg_recv);
+ AXIS2_CONF_ADD_MSG_RECV(conf_builder->conf, env, att_value, msg_recv);
AXIS2_QNAME_FREE(qmep, env);
}
@@ -278,7 +220,7 @@
}
else
{
- status = AXIS2_CONF_SET_DEFAULT_DISPATCHERS(builder_impl->conf, env);
+ status = AXIS2_CONF_SET_DEFAULT_DISPATCHERS(conf_builder->conf, env);
if (AXIS2_SUCCESS != status)
{
return AXIS2_FAILURE;
@@ -335,7 +277,8 @@
}
/* TODO processing Axis Storages */
- param = axis2_param_container_get_param(builder_impl->conf->param_container,
+ param = axis2_param_container_get_param(
+ axis2_conf_get_param_container(conf_builder->conf, env),
env, AXIS2_ENABLE_MTOM);
if (param)
{
@@ -343,7 +286,7 @@
value = AXIS2_PARAM_GET_VALUE(param, env);
if (value)
{
- axis2_conf_set_enable_mtom(builder_impl->conf, env,
+ axis2_conf_set_enable_mtom(conf_builder->conf, env,
(AXIS2_STRCMP(value, AXIS2_VALUE_TRUE) == 0));
}
}
@@ -351,18 +294,16 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+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)
{
- axis2_conf_builder_impl_t *builder_impl = NULL;
axis2_status_t status = AXIS2_SUCCESS;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_refs, AXIS2_FAILURE);
- builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(module_refs,
env))
@@ -392,8 +333,9 @@
ref_name = axiom_attribute_get_value(module_ref_att, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "module %s found in axis2.xml", ref_name);
qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
- status = AXIS2_DEP_ENGINE_ADD_MODULE(conf_builder->desc_builder->
- engine, env, qrefname);
+ status = AXIS2_DEP_ENGINE_ADD_MODULE(
+ axis2_desc_builder_get_dep_engine(conf_builder->desc_builder, env),
+ env, qrefname);
if (qrefname)
AXIS2_QNAME_FREE(qrefname, env);
}
@@ -407,7 +349,6 @@
const axis2_env_t *env,
axiom_node_t *disp_order_node)
{
- axis2_conf_builder_impl_t *builder_impl = NULL;
axiom_element_t *disp_order_element = NULL;
axiom_children_qname_iterator_t *disps = NULL;
axis2_qname_t *qdisp = NULL;
@@ -419,7 +360,6 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, disp_order_node, AXIS2_FAILURE);
- builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
disp_order_element = AXIOM_NODE_GET_DATA_ELEMENT(
disp_order_node, env);
@@ -506,7 +446,7 @@
}
else
{
- status = AXIS2_CONF_SET_DISPATCH_PHASE(builder_impl->conf, env, disp_phase);
+ status = AXIS2_CONF_SET_DISPATCH_PHASE(conf_builder->conf, env, disp_phase);
if (AXIS2_SUCCESS != status)
{
AXIS2_PHASE_FREE(disp_phase, env);
@@ -526,15 +466,14 @@
const axis2_env_t *env,
axiom_children_qname_iterator_t *phase_orders)
{
- axis2_conf_builder_impl_t *builder_impl = NULL;
axis2_phases_info_t *info = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, phase_orders, AXIS2_FAILURE);
- builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
- info = AXIS2_DEP_ENGINE_GET_PHASES_INFO(conf_builder->desc_builder->engine,
- env);
+ info = AXIS2_DEP_ENGINE_GET_PHASES_INFO(
+ axis2_desc_builder_get_dep_engine(conf_builder->desc_builder, env),
+ env);
while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(phase_orders, env))
{
axiom_node_t *phase_orders_node = NULL;
@@ -604,7 +543,6 @@
const axis2_env_t *env,
axiom_node_t *phase_orders_node)
{
- axis2_conf_builder_impl_t *builder_impl = NULL;
axis2_array_list_t *phase_list = NULL;
axiom_children_qname_iterator_t *phases = NULL;
axis2_qname_t *qphase = NULL;
@@ -612,7 +550,6 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, phase_orders_node, AXIS2_FAILURE);
- builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
phase_orders_element = AXIOM_NODE_GET_DATA_ELEMENT(phase_orders_node,
env);
@@ -675,12 +612,10 @@
const axis2_env_t *env,
axiom_children_qname_iterator_t *trs_senders)
{
- axis2_conf_builder_impl_t *builder_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, trs_senders, AXIS2_FAILURE);
- builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(trs_senders,
env))
@@ -794,8 +729,9 @@
axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
- repos_name = AXIS2_DEP_ENGINE_GET_REPOS_PATH(conf_builder->
- desc_builder->engine, env);
+ repos_name = AXIS2_DEP_ENGINE_GET_REPOS_PATH(
+ axis2_desc_builder_get_dep_engine(conf_builder->desc_builder, env),
+ env);
temp_path = AXIS2_STRACAT(repos_name, AXIS2_PATH_SEP_STR, env);
temp_path2 = AXIS2_STRACAT(temp_path, AXIS2_LIB_FOLDER, env);
temp_path3 = AXIS2_STRACAT(temp_path2, AXIS2_PATH_SEP_STR, env);
@@ -829,8 +765,8 @@
AXIS2_QNAME_FREE(qparamst, env);
status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(conf_builder->desc_builder, env,
itr,
- axis2_transport_out_desc_param_container(transport_out, env), builder_impl->conf->
- param_container);
+ axis2_transport_out_desc_param_container(transport_out, env),
+ axis2_conf_get_param_container(conf_builder->conf, env));
if (AXIS2_SUCCESS != status)
{
axis2_transport_out_desc_free(transport_out, env);
@@ -857,7 +793,8 @@
axis2_flow_t *flow = NULL;
flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(conf_builder->desc_builder,
- env, out_flow_element, builder_impl->conf->param_container,
+ env, out_flow_element,
+ axis2_conf_get_param_container(conf_builder->conf, env),
out_flow_node);
status = axis2_transport_out_desc_set_out_flow(transport_out, env, flow);
if (AXIS2_SUCCESS != status)
@@ -893,7 +830,8 @@
axis2_flow_t *flow = NULL;
flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(conf_builder->desc_builder,
- env, out_fault_flow_element, builder_impl->conf->param_container,
+ env, out_fault_flow_element,
+ axis2_conf_get_param_container(conf_builder->conf, env),
out_fault_flow_node);
status = axis2_transport_out_desc_set_fault_out_flow(transport_out, env, flow);
if (AXIS2_SUCCESS != status)
@@ -904,7 +842,7 @@
}
/* adding to axis config */
- status = AXIS2_CONF_ADD_TRANSPORT_OUT(builder_impl->conf, env,
+ status = AXIS2_CONF_ADD_TRANSPORT_OUT(conf_builder->conf, env,
transport_out, transport_enum);
if (AXIS2_SUCCESS != status)
{
@@ -924,12 +862,10 @@
const axis2_env_t *env,
axiom_children_qname_iterator_t *trs_recvs)
{
- axis2_conf_builder_impl_t *builder_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, trs_recvs, AXIS2_FAILURE);
- builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(trs_recvs,
env))
@@ -1034,8 +970,9 @@
axis2_dll_desc_create_platform_specific_dll_name(dll_desc,
env, class_name);
- repos_name = AXIS2_DEP_ENGINE_GET_REPOS_PATH(conf_builder->
- desc_builder->engine, env);
+ repos_name = AXIS2_DEP_ENGINE_GET_REPOS_PATH(
+ axis2_desc_builder_get_dep_engine(conf_builder->desc_builder, env),
+ env);
temp_path = AXIS2_STRACAT(repos_name, AXIS2_PATH_SEP_STR, env);
temp_path2 = AXIS2_STRACAT(temp_path, AXIS2_LIB_FOLDER, env);
temp_path3 = AXIS2_STRACAT(temp_path2, AXIS2_PATH_SEP_STR, env);
@@ -1070,7 +1007,7 @@
status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(conf_builder->desc_builder, env,
itr,
axis2_transport_in_desc_param_container(transport_in, env),
- builder_impl->conf->param_container);
+ axis2_conf_get_param_container(conf_builder->conf, env));
if (AXIS2_SUCCESS != status)
{
axis2_transport_in_desc_free(transport_in, env);
@@ -1098,8 +1035,9 @@
axis2_flow_t *flow = NULL;
flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(conf_builder->
- desc_builder, env, in_flow_element, builder_impl->conf->
- param_container, in_flow_node);
+ desc_builder, env, in_flow_element,
+ axis2_conf_get_param_container(conf_builder->conf, env),
+ in_flow_node);
status = axis2_transport_in_desc_set_in_flow(transport_in, env,
flow);
if (AXIS2_SUCCESS != status)
@@ -1120,8 +1058,9 @@
axis2_flow_t *flow = NULL;
flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(conf_builder->desc_builder,
- env, in_fault_flow_element, builder_impl->conf->
- param_container, in_fault_flow_node);
+ env, in_fault_flow_element,
+ axis2_conf_get_param_container(conf_builder->conf, env),
+ in_fault_flow_node);
status = axis2_transport_in_desc_set_fault_in_flow(transport_in,
env, flow);
if (AXIS2_SUCCESS != status)
@@ -1144,7 +1083,7 @@
}
/* adding to axis config */
- status = AXIS2_CONF_ADD_TRANSPORT_IN(builder_impl->conf, env,
+ status = AXIS2_CONF_ADD_TRANSPORT_IN(conf_builder->conf, env,
transport_in, transport_enum);
if (AXIS2_SUCCESS != status)
{
@@ -1159,7 +1098,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
axis2_conf_builder_process_default_module_versions(
axis2_conf_builder_t *conf_builder,
const axis2_env_t *env,
@@ -1209,7 +1148,7 @@
return AXIS2_FAILURE;
}
AXIS2_CONF_ADD_DEFAULT_MODULE_VERSION(
- AXIS2_INTF_TO_IMPL(conf_builder)->conf, env, name,
+ conf_builder->conf, env, name,
default_version);
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_init.c?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_init.c Thu Mar 15 06:16:07 2007
@@ -35,7 +35,7 @@
axis2_conf_ctx_t *conf_ctx);
AXIS2_EXTERN axis2_conf_ctx_t *AXIS2_CALL
-build_conf_ctx(
+axis2_build_conf_ctx(
const axis2_env_t *env,
const axis2_char_t *repo_name)
{
@@ -78,7 +78,7 @@
}
axis2_conf_ctx_t *AXIS2_CALL
-build_client_conf_ctx(
+axis2_build_client_conf_ctx(
const axis2_env_t *env,
const axis2_char_t *axis2_home)
{
@@ -216,3 +216,4 @@
return status;
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org