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 pi...@apache.org on 2006/08/09 14:06:43 UTC
svn commit: r430037 - in /webservices/axis2/trunk/c/modules/core/deployment:
axis2_conf_builder.h conf_builder.c
Author: pini
Date: Wed Aug 9 05:06:43 2006
New Revision: 430037
URL: http://svn.apache.org/viewvc?rev=430037&view=rev
Log:
Formatting fixes and parameter changes to const.
Modified:
webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h?rev=430037&r1=430036&r2=430037&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h Wed Aug 9 05:06:43 2006
@@ -17,6 +17,12 @@
#ifndef AXIS2_CONF_BUILDER_H
#define AXIS2_CONF_BUILDER_H
+/**
+ * @defgroup axis2_conf_builder Conf Builder
+ * @ingroup axis2_deployment
+ * @{
+ */
+
/**
* @file axis2_conf_builder.h
* @brief Axis2 Conf Builder interface
@@ -38,83 +44,103 @@
{
#endif
-struct axis2_desc_builder;
-struct axis2_dep_engine;
-typedef struct axis2_conf_builder axis2_conf_builder_t;
-typedef struct axis2_conf_builder_ops axis2_conf_builder_ops_t;
+ struct axis2_desc_builder;
+ struct axis2_dep_engine;
+ /** Type name for struct axis2_conf_builder */
+ typedef struct axis2_conf_builder axis2_conf_builder_t;
+ /** Type name for struct axis2_conf_builder_ops */
+ typedef struct axis2_conf_builder_ops axis2_conf_builder_ops_t;
-/** @defgroup axis2_conf_builder Conf Builder
- * @ingroup axis2_deployment
- * @{
- */
-
-/**
- * @brief Conf Builder ops struct
- * Encapsulator struct for ops of axis2_conf_builder
- */
-AXIS2_DECLARE_DATA struct axis2_conf_builder_ops
-{
- /** De-allocate memory
- * @return status code
- */
- axis2_status_t (AXIS2_CALL *
- free)(axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- populate_conf) (axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env);
-
/**
- * To get the list og modules that is requird to be engage globally
+ * Conf Builder ops struct
+ * Encapsulator struct for ops of axis2_conf_builder
*/
- axis2_status_t (AXIS2_CALL *
- process_module_refs) (axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env,
- axiom_children_qname_iterator_t *module_refs);
-
-
-
-};
+ struct axis2_conf_builder_ops
+ {
+ /**
+ * De-allocate memory
+ * @param conf_builder pointer to configuration builder
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ axis2_status_t (AXIS2_CALL *
+ free)(
+ axis2_conf_builder_t *conf_builder,
+ const axis2_env_t *env);
+
+ /**
+ * @param conf_builder pointer to configuration builder
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ axis2_status_t (AXIS2_CALL *
+ populate_conf)(
+ axis2_conf_builder_t *conf_builder,
+ const axis2_env_t *env);
+
+ /**
+ * To get the list og modules that is requird to be engage globally
+ * @param conf_builder pointer to configuration builder
+ * @param env pointer to environment struct
+ * @param module_refs pointer to module refs
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ axis2_status_t (AXIS2_CALL *
+ process_module_refs)(
+ axis2_conf_builder_t *conf_builder,
+ const axis2_env_t *env,
+ axiom_children_qname_iterator_t *module_refs);
+ };
-/**
- * @brief Conf Builder struct
- */
-AXIS2_DECLARE_DATA struct axis2_conf_builder
-{
- axis2_conf_builder_ops_t *ops;
- struct axis2_desc_builder *desc_builder;
-};
+ /**
+ * Conf Builder struct
+ */
+ struct axis2_conf_builder
+ {
+ /** Operations of conf builder */
+ axis2_conf_builder_ops_t *ops;
+ struct axis2_desc_builder *desc_builder;
+ };
-/**
- * Creates conf builder struct
- * @return pointer to newly created conf builder
- */
-AXIS2_EXTERN axis2_conf_builder_t * AXIS2_CALL
-axis2_conf_builder_create (const axis2_env_t *env);
+ /**
+ * Creates conf builder struct
+ * @param env pointer to environment struct
+ * @return pointer to newly created conf builder
+ */
+ AXIS2_EXTERN axis2_conf_builder_t *AXIS2_CALL
+ axis2_conf_builder_create (
+ const axis2_env_t *env);
-/**
- * Creates conf builder struct
- * @param file This is the full path to the server xml file
- * @param dep_engine
- * @param conf
- * @return pointer to newly created conf builder
- */
+ /**
+ * Creates conf builder struct
+ * @param env pointer to environment struct
+ * @param file This is the full path to the server xml file
+ * @param dep_engine pointer to dep engine
+ * @param conf pointer to conf
+ * @return pointer to newly created conf builder
+ */
-AXIS2_EXTERN axis2_conf_builder_t * AXIS2_CALL
-axis2_conf_builder_create_with_file_and_dep_engine_and_conf (const axis2_env_t *env,
- axis2_char_t *file,
- struct axis2_dep_engine *dep_engine,
- axis2_conf_t *conf);
+ AXIS2_EXTERN axis2_conf_builder_t *AXIS2_CALL
+ axis2_conf_builder_create_with_file_and_dep_engine_and_conf(
+ const axis2_env_t *env,
+ axis2_char_t *file,
+ struct axis2_dep_engine *dep_engine,
+ axis2_conf_t *conf);
/*************************** Function macros **********************************/
+/** Frees the conf builder
+ @sa axis2_conf_builder_ops#free */
#define AXIS2_CONF_BUILDER_FREE(conf_builder, env) \
((conf_builder)->ops->free (conf_builder, env))
+/** Populate conf.
+ @sa axis2_conf_builder_ops#populate_conf */
#define AXIS2_CONF_BUILDER_POPULATE_CONF(conf_builder, env) \
((conf_builder)->ops->populate_conf (conf_builder, env))
+/** Process module refs.
+ @sa axis2_conf_builder_ops#process_module_refs */
#define AXIS2_CONF_BUILDER_PROCESS_MODULE_REFS(conf_builder, env, module_refs) \
((conf_builder)->ops->process_module_refs (conf_builder, env, module_refs))
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?rev=430037&r1=430036&r2=430037&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Wed Aug 9 05:06:43 2006
@@ -22,15 +22,13 @@
#include <axis2_utils.h>
#include <axis2_transport_receiver.h>
-/**
- * @brief
- */
typedef struct axis2_conf_builder_impl
{
- axis2_conf_builder_t conf_builder;
+ axis2_conf_builder_t conf_builder;
axis2_conf_t *conf;
-} axis2_conf_builder_impl_t;
+}
+axis2_conf_builder_impl_t;
#define AXIS2_INTF_TO_IMPL(conf_builder) \
((axis2_conf_builder_impl_t *) conf_builder)
@@ -38,49 +36,62 @@
/************************* Function prototypes ********************************/
axis2_status_t AXIS2_CALL
-axis2_conf_builder_free (axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env);
+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_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);
+axis2_conf_builder_process_module_refs(
+ axis2_conf_builder_t *conf_builder,
+ const axis2_env_t *env,
+ axiom_children_qname_iterator_t *module_refs);
static axis2_status_t
-axis2_conf_builder_process_disp_order(axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env,
- axiom_node_t *disp_order);
+axis2_conf_builder_process_disp_order(
+ axis2_conf_builder_t *conf_builder,
+ const axis2_env_t *env,
+ axiom_node_t *disp_order);
static axis2_status_t
-axis2_conf_builder_process_phase_orders(axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env,
- axiom_children_qname_iterator_t *phase_orders);
+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,
- const axis2_env_t *env,
- axiom_node_t *phase_orders);
+axis2_conf_builder_get_phase_list(
+ axis2_conf_builder_t *conf_builder,
+ const axis2_env_t *env,
+ axiom_node_t *phase_orders);
+
static axis2_status_t
-axis2_conf_builder_process_transport_senders(axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env,
- axiom_children_qname_iterator_t *trs_senders);
+axis2_conf_builder_process_transport_senders(
+ axis2_conf_builder_t *conf_builder,
+ const axis2_env_t *env,
+ axiom_children_qname_iterator_t *trs_senders);
+
static axis2_status_t
-axis2_conf_builder_process_transport_recvs(axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env,
- axiom_children_qname_iterator_t *trs_recvs);
+axis2_conf_builder_process_transport_recvs(
+ axis2_conf_builder_t *conf_builder,
+ const axis2_env_t *env,
+ axiom_children_qname_iterator_t *trs_recvs);
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);
+ 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_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;
@@ -117,11 +128,12 @@
return &(conf_builder_impl->conf_builder);
}
-AXIS2_EXTERN axis2_conf_builder_t * AXIS2_CALL
-axis2_conf_builder_create_with_file_and_dep_engine_and_conf (const axis2_env_t *env,
- axis2_char_t *file,
- axis2_dep_engine_t *engine,
- axis2_conf_t *conf)
+AXIS2_EXTERN axis2_conf_builder_t *AXIS2_CALL
+axis2_conf_builder_create_with_file_and_dep_engine_and_conf(
+ const axis2_env_t *env,
+ axis2_char_t *file,
+ axis2_dep_engine_t *engine,
+ axis2_conf_t *conf)
{
axis2_conf_builder_impl_t *builder_impl = NULL;
@@ -144,8 +156,9 @@
/***************************Function implementation****************************/
axis2_status_t AXIS2_CALL
-axis2_conf_builder_free (axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env)
+axis2_conf_builder_free(
+ axis2_conf_builder_t *conf_builder,
+ const axis2_env_t *env)
{
axis2_conf_builder_impl_t *conf_builder_impl = NULL;
@@ -175,8 +188,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_conf_builder_populate_conf(axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env)
+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;
@@ -320,9 +334,10 @@
}
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_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;
@@ -369,9 +384,10 @@
}
static axis2_status_t
-axis2_conf_builder_process_disp_order(axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env,
- axiom_node_t *disp_order_node)
+axis2_conf_builder_process_disp_order(
+ axis2_conf_builder_t *conf_builder,
+ 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;
@@ -486,9 +502,10 @@
* @param phase_orders
*/
static axis2_status_t
-axis2_conf_builder_process_phase_orders(axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env,
- axiom_children_qname_iterator_t *phase_orders)
+axis2_conf_builder_process_phase_orders(
+ axis2_conf_builder_t *conf_builder,
+ 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;
@@ -564,9 +581,9 @@
static axis2_array_list_t *
axis2_conf_builder_get_phase_list(
- axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env,
- axiom_node_t *phase_orders_node)
+ axis2_conf_builder_t *conf_builder,
+ 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;
@@ -635,9 +652,9 @@
static axis2_status_t
axis2_conf_builder_process_transport_senders(
- axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env,
- axiom_children_qname_iterator_t *trs_senders)
+ axis2_conf_builder_t *conf_builder,
+ 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;
@@ -866,9 +883,9 @@
static axis2_status_t
axis2_conf_builder_process_transport_recvs(
- axis2_conf_builder_t *conf_builder,
- const axis2_env_t *env,
- axiom_children_qname_iterator_t *trs_recvs)
+ axis2_conf_builder_t *conf_builder,
+ 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;
@@ -1092,9 +1109,9 @@
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)
+ axis2_conf_builder_t *conf_builder,
+ const axis2_env_t *env,
+ axiom_children_qname_iterator_t *module_versions)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_versions, AXIS2_FAILURE);
@@ -1145,4 +1162,4 @@
}
return AXIS2_SUCCESS;
}
-
+
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org