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 2007/03/07 15:49:52 UTC
svn commit: r515592 - in /webservices/axis2/trunk/c: include/
modules/core/context/ modules/core/deployment/ modules/core/description/
modules/core/engine/ modules/core/phaseresolver/ modules/core/util/
test/core/description/
Author: pini
Date: Wed Mar 7 06:49:51 2007
New Revision: 515592
URL: http://svn.apache.org/viewvc?view=rev&rev=515592
Log:
Drpped macros, fixed indentation.
Modified:
webservices/axis2/trunk/c/include/axis2_module_desc.h
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/description/module_desc.c
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/util/core_utils.c
webservices/axis2/trunk/c/test/core/description/test_description.c
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=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_module_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_module_desc.h Wed Mar 7 06:49:51 2007
@@ -333,90 +333,6 @@
const axis2_env_t *env);
-/** Frees module description. */
-#define AXIS2_MODULE_DESC_FREE(module_desc, env) \
- axis2_module_desc_free(module_desc, env)
-
-/** Gets in flow. */
-#define AXIS2_MODULE_DESC_GET_IN_FLOW(module_desc, env) \
- axis2_module_desc_get_in_flow (module_desc, env)
-
-/** Sets in flow. */
-#define AXIS2_MODULE_DESC_SET_IN_FLOW(module_desc, env, in_flow) \
- axis2_module_desc_set_in_flow (module_desc, env, in_flow)
-
-/** Gets out flow. */
-#define AXIS2_MODULE_DESC_GET_OUT_FLOW(module_desc, env) \
- axis2_module_desc_get_out_flow (module_desc, env)
-
-/** Sets out flow. */
-#define AXIS2_MODULE_DESC_SET_OUT_FLOW(module_desc, env, out_flow) \
- axis2_module_desc_set_out_flow (module_desc, env, out_flow)
-
-/** Gets fault in flow. */
-#define AXIS2_MODULE_DESC_GET_FAULT_IN_FLOW(module_desc, env) \
- axis2_module_desc_get_fault_in_flow (module_desc, env)
-
-/** Sets fault in flow. */
-#define AXIS2_MODULE_DESC_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. */
-#define AXIS2_MODULE_DESC_GET_FAULT_OUT_FLOW(module_desc, env) \
- axis2_module_desc_get_fault_out_flow(module_desc , env)
-
-/** Sets fault out flow. */
-#define AXIS2_MODULE_DESC_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. */
-#define AXIS2_MODULE_DESC_GET_QNAME(module_desc, env) \
- axis2_module_desc_get_qname(module_desc, env)
-
-/** Sets QName. */
-#define AXIS2_MODULE_DESC_SET_QNAME(module_desc, env, qname) \
- axis2_module_desc_set_qname(module_desc, env, qname)
-
-/** Adds given operation to list of operations. */
-#define AXIS2_MODULE_DESC_ADD_OP(module_desc, env, op) \
- axis2_module_desc_add_op(module_desc, env, op)
-
-/** Gets list of all operations. */
-#define AXIS2_MODULE_DESC_GET_ALL_OPS(module_desc, env) \
- axis2_module_desc_get_all_ops(module_desc, env)
-
-/** Gets parent. */
-#define AXIS2_MODULE_DESC_GET_PARENT(module_desc, env) \
- axis2_module_desc_get_parent(module_desc, env)
-
-/** Sets parent. */
-#define AXIS2_MODULE_DESC_SET_PARENT(module_desc, env, parent) \
- axis2_module_desc_set_parent(module_desc, env, parent)
-
-/** Adds parameter. */
-#define AXIS2_MODULE_DESC_ADD_PARAM(module_desc, env, param) \
- axis2_module_desc_add_param(module_desc, env, param)
-
-/** Gets named parameter. */
-#define AXIS2_MODULE_DESC_GET_PARAM(module_desc, env, name) \
- axis2_module_desc_get_param(module_desc, env, name)
-
-/** Get all parameters. */
-#define AXIS2_MODULE_DESC_GET_ALL_PARAMS(module_desc, env) \
- axis2_module_desc_get_all_params(module_desc, env)
-
-/** Checks if named parameter is locked. */
-#define AXIS2_MODULE_DESC_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. */
-#define AXIS2_MODULE_DESC_GET_MODULE(module_desc, env) \
- axis2_module_desc_get_module(module_desc, env)
-
-/** Sets module associated with module description. */
-#define AXIS2_MODULE_DESC_SET_MODULE(module_desc, env, module) \
- axis2_module_desc_set_module(module_desc, env, module)
-
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Wed Mar 7 06:49:51 2007
@@ -1214,7 +1214,7 @@
AXIS2_QNAME_FREE(qname, env);
if (module_desc)
{
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env, key);
+ param = axis2_module_desc_get_param(module_desc, env, key);
if (param)
{
return param;
@@ -1236,7 +1236,7 @@
AXIS2_QNAME_FREE(qname, env);
if (module_desc)
{
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env, key);
+ param = axis2_module_desc_get_param(module_desc, env, key);
if (param)
{
return param;
@@ -1258,7 +1258,7 @@
AXIS2_QNAME_FREE(qname, env);
if (module_desc)
{
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env, key);
+ param = axis2_module_desc_get_param(module_desc, env, key);
if (param)
{
return param;
@@ -1283,7 +1283,7 @@
if (module_desc)
{
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env, key);
+ param = axis2_module_desc_get_param(module_desc, env, key);
if (param)
{
return param;
@@ -1306,7 +1306,7 @@
if (module_desc)
{
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env, key);
+ param = axis2_module_desc_get_param(module_desc, env, key);
if (param)
{
return param;
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=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_init.c Wed Mar 7 06:49:51 2007
@@ -152,7 +152,7 @@
axis2_module_desc_t *mod_desc = (axis2_module_desc_t*)module;
if (mod_desc)
{
- axis2_module_t *mod = AXIS2_MODULE_DESC_GET_MODULE(mod_desc, env);
+ axis2_module_t *mod = axis2_module_desc_get_module(mod_desc, env);
if (mod)
AXIS2_MODULE_INIT(mod, env, conf_ctx, mod_desc);
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Wed Mar 7 06:49:51 2007
@@ -1307,8 +1307,8 @@
* so, it will free dll_desc which in turn unload the module. So we
* add this as a param to module_desc
*/
- AXIS2_MODULE_DESC_ADD_PARAM(module_desc, env, impl_info_param);
- return AXIS2_MODULE_DESC_SET_MODULE(module_desc, env, module);
+ axis2_module_desc_add_param(module_desc, env, impl_info_param);
+ return axis2_module_desc_set_module(module_desc, env, module);
}
@@ -1436,7 +1436,7 @@
{
return status;
}
- module = AXIS2_MODULE_DESC_GET_MODULE(module_metadata, env);
+ module = axis2_module_desc_get_module(module_metadata, env);
if (!module)
{
return AXIS2_FAILURE;
@@ -1447,28 +1447,28 @@
return status;
}
- in_flow = AXIS2_MODULE_DESC_GET_IN_FLOW(module_metadata, env);
+ in_flow = axis2_module_desc_get_in_flow(module_metadata, env);
if (in_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, in_flow,
module->handler_create_func_map);
}
- out_flow = AXIS2_MODULE_DESC_GET_OUT_FLOW(module_metadata, env);
+ out_flow = axis2_module_desc_get_out_flow(module_metadata, env);
if (out_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, out_flow,
module->handler_create_func_map);
}
- in_fault_flow = AXIS2_MODULE_DESC_GET_FAULT_IN_FLOW(module_metadata, env);
+ in_fault_flow = axis2_module_desc_get_fault_in_flow(module_metadata, env);
if (in_fault_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, in_fault_flow,
module->handler_create_func_map);
}
- out_fault_flow = AXIS2_MODULE_DESC_GET_FAULT_OUT_FLOW(module_metadata, env);
+ out_fault_flow = axis2_module_desc_get_fault_out_flow(module_metadata, env);
if (out_fault_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, out_fault_flow,
@@ -1748,41 +1748,41 @@
AXIS2_ARCH_READER_FREE(arch_reader, env);
if (AXIS2_SUCCESS != status)
{
- AXIS2_MODULE_DESC_FREE(module_desc, env);
+ axis2_module_desc_free(module_desc, env);
return NULL;
}
status = axis2_dep_engine_load_module_dll(dep_engine, env, module_desc);
if (AXIS2_SUCCESS != status)
{
- AXIS2_MODULE_DESC_FREE(module_desc, env);
+ axis2_module_desc_free(module_desc, env);
return NULL;
}
- module = AXIS2_MODULE_DESC_GET_MODULE(module_desc, env);
+ module = axis2_module_desc_get_module(module_desc, env);
AXIS2_MODULE_FILL_HANDLER_CREATE_FUNC_MAP(module, env);
- in_flow = AXIS2_MODULE_DESC_GET_IN_FLOW(module_desc, env);
+ in_flow = axis2_module_desc_get_in_flow(module_desc, env);
if (in_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, in_flow,
module->handler_create_func_map);
}
- out_flow = AXIS2_MODULE_DESC_GET_OUT_FLOW(module_desc, env);
+ out_flow = axis2_module_desc_get_out_flow(module_desc, env);
if (out_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, out_flow,
module->handler_create_func_map);
}
- in_fault_flow = AXIS2_MODULE_DESC_GET_FAULT_IN_FLOW(module_desc, env);
+ in_fault_flow = axis2_module_desc_get_fault_in_flow(module_desc, env);
if (in_fault_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, in_fault_flow,
module->handler_create_func_map);
}
- out_fault_flow = AXIS2_MODULE_DESC_GET_FAULT_OUT_FLOW(module_desc, env);
+ out_fault_flow = axis2_module_desc_get_fault_out_flow(module_desc, env);
if (out_fault_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, out_fault_flow,
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Wed Mar 7 06:49:51 2007
@@ -246,7 +246,7 @@
module_name = AXIS2_ARCH_FILE_DATA_GET_MODULE_NAME(file_data, env);
module_qname = axis2_qname_create(env, module_name, NULL, NULL);
- AXIS2_MODULE_DESC_SET_QNAME(builder_impl->module_desc, env, module_qname);
+ axis2_module_desc_set_qname(builder_impl->module_desc, env, module_qname);
if (module_qname)
AXIS2_QNAME_FREE(module_qname, env);
}
@@ -288,7 +288,7 @@
if (qparamst)
AXIS2_QNAME_FREE(qparamst, env);
- parent = AXIS2_MODULE_DESC_GET_PARENT(builder_impl->module_desc, env);
+ parent = axis2_module_desc_get_parent(builder_impl->module_desc, env);
if (parent)
parent_container = parent->param_container;
AXIS2_DESC_BUILDER_PROCESS_PARAMS(module_builder->desc_builder, env,
@@ -310,7 +310,7 @@
desc_builder, env, in_flow_element,
axis2_module_desc_get_param_container(builder_impl->module_desc, env),
in_flow_node);
- status = AXIS2_MODULE_DESC_SET_IN_FLOW(builder_impl->module_desc, env, flow);
+ status = axis2_module_desc_set_in_flow(builder_impl->module_desc, env, flow);
if (AXIS2_SUCCESS != status)
{
if (flow)
@@ -333,7 +333,7 @@
desc_builder, env, out_flow_element,
axis2_module_desc_get_param_container(builder_impl->module_desc, env),
out_flow_node);
- status = AXIS2_MODULE_DESC_SET_OUT_FLOW(builder_impl->module_desc, env, flow);
+ status = axis2_module_desc_set_out_flow(builder_impl->module_desc, env, flow);
if (AXIS2_SUCCESS != status)
{
axis2_flow_free(flow, env);
@@ -355,7 +355,7 @@
desc_builder, env, in_fault_flow_element,
axis2_module_desc_get_param_container(builder_impl->module_desc, env),
in_fault_flow_node);
- status = AXIS2_MODULE_DESC_SET_FAULT_IN_FLOW(builder_impl->module_desc, env, flow);
+ status = axis2_module_desc_set_fault_in_flow(builder_impl->module_desc, env, flow);
if (AXIS2_SUCCESS != status)
{
axis2_flow_free(flow, env);
@@ -377,7 +377,7 @@
desc_builder, env, out_fault_flow_element,
axis2_module_desc_get_param_container(builder_impl->module_desc, env),
out_fault_flow_node);
- status = AXIS2_MODULE_DESC_SET_FAULT_OUT_FLOW(builder_impl->module_desc,
+ status = axis2_module_desc_set_fault_out_flow(builder_impl->module_desc,
env, flow);
if (AXIS2_SUCCESS != status)
{
@@ -399,7 +399,7 @@
axis2_op_t *op_desc = NULL;
op_desc = (axis2_op_t *) axis2_array_list_get(ops, env, i);
- AXIS2_MODULE_DESC_ADD_OP(builder_impl->module_desc, env, op_desc);
+ axis2_module_desc_add_op(builder_impl->module_desc, env, op_desc);
}
axis2_array_list_free(ops, env);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
Modified: webservices/axis2/trunk/c/modules/core/description/module_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/module_desc.c?view=diff&rev=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Wed Mar 7 06:49:51 2007
@@ -41,15 +41,14 @@
};
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)
{
axis2_module_desc_t *module_desc = NULL;
AXIS2_ENV_CHECK(env, NULL);
module_desc = (axis2_module_desc_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_module_desc_t));
+ sizeof(axis2_module_desc_t));
if (NULL == module_desc)
{
@@ -92,8 +91,7 @@
}
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)
{
axis2_module_desc_t *module_desc = NULL;
@@ -113,8 +111,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_module_desc_free(
- axis2_module_desc_t *module_desc,
+axis2_module_desc_free(axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -122,19 +119,16 @@
if (module_desc->module)
{
AXIS2_MODULE_SHUTDOWN(module_desc->module, env);
- module_desc->module = NULL;
}
if (module_desc->params)
{
AXIS2_PARAM_CONTAINER_FREE(module_desc->params, env);
- module_desc->params = NULL;
}
if (module_desc->flow_container)
{
axis2_flow_container_free(module_desc->flow_container, env);
- module_desc->flow_container = NULL;
}
module_desc->parent = NULL;
@@ -142,7 +136,6 @@
if (module_desc->qname)
{
AXIS2_QNAME_FREE(module_desc->qname, env);
- module_desc->qname = NULL;
}
if (module_desc->ops)
@@ -162,21 +155,18 @@
}
axis2_hash_free(module_desc->ops, env);
- module_desc->ops = NULL;
}
if (module_desc)
{
AXIS2_FREE(env->allocator, module_desc);
- module_desc = NULL;
}
return AXIS2_SUCCESS;
}
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)
{
axis2_module_desc_t *module_desc_l = NULL;
@@ -187,18 +177,14 @@
}
AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
-axis2_module_desc_get_in_flow(
- const axis2_module_desc_t *module_desc,
+axis2_module_desc_get_in_flow(const axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axis2_flow_container_get_in_flow(module_desc->flow_container, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_module_desc_set_in_flow(
- axis2_module_desc_t *module_desc,
+axis2_module_desc_set_in_flow(axis2_module_desc_t *module_desc,
const axis2_env_t *env,
axis2_flow_t *in_flow)
{
@@ -206,22 +192,18 @@
AXIS2_PARAM_CHECK(env->error, in_flow, AXIS2_FAILURE);
return axis2_flow_container_set_in_flow(module_desc->flow_container, env,
- in_flow);
+ in_flow);
}
AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
-axis2_module_desc_get_out_flow(
- const axis2_module_desc_t *module_desc,
+axis2_module_desc_get_out_flow(const axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axis2_flow_container_get_out_flow(module_desc->flow_container, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_module_desc_set_out_flow(
- axis2_module_desc_t *module_desc,
+axis2_module_desc_set_out_flow(axis2_module_desc_t *module_desc,
const axis2_env_t *env,
axis2_flow_t *out_flow)
{
@@ -229,22 +211,18 @@
AXIS2_PARAM_CHECK(env->error, out_flow, AXIS2_FAILURE);
return axis2_flow_container_set_out_flow(module_desc->flow_container, env,
- out_flow);
+ out_flow);
}
AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
-axis2_module_desc_get_fault_in_flow(
- const axis2_module_desc_t *module_desc,
+axis2_module_desc_get_fault_in_flow(const axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axis2_flow_container_get_fault_in_flow(module_desc->flow_container, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_module_desc_set_fault_in_flow(
- axis2_module_desc_t *module_desc,
+axis2_module_desc_set_fault_in_flow(axis2_module_desc_t *module_desc,
const axis2_env_t *env,
axis2_flow_t *falut_in_flow)
{
@@ -252,21 +230,18 @@
AXIS2_PARAM_CHECK(env->error, falut_in_flow, AXIS2_FAILURE);
return axis2_flow_container_set_fault_in_flow(module_desc->flow_container,
- env, falut_in_flow);
+ env, falut_in_flow);
}
AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
-axis2_module_desc_get_fault_out_flow(
- const axis2_module_desc_t *module_desc,
+axis2_module_desc_get_fault_out_flow(const axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return axis2_flow_container_get_fault_out_flow(module_desc->flow_container, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_module_desc_set_fault_out_flow(
- axis2_module_desc_t *module_desc,
+axis2_module_desc_set_fault_out_flow(axis2_module_desc_t *module_desc,
const axis2_env_t *env,
axis2_flow_t *fault_out_flow)
{
@@ -274,22 +249,18 @@
AXIS2_PARAM_CHECK(env->error, fault_out_flow, AXIS2_FAILURE);
return axis2_flow_container_set_fault_out_flow(module_desc->flow_container,
- env, fault_out_flow);
+ env, fault_out_flow);
}
AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
-axis2_module_desc_get_qname(
- const axis2_module_desc_t *module_desc,
+axis2_module_desc_get_qname(const axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return module_desc->qname;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_module_desc_set_qname(
- axis2_module_desc_t *module_desc,
+axis2_module_desc_set_qname(axis2_module_desc_t *module_desc,
const axis2_env_t *env,
const axis2_qname_t *qname)
{
@@ -299,7 +270,6 @@
if (module_desc->qname)
{
AXIS2_QNAME_FREE(module_desc->qname, env);
- module_desc->qname = NULL;
}
module_desc->qname = AXIS2_QNAME_CLONE((axis2_qname_t *)qname, env);
@@ -308,8 +278,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_module_desc_add_op(
- axis2_module_desc_t *module_desc,
+axis2_module_desc_add_op(axis2_module_desc_t *module_desc,
const axis2_env_t *env,
axis2_op_t *op)
{
@@ -339,26 +308,21 @@
}
AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
-axis2_module_desc_get_all_ops(
- const axis2_module_desc_t *module_desc,
+axis2_module_desc_get_all_ops(const axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return module_desc->ops;
}
AXIS2_EXTERN axis2_conf_t *AXIS2_CALL
-axis2_module_desc_get_parent(
- const axis2_module_desc_t *module_desc,
+axis2_module_desc_get_parent(const axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return module_desc->parent;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_module_desc_set_parent(
- axis2_module_desc_t *module_desc,
+axis2_module_desc_set_parent(axis2_module_desc_t *module_desc,
const axis2_env_t *env,
axis2_conf_t *parent)
{
@@ -370,8 +334,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_module_desc_add_param(
- axis2_module_desc_t *module_desc,
+axis2_module_desc_add_param(axis2_module_desc_t *module_desc,
const axis2_env_t *env,
axis2_param_t *param)
{
@@ -384,13 +347,14 @@
if (NULL == param_name_l)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_PARAM,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- if (AXIS2_TRUE == axis2_module_desc_is_param_locked(module_desc, env, param_name_l))
+ if (AXIS2_TRUE == axis2_module_desc_is_param_locked(module_desc, env,
+ param_name_l))
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
+ AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
else
@@ -401,30 +365,24 @@
}
AXIS2_EXTERN axis2_param_t *AXIS2_CALL
-axis2_module_desc_get_param(
- const axis2_module_desc_t *module_desc,
+axis2_module_desc_get_param(const axis2_module_desc_t *module_desc,
const axis2_env_t *env,
const axis2_char_t *name)
{
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, name, NULL);
return AXIS2_PARAM_CONTAINER_GET_PARAM(module_desc->params, env, name);
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_module_desc_get_all_params(
- const axis2_module_desc_t *module_desc,
+axis2_module_desc_get_all_params(const axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return AXIS2_PARAM_CONTAINER_GET_PARAMS(module_desc->params, env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_module_desc_is_param_locked(
- const axis2_module_desc_t *module_desc,
+axis2_module_desc_is_param_locked(const axis2_module_desc_t *module_desc,
const axis2_env_t *env,
const axis2_char_t *param_name)
{
@@ -450,7 +408,7 @@
else
{
param_l = axis2_module_desc_get_param(module_desc, env,
- param_name);
+ param_name);
if (param_l && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param_l, env))
ret_state = AXIS2_TRUE;
else
@@ -461,17 +419,14 @@
}
AXIS2_EXTERN axis2_module_t *AXIS2_CALL
-axis2_module_desc_get_module(
- const axis2_module_desc_t *module_desc,
+axis2_module_desc_get_module(const axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return module_desc->module;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_module_desc_set_module(
- axis2_module_desc_t *module_desc,
+axis2_module_desc_set_module(axis2_module_desc_t *module_desc,
const axis2_env_t *env,
axis2_module_t *module)
{
@@ -494,4 +449,5 @@
{
return module_desc->flow_container;
}
+
Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Wed Mar 7 06:49:51 2007
@@ -544,8 +544,8 @@
{
return AXIS2_FAILURE;
}
- qname1 = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
- qname2 = AXIS2_MODULE_DESC_GET_QNAME(moduleref, env);
+ qname1 = axis2_module_desc_get_qname(module_desc, env);
+ qname2 = axis2_module_desc_get_qname(moduleref, env);
if (AXIS2_QNAME_EQUALS(qname1, env, qname2))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Module already engaged to operation");
@@ -567,7 +567,7 @@
/* ignore the status */
AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_SUCCESS);
}
- module = AXIS2_MODULE_DESC_GET_MODULE(moduleref, env);
+ module = axis2_module_desc_get_module(moduleref, env);
if (module)
{
/* notify module for service engagement */
@@ -610,14 +610,14 @@
{
return AXIS2_ERROR_GET_STATUS_CODE(env->error);
}
- module_qname = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
+ module_qname = axis2_module_desc_get_qname(module_desc, env);
for (index = 0; index < size; index++)
{
const axis2_qname_t *module_qname_l = NULL;
module_desc_l = (axis2_module_desc_t *) axis2_array_list_get(
op->engaged_module_list, env, index);
- module_qname_l = AXIS2_MODULE_DESC_GET_QNAME(module_desc_l, env);
+ module_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
if (AXIS2_QNAME_EQUALS(module_qname, env, module_qname_l))
{
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?view=diff&rev=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Wed Mar 7 06:49:51 2007
@@ -432,7 +432,7 @@
conf = (axis2_conf_t *) AXIS2_SVC_GRP_GET_PARENT(parent, env);
}
if (module_desc)
- module_impl = AXIS2_MODULE_DESC_GET_MODULE(module_desc, env);
+ module_impl = axis2_module_desc_get_module(module_desc, env);
if (module_impl)
{
}
@@ -676,8 +676,8 @@
{
modu = (axis2_module_desc_t *) axis2_array_list_get(collection_module,
env, i);
- if (axis2_qname_equals(AXIS2_MODULE_DESC_GET_QNAME(modu, env), env,
- AXIS2_MODULE_DESC_GET_QNAME(module_desc, env)))
+ if (axis2_qname_equals(axis2_module_desc_get_qname(modu, env), env,
+ axis2_module_desc_get_qname(module_desc, env)))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_SVC, AXIS2_FAILURE);
@@ -697,7 +697,7 @@
{
const axis2_qname_t *qname = NULL;
status = axis2_array_list_add(svc->engaged_modules, env, module_desc);
- qname = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
+ qname = axis2_module_desc_get_qname(module_desc, env);
axis2_svc_add_module_qname(svc, env, qname);
}
if (phase_resolver)
@@ -724,7 +724,7 @@
module_desc_l = (axis2_module_desc_t *) axis2_array_list_get(
svc->engaged_modules, env, i);
- module_qname_l = AXIS2_MODULE_DESC_GET_QNAME(module_desc_l, env);
+ module_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
if (axis2_qname_equals(module_qname, env, module_qname_l))
{
@@ -751,7 +751,7 @@
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf, AXIS2_FAILURE);
- map = AXIS2_MODULE_DESC_GET_ALL_OPS(module_desc, env);
+ map = axis2_module_desc_get_all_ops(module_desc, env);
pr = axis2_phase_resolver_create_with_config_and_svc(env, conf, svc);
if (!pr)
@@ -849,7 +849,7 @@
{
return AXIS2_FAILURE;
}
- module_qname = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
+ module_qname = axis2_module_desc_get_qname(module_desc, env);
size = axis2_array_list_size(svc->engaged_modules, env);
for (i = 0; i < size; i++)
{
@@ -858,7 +858,7 @@
module_desc_l = (axis2_module_desc_t *) axis2_array_list_get(
svc->engaged_modules, env, i);
- module_qname_l = AXIS2_MODULE_DESC_GET_QNAME(module_desc_l, env);
+ module_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
if (axis2_qname_equals(module_qname, env, module_qname_l))
{
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Wed Mar 7 06:49:51 2007
@@ -723,7 +723,7 @@
module_desc = (axis2_module_desc_t *) val;
if (module_desc)
{
- AXIS2_MODULE_DESC_FREE(module_desc, env);
+ axis2_module_desc_free(module_desc, env);
module_desc = NULL;
}
@@ -897,7 +897,7 @@
axis2_hash_this(hi, NULL, NULL, &val);
module_desc = (axis2_module_desc_t *) val;
if (module_desc)
- AXIS2_MODULE_DESC_FREE(module_desc, env);
+ axis2_module_desc_free(module_desc, env);
val = NULL;
module_desc = NULL;
@@ -1467,7 +1467,7 @@
AXIS2_QNAME_GET_LOCALPART(module_name, env));
if (def_mod)
{
- def_mod_qname = AXIS2_MODULE_DESC_GET_QNAME(def_mod, env);
+ def_mod_qname = axis2_module_desc_get_qname(def_mod, env);
}
size = axis2_array_list_size(config_impl->engaged_modules, env);
for (i = 0; i < size; i++)
@@ -1653,7 +1653,7 @@
config_impl = AXIS2_INTF_TO_IMPL(conf);
- status = AXIS2_MODULE_DESC_SET_PARENT(module, env, conf);
+ status = axis2_module_desc_set_parent(module, env, conf);
if (AXIS2_FAILURE == status)
{
return status;
@@ -1663,7 +1663,7 @@
{
return AXIS2_FAILURE;
}
- module_qname = AXIS2_MODULE_DESC_GET_QNAME(module, env);
+ module_qname = axis2_module_desc_get_qname(module, env);
if (module_qname)
{
axis2_char_t *module_name = NULL;
@@ -1904,7 +1904,7 @@
const axis2_qname_t *module_qname = NULL;
size = axis2_array_list_size(config_impl->engaged_modules, env);
- module_qname = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
+ module_qname = axis2_module_desc_get_qname(module_desc, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
@@ -1941,7 +1941,7 @@
{
return status;
}
- module_qname = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
+ module_qname = axis2_module_desc_get_qname(module_desc, env);
module_qref_l = AXIS2_QNAME_CLONE((axis2_qname_t *)module_qname, env);
status = axis2_array_list_add(config_impl->engaged_modules, env,
module_qref_l);
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Wed Mar 7 06:49:51 2007
@@ -362,22 +362,22 @@
{
case AXIS2_IN_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_IN_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_in_flow(module_desc, env);
break;
}
case AXIS2_OUT_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_OUT_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_out_flow(module_desc, env);
break;
}
case AXIS2_FAULT_IN_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_FAULT_IN_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_fault_in_flow(module_desc, env);
break;
}
case AXIS2_FAULT_OUT_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_FAULT_OUT_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_fault_out_flow(module_desc, env);
break;
}
}
@@ -1069,7 +1069,7 @@
return status;
}*/
}
- mod_name = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
+ mod_name = axis2_module_desc_get_qname(module_desc, env);
status = AXIS2_SVC_GRP_ADD_MODULE_QNAME(svc_grp, env,
mod_name);
@@ -1123,7 +1123,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op name is:%s",
AXIS2_QNAME_GET_LOCALPART(AXIS2_OP_GET_QNAME(op_desc, env), env));
modules = AXIS2_OP_GET_ALL_MODULES(op_desc, env);
- module_desc_qname = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
+ module_desc_qname = axis2_module_desc_get_qname(module_desc, env);
if (modules)
size = axis2_array_list_size(modules, env);
for (j = 0; j < size; j++)
@@ -1134,7 +1134,7 @@
module_desc_l = (axis2_module_desc_t *)
axis2_array_list_get(modules, env, j);
- module_desc_qname_l = AXIS2_MODULE_DESC_GET_QNAME(module_desc_l ,
+ module_desc_qname_l = axis2_module_desc_get_qname(module_desc_l ,
env);
if (AXIS2_QNAME_EQUALS(module_desc_qname_l, env, module_desc_qname))
{
@@ -1196,22 +1196,22 @@
{
case AXIS2_IN_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_IN_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_in_flow(module_desc, env);
break;
}
case AXIS2_OUT_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_OUT_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_out_flow(module_desc, env);
break;
}
case AXIS2_FAULT_IN_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_FAULT_IN_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_fault_in_flow(module_desc, env);
break;
}
case AXIS2_FAULT_OUT_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_FAULT_OUT_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_fault_out_flow(module_desc, env);
break;
}
}
@@ -1342,22 +1342,22 @@
{
case AXIS2_IN_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_IN_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_in_flow(module_desc, env);
break;
}
case AXIS2_OUT_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_OUT_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_out_flow(module_desc, env);
break;
}
case AXIS2_FAULT_IN_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_FAULT_IN_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_fault_in_flow(module_desc, env);
break;
}
case AXIS2_FAULT_OUT_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_FAULT_OUT_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_fault_out_flow(module_desc, env);
break;
}
}
@@ -1441,7 +1441,7 @@
{
return status;
}
- module_d_qname = AXIS2_MODULE_DESC_GET_QNAME(module_desc, env);
+ module_d_qname = axis2_module_desc_get_qname(module_desc, env);
for (index_i = axis2_hash_first(ops, env); index_i; index_i =
axis2_hash_next(env, index_i))
{
@@ -1463,7 +1463,7 @@
const axis2_qname_t *module_d_qname_l = NULL;
module_desc_l = axis2_array_list_get(modules, env, j);
- module_d_qname_l = AXIS2_MODULE_DESC_GET_QNAME(module_desc_l, env);
+ module_d_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(module_d_qname, env,
module_d_qname_l))
{
@@ -1546,22 +1546,22 @@
{
case AXIS2_IN_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_IN_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_in_flow(module_desc, env);
break;
}
case AXIS2_OUT_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_OUT_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_out_flow(module_desc, env);
break;
}
case AXIS2_FAULT_IN_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_FAULT_IN_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_fault_in_flow(module_desc, env);
break;
}
case AXIS2_FAULT_OUT_FLOW:
{
- flow = AXIS2_MODULE_DESC_GET_FAULT_OUT_FLOW(module_desc, env);
+ flow = axis2_module_desc_get_fault_out_flow(module_desc, env);
break;
}
}
Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/core_utils.c?view=diff&rev=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Wed Mar 7 06:49:51 2007
@@ -296,7 +296,7 @@
if (mod_desc)
{
const axis2_qname_t *module_qname = NULL;
- module_qname = AXIS2_MODULE_DESC_GET_QNAME(mod_desc, env);
+ module_qname = axis2_module_desc_get_qname(mod_desc, env);
if (module_qname)
{
axis2_char_t *mod_name_with_ver = NULL;
Modified: webservices/axis2/trunk/c/test/core/description/test_description.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/description/test_description.c?view=diff&rev=515592&r1=515591&r2=515592
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/test_description.c (original)
+++ webservices/axis2/trunk/c/test/core/description/test_description.c Wed Mar 7 06:49:51 2007
@@ -86,7 +86,7 @@
AXIS2_SVC_FREE(svc, env);
AXIS2_QNAME_FREE(qname, env);
- AXIS2_MODULE_DESC_FREE(module_desc, env);
+ axis2_module_desc_free(module_desc, env);
AXIS2_CONF_FREE(axis2_config, env);
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org