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 di...@apache.org on 2007/03/12 16:32:25 UTC
svn commit: r517255 - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ modules/core/context/ modules/core/deployment/
modules/core/description/ modules/core/engine/
modules/core/transport/http/common/ modules/core/transport/http/receiver...
Author: dinesh
Date: Mon Mar 12 08:32:23 2007
New Revision: 517255
URL: http://svn.apache.org/viewvc?view=rev&rev=517255
Log:
conf_ctx.c: removed macros , source code formatted
Modified:
webservices/axis2/trunk/c/include/axis2_conf_ctx.h
webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/context/op_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
webservices/axis2/trunk/c/test/core/context/test_context.c
webservices/axis2/trunk/c/test/core/engine/test_engine.c
Modified: webservices/axis2/trunk/c/include/axis2_conf_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf_ctx.h?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf_ctx.h Mon Mar 12 08:32:23 2007
@@ -269,77 +269,6 @@
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx);
-
-/** Sets the configuration. */
-#define AXIS2_CONF_CTX_SET_CONF(conf_ctx, env, conf) \
- axis2_conf_ctx_set_conf(conf_ctx, env, conf)
-
-/** Gets base which is of type context. */
-#define AXIS2_CONF_CTX_GET_BASE(conf_ctx, env) \
- axis2_conf_ctx_get_base(conf_ctx, env)
-
-/** Gets the configuration. */
-#define AXIS2_CONF_CTX_GET_CONF(conf_ctx, env) \
- axis2_conf_ctx_get_conf(conf_ctx, env)
-
-/** Gets the operation context map. */
-#define AXIS2_CONF_CTX_GET_OP_CTX_MAP(conf_ctx, env) \
- axis2_conf_ctx_get_op_ctx_map(conf_ctx, env)
-
-/** Gets the service context map. */
-#define AXIS2_CONF_CTX_GET_SVC_CTX_MAP(conf_ctx, env) \
- axis2_conf_ctx_get_svc_ctx_map(conf_ctx, env)
-
-/** Gets the service group context map. */
-#define AXIS2_CONF_CTX_GET_SVC_GRP_CTX_MAP(conf_ctx, env) \
- axis2_conf_ctx_get_svc_grp_ctx_map(conf_ctx, env)
-
-/** Registers the operation context with given message ID. */
-#define AXIS2_CONF_CTX_REGISTER_OP_CTX(conf_ctx, env, message_id, op_ctx) \
- axis2_conf_ctx_register_op_ctx(conf_ctx, env, message_id, op_ctx)
-
-/** Gets the operation context with given message ID. */
-#define AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, message_id) \
- axis2_conf_ctx_get_op_ctx(conf_ctx, env, message_id)
-
-/** Registers the service context with given service ID. */
-#define AXIS2_CONF_CTX_REGISTER_SVC_CTX(conf_ctx, env, svc_id, svc_ctx) \
- axis2_conf_ctx_register_svc_ctx(conf_ctx, env, svc_id, svc_ctx)
-
-/** Gets the service context with given service ID. */
-#define AXIS2_CONF_CTX_GET_SVC_CTX(conf_ctx, env, svc_id) \
- axis2_conf_ctx_get_svc_ctx(conf_ctx, env, svc_id)
-
-/** Registers the service group context with given service group ID. */
-#define AXIS2_CONF_CTX_REGISTER_SVC_GRP_CTX(conf_ctx, env, svc_grp_id, svc_grp_ctx) \
- axis2_conf_ctx_register_svc_grp_ctx(conf_ctx, env, svc_grp_id, svc_grp_ctx)
-
-/** Gets the service group context with given service group ID. */
-#define AXIS2_CONF_CTX_GET_SVC_GRP_CTX(conf_ctx, env, svc_grp_id) \
- axis2_conf_ctx_get_svc_grp_ctx(conf_ctx, env, svc_grp_id)
-
-/** Gets the root directory. */
-#define AXIS2_CONF_CTX_GET_ROOT_DIR(conf_ctx, env) \
- axis2_conf_ctx_get_root_dir(conf_ctx, env)
-
-/** Sets the root directory. */
-#define AXIS2_CONF_CTX_SET_ROOT_DIR(conf_ctx, env, path) \
- axis2_conf_ctx_set_root_dir(conf_ctx, env, path)
-
-/** Initializes the configuration context. */
-#define AXIS2_CONF_CTX_INIT(conf_ctx, env, conf) \
- axis2_conf_ctx_init(conf_ctx, env, conf)
-
-/** Frees the configuration context. */
-#define AXIS2_CONF_CTX_FREE(conf_ctx, env) \
- axis2_conf_ctx_free(conf_ctx, env)
-
-/** Fill context hierarchy related to the service and operation set in message
- context. */
-#define AXIS2_CONF_CTX_FILL_CTXS(conf_ctx, env, msg_ctx) \
- axis2_conf_ctx_fill_ctxs(conf_ctx, env, msg_ctx)
-
-/** @} */
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c Mon Mar 12 08:32:23 2007
@@ -182,7 +182,7 @@
axis2_conf_t *conf = NULL;
axis2_transport_receiver_t *listener = NULL;
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
transport_in = AXIS2_CONF_GET_TRANSPORT_IN(conf, env, transport);
Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Mon Mar 12 08:32:23 2007
@@ -362,7 +362,7 @@
conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(mep_client_impl->svc_ctx, env);
if (conf_ctx)
{
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
transport_out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(conf, env, transport_enum);
@@ -421,7 +421,7 @@
conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(mep_client_impl->svc_ctx, env);
if (conf_ctx)
{
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
/*if it is already engaged do not engage it again*/
Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Mon Mar 12 08:32:23 2007
@@ -476,7 +476,7 @@
axis2_conf_ctx_t *conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(op_client_impl->svc_ctx, env);
if (conf_ctx)
{
- axis2_conf_t *conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ axis2_conf_t *conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
transport_in = AXIS2_CONF_GET_TRANSPORT_IN(conf, env,
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Mon Mar 12 08:32:23 2007
@@ -288,7 +288,7 @@
return NULL;
}
- svc_client_impl->conf = AXIS2_CONF_CTX_GET_CONF(svc_client_impl->conf_ctx, env);
+ svc_client_impl->conf = axis2_conf_ctx_get_conf(svc_client_impl->conf_ctx, env);
repos_path = AXIS2_CONF_GET_REPO(svc_client_impl->conf, env);
wsdl_path = axis2_strcat(env, repos_path, AXIS2_PATH_SEP_STR, "woden", NULL);
@@ -340,7 +340,7 @@
if (!svc_grp_name)
return NULL; /* service group name is mandatory */
- AXIS2_CONF_CTX_REGISTER_SVC_GRP_CTX(svc_client_impl->conf_ctx, env,
+ axis2_conf_ctx_register_svc_grp_ctx(svc_client_impl->conf_ctx, env,
svc_grp_name, svc_grp_ctx);
svc_client_impl->svc_ctx = AXIS2_SVC_GRP_CTX_GET_SVC_CTX(svc_grp_ctx, env,
@@ -411,7 +411,7 @@
return NULL;
}
- svc_client_impl->conf = AXIS2_CONF_CTX_GET_CONF(svc_client_impl->conf_ctx, env);
+ svc_client_impl->conf = axis2_conf_ctx_get_conf(svc_client_impl->conf_ctx, env);
if (svc)
{
@@ -451,7 +451,7 @@
if (!svc_grp_name)
return NULL; /* service group name is mandatory */
- AXIS2_CONF_CTX_REGISTER_SVC_GRP_CTX(svc_client_impl->conf_ctx, env,
+ axis2_conf_ctx_register_svc_grp_ctx(svc_client_impl->conf_ctx, env,
svc_grp_name, svc_grp_ctx);
svc_client_impl->svc_ctx = AXIS2_SVC_GRP_CTX_GET_SVC_CTX(svc_grp_ctx, env,
@@ -1374,7 +1374,7 @@
if (svc_client_impl->conf_ctx)
{
- AXIS2_CONF_CTX_FREE(svc_client_impl->conf_ctx, env);
+ axis2_conf_ctx_free(svc_client_impl->conf_ctx, env);
svc_client_impl->conf_ctx = NULL;
}
Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Mon Mar 12 08:32:23 2007
@@ -67,7 +67,7 @@
conf_ctx->svc_grp_ctx_map = NULL;
conf_ctx->mutex = axis2_thread_mutex_create(env->allocator,
AXIS2_THREAD_MUTEX_DEFAULT);
- if (NULL == conf_ctx->mutex)
+ if (!conf_ctx->mutex)
{
axis2_conf_ctx_free(conf_ctx, env);
return NULL;
@@ -113,7 +113,6 @@
const axis2_env_t *env,
axis2_conf_t *conf)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
conf_ctx->conf = conf; /* we just maintain a shallow copy here */
return AXIS2_SUCCESS;
}
@@ -123,7 +122,6 @@
const axis2_conf_ctx_t *conf_ctx,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return conf_ctx->base;
}
@@ -132,7 +130,6 @@
const axis2_conf_ctx_t *conf_ctx,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return conf_ctx->conf;
}
@@ -141,7 +138,6 @@
const axis2_conf_ctx_t *conf_ctx,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return conf_ctx->op_ctx_map;
}
@@ -150,7 +146,6 @@
const axis2_conf_ctx_t *conf_ctx,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return conf_ctx->svc_ctx_map;
}
@@ -159,7 +154,6 @@
const axis2_conf_ctx_t *conf_ctx,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return conf_ctx->svc_grp_ctx_map;
}
@@ -170,8 +164,6 @@
const axis2_char_t *message_id,
axis2_op_ctx_t *op_ctx)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
axis2_thread_mutex_lock(conf_ctx->mutex);
if (conf_ctx->op_ctx_map)
{
@@ -210,8 +202,6 @@
const axis2_char_t *svc_id,
axis2_svc_ctx_t *svc_ctx)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
axis2_thread_mutex_lock(conf_ctx->mutex);
if (conf_ctx->svc_ctx_map)
{
@@ -230,8 +220,6 @@
{
axis2_svc_ctx_t *rv = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
axis2_thread_mutex_lock(conf_ctx->mutex);
if (conf_ctx->svc_ctx_map)
{
@@ -249,8 +237,6 @@
const axis2_char_t *svc_grp_id,
axis2_svc_grp_ctx_t *svc_grp_ctx)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
axis2_thread_mutex_lock(conf_ctx->mutex);
if (conf_ctx->svc_grp_ctx_map)
{
@@ -268,9 +254,6 @@
const axis2_char_t *svc_grp_id)
{
axis2_svc_grp_ctx_t *rv = NULL;
-
- AXIS2_ENV_CHECK(env, NULL);
-
axis2_thread_mutex_lock(conf_ctx->mutex);
if (conf_ctx->svc_grp_ctx_map)
{
@@ -287,7 +270,6 @@
const axis2_env_t *env)
{
axis2_char_t *rv = NULL;
- AXIS2_ENV_CHECK(env, NULL);
axis2_thread_mutex_lock(conf_ctx->mutex);
rv = conf_ctx->root_dir;
axis2_thread_mutex_unlock(conf_ctx->mutex);
@@ -383,7 +365,6 @@
if (conf_ctx->base)
{
AXIS2_CTX_FREE(conf_ctx->base, env);
- conf_ctx->base = NULL;
}
if (conf_ctx->op_ctx_map)
@@ -398,13 +379,11 @@
op_ctx = (axis2_op_ctx_t *) val;
if (op_ctx)
AXIS2_OP_CTX_FREE(op_ctx, env);
-
val = NULL;
op_ctx = NULL;
}
axis2_hash_free(conf_ctx->op_ctx_map, env);
- conf_ctx->op_ctx_map = NULL;
}
if (conf_ctx->svc_ctx_map)
@@ -425,7 +404,6 @@
}
axis2_hash_free(conf_ctx->svc_ctx_map, env);
- conf_ctx->svc_ctx_map = NULL;
}
if (conf_ctx->svc_grp_ctx_map)
@@ -446,21 +424,17 @@
}
axis2_hash_free(conf_ctx->svc_grp_ctx_map, env);
- conf_ctx->svc_grp_ctx_map = NULL;
}
if (conf_ctx->conf)
{
AXIS2_CONF_FREE(conf_ctx->conf, env);
- conf_ctx->conf = NULL;
}
if (conf_ctx->mutex)
{
axis2_thread_mutex_destroy(conf_ctx->mutex);
- conf_ctx->mutex = NULL;
}
AXIS2_FREE(env->allocator, conf_ctx);
- conf_ctx = NULL;
return AXIS2_SUCCESS;
}
@@ -581,4 +555,3 @@
AXIS2_MSG_CTX_SET_SVC_GRP_CTX(msg_ctx, env, svc_grp_ctx);
return svc_grp_ctx;
}
-
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=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Mon Mar 12 08:32:23 2007
@@ -1180,7 +1180,7 @@
if (msg_ctx->conf_ctx)
{
- axis2_conf_t *conf = AXIS2_CONF_CTX_GET_CONF(msg_ctx->conf_ctx, env);
+ axis2_conf_t *conf = axis2_conf_ctx_get_conf(msg_ctx->conf_ctx, env);
param = AXIS2_CONF_GET_PARAM(conf, env, key);
}
@@ -1274,7 +1274,7 @@
}
}
- conf = AXIS2_CONF_CTX_GET_CONF(msg_ctx->conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(msg_ctx->conf_ctx, env);
if (conf)
{
module_desc = AXIS2_CONF_GET_MODULE_DESC(conf, env, qname);
@@ -1380,7 +1380,7 @@
if (msg_ctx->conf_ctx)
{
- ctx = AXIS2_CONF_CTX_GET_BASE(msg_ctx->conf_ctx, env);
+ ctx = axis2_conf_ctx_get_base(msg_ctx->conf_ctx, env);
if (ctx)
{
obj = AXIS2_CTX_GET_PROPERTY(ctx, env, key, persistent);
@@ -1498,7 +1498,7 @@
if (!(msg_ctx->doing_mtom) && msg_ctx->conf_ctx)
{
- axis2_conf_t *conf = AXIS2_CONF_CTX_GET_CONF(msg_ctx->conf_ctx, env);
+ axis2_conf_t *conf = axis2_conf_ctx_get_conf(msg_ctx->conf_ctx, env);
msg_ctx->doing_mtom = axis2_conf_get_enable_mtom(conf, env);
}
Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Mon Mar 12 08:32:23 2007
@@ -335,7 +335,7 @@
if (conf_ctx)
{
op_ctx->op_ctx_map =
- AXIS2_CONF_CTX_GET_OP_CTX_MAP(conf_ctx, env);
+ axis2_conf_ctx_get_op_ctx_map(conf_ctx, env);
}
op_ctx->svc_qname =
(axis2_qname_t *)AXIS2_SVC_GET_QNAME(AXIS2_SVC_CTX_GET_SVC(op_ctx->parent, env), env);
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=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_init.c Mon Mar 12 08:32:23 2007
@@ -135,7 +135,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
axis2_hash_t *module_map = AXIS2_CONF_GET_ALL_MODULES(conf, env);
@@ -176,7 +176,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
axis2_transport_in_desc_t **transport_in_map = NULL;
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=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Mon Mar 12 08:32:23 2007
@@ -857,7 +857,7 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
value = axis2_relates_to_get_value(relates_to, env);
- op_ctx = AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, value);
+ op_ctx = axis2_conf_ctx_get_op_ctx(conf_ctx, env, value);
if (!op_ctx)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CANNOT_CORRELATE_MSG,
@@ -905,7 +905,7 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_char_t *value = NULL;
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- op_ctx = AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, value);
+ op_ctx = axis2_conf_ctx_get_op_ctx(conf_ctx, env, value);
if (!op_ctx)
{
@@ -943,7 +943,7 @@
{
return AXIS2_FAILURE;
}
- status = AXIS2_CONF_CTX_REGISTER_OP_CTX(conf_ctx, env, msg_id, op_ctx);
+ status = axis2_conf_ctx_register_op_ctx(conf_ctx, env, msg_id, op_ctx);
if (AXIS2_FAILURE == status)
{
return AXIS2_FAILURE;
@@ -952,7 +952,7 @@
if (AXIS2_FAILURE == status)
{
axis2_hash_t *op_ctx_map = NULL;
- op_ctx_map = (axis2_hash_t *) AXIS2_CONF_CTX_GET_OP_CTX_MAP(conf_ctx, env);
+ op_ctx_map = (axis2_hash_t *) axis2_conf_ctx_get_op_ctx_map(conf_ctx, env);
axis2_hash_set(op_ctx_map, msg_id, AXIS2_HASH_KEY_STRING, NULL);
}
if (AXIS2_TRUE == AXIS2_OP_CTX_GET_IS_COMPLETE(op_ctx, env))
Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Mon Mar 12 08:32:23 2007
@@ -127,7 +127,7 @@
if (conf_ctx)
{
axis2_conf_t *conf = NULL;
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
svc = AXIS2_CONF_GET_SVC(conf, env, url_tokens[0]);
@@ -212,7 +212,7 @@
{
axis2_op_ctx_t *op_ctx = NULL;
const axis2_char_t *msg_id = AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env);
- op_ctx = AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, msg_id);
+ op_ctx = axis2_conf_ctx_get_op_ctx(conf_ctx, env, msg_id);
if (op_ctx)
{
axis2_op_t *op = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c Mon Mar 12 08:32:23 2007
@@ -160,7 +160,7 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if (conf_ctx)
{
- svc_grp_ctx = AXIS2_CONF_CTX_FILL_CTXS(conf_ctx, env, msg_ctx);
+ svc_grp_ctx = axis2_conf_ctx_fill_ctxs(conf_ctx, env, msg_ctx);
}
axis2_allocator_switch_to_local_pool(env->allocator);
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Mon Mar 12 08:32:23 2007
@@ -281,7 +281,7 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if (conf_ctx)
{
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
axis2_array_list_t *global_out_phase = AXIS2_CONF_GET_OUT_PHASES(conf, env);
@@ -304,7 +304,7 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if (conf_ctx)
{
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
axis2_array_list_t *global_out_phase = AXIS2_CONF_GET_OUT_PHASES(conf, env);
@@ -366,7 +366,7 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
pre_calculated_phases =
AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env);
@@ -477,7 +477,7 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if (conf_ctx)
{
- axis2_conf_t *conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ axis2_conf_t *conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
axis2_array_list_t *phases = AXIS2_CONF_GET_OUT_FAULT_FLOW(conf, env);
@@ -518,7 +518,7 @@
axis2_conf_ctx_t *conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if (conf_ctx)
{
- axis2_conf_t *conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ axis2_conf_t *conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
axis2_array_list_t *phases = AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env);
@@ -958,7 +958,7 @@
/* find and invoke the phases */
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
phases =
AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env);
Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Mon Mar 12 08:32:23 2007
@@ -114,7 +114,7 @@
if (conf_ctx)
{
axis2_conf_t *conf = NULL;
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
svc = AXIS2_CONF_GET_SVC(conf, env, url_tokens[0]);
Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Mon Mar 12 08:32:23 2007
@@ -134,7 +134,7 @@
if (conf_ctx)
{
axis2_conf_t *conf = NULL;
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
svc = AXIS2_CONF_GET_SVC(conf, env, url_tokens[0]);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c Mon Mar 12 08:32:23 2007
@@ -232,10 +232,10 @@
}
request_body = AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY(simple_request, env);
- out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(AXIS2_CONF_CTX_GET_CONF
+ out_desc = AXIS2_CONF_GET_TRANSPORT_OUT( axis2_conf_ctx_get_conf
(http_worker_impl->conf_ctx, env), env,
AXIS2_TRANSPORT_ENUM_HTTP);
- in_desc = AXIS2_CONF_GET_TRANSPORT_IN(AXIS2_CONF_CTX_GET_CONF
+ in_desc = AXIS2_CONF_GET_TRANSPORT_IN( axis2_conf_ctx_get_conf
(http_worker_impl->conf_ctx, env), env,
AXIS2_TRANSPORT_ENUM_HTTP);
msg_ctx = axis2_msg_ctx_create(env, conf_ctx, in_desc, out_desc);
@@ -543,7 +543,7 @@
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, simple_response, AXIS2_FAILURE);
- config = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ config = axis2_conf_ctx_get_conf(conf_ctx, env);
/*
TODO implement the method
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c Mon Mar 12 08:32:23 2007
@@ -161,7 +161,7 @@
if (server_impl->conf_ctx_private)
{
- AXIS2_CONF_CTX_FREE(server_impl->conf_ctx_private, env);
+ axis2_conf_ctx_free(server_impl->conf_ctx_private, env);
server_impl->conf_ctx_private = NULL;
}
/**
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Mon Mar 12 08:32:23 2007
@@ -932,7 +932,7 @@
{
return AXIS2_FAILURE;
}
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (NULL == conf)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c Mon Mar 12 08:32:23 2007
@@ -139,7 +139,7 @@
worker_impl = AXIS2_INTF_TO_IMPL(iis_worker);
if (worker_impl->conf_ctx)
{
- AXIS2_CONF_CTX_FREE(worker_impl->conf_ctx, env);
+ axis2_conf_ctx_free(worker_impl->conf_ctx, env);
worker_impl->conf_ctx = NULL;
}
@@ -229,10 +229,10 @@
out_stream = axis2_stream_create_basic(env);
- out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(AXIS2_CONF_CTX_GET_CONF
+ out_desc = AXIS2_CONF_GET_TRANSPORT_OUT( axis2_conf_ctx_get_conf
(iis_worker_impl->conf_ctx, env), env,
AXIS2_TRANSPORT_ENUM_HTTP);
- in_desc = AXIS2_CONF_GET_TRANSPORT_IN(AXIS2_CONF_CTX_GET_CONF
+ in_desc = AXIS2_CONF_GET_TRANSPORT_IN( axis2_conf_ctx_get_conf
(iis_worker_impl->conf_ctx, env), env,
AXIS2_TRANSPORT_ENUM_HTTP);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c Mon Mar 12 08:32:23 2007
@@ -120,7 +120,7 @@
worker_impl = AXIS2_INTF_TO_IMPL(apache2_worker);
if (worker_impl->conf_ctx)
{
- AXIS2_CONF_CTX_FREE(worker_impl->conf_ctx, env);
+ axis2_conf_ctx_free(worker_impl->conf_ctx, env);
worker_impl->conf_ctx = NULL;
}
@@ -197,10 +197,10 @@
encoding_header_value = (axis2_char_t*)request->content_encoding;
- out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(AXIS2_CONF_CTX_GET_CONF
+ out_desc = AXIS2_CONF_GET_TRANSPORT_OUT( axis2_conf_ctx_get_conf
(apache2_worker_impl->conf_ctx, env), env,
AXIS2_TRANSPORT_ENUM_HTTP);
- in_desc = AXIS2_CONF_GET_TRANSPORT_IN(AXIS2_CONF_CTX_GET_CONF
+ in_desc = AXIS2_CONF_GET_TRANSPORT_IN( axis2_conf_ctx_get_conf
(apache2_worker_impl->conf_ctx, env), env,
AXIS2_TRANSPORT_ENUM_HTTP);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Mon Mar 12 08:32:23 2007
@@ -766,9 +766,9 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
- services_map = AXIS2_CONF_GET_ALL_SVCS(AXIS2_CONF_CTX_GET_CONF(conf_ctx, env),
+ services_map = AXIS2_CONF_GET_ALL_SVCS( axis2_conf_ctx_get_conf(conf_ctx, env),
env);
- errorneous_svc_map = AXIS2_CONF_GET_ALL_FAULTY_SVCS(AXIS2_CONF_CTX_GET_CONF(
+ errorneous_svc_map = AXIS2_CONF_GET_ALL_FAULTY_SVCS( axis2_conf_ctx_get_conf(
conf_ctx, env), env);
if (services_map && 0 != axis2_hash_count(services_map))
{
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Mon Mar 12 08:32:23 2007
@@ -224,7 +224,7 @@
if (conf_ctx && grp_id)
{
axis2_string_t *svc_grp_ctx_id_str = axis2_string_create(env, grp_id);
- axis2_svc_grp_ctx_t *svc_ctx_grp_ctx = AXIS2_CONF_CTX_GET_SVC_GRP_CTX(conf_ctx, env, grp_id);
+ axis2_svc_grp_ctx_t *svc_ctx_grp_ctx = axis2_conf_ctx_get_svc_grp_ctx(conf_ctx, env, grp_id);
if (!svc_ctx_grp_ctx)
{
/** TODO, set error */
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c Mon Mar 12 08:32:23 2007
@@ -365,7 +365,7 @@
AXIS2_LOG_INFO(env->log, "[rampart][rhu] Conf context is NULL ");
return AXIS2_FALSE;
}
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if(!conf)
{
AXIS2_LOG_INFO(env->log, "[rampart][rhu] Cannot get the axis2 conf from conf context. ");
Modified: webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c Mon Mar 12 08:32:23 2007
@@ -231,7 +231,7 @@
path = AXIS2_GETENV("AXIS2C_HOME");
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
/* Get anonymous service from conf. This will be null for the first time,
* but then it will be created when we create the svc_client */
Modified: webservices/axis2/trunk/c/test/core/context/test_context.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/context/test_context.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/test_context.c (original)
+++ webservices/axis2/trunk/c/test/core/context/test_context.c Mon Mar 12 08:32:23 2007
@@ -72,7 +72,7 @@
op_ctx1 = axis2_op_ctx_create(env, op, svc_ctx1);
op_ctx2 = axis2_op_ctx_create(env, op, svc_ctx2);
- op_ctx_map = AXIS2_CONF_CTX_GET_OP_CTX_MAP(conf_ctx, env);
+ op_ctx_map = axis2_conf_ctx_get_op_ctx_map(conf_ctx, env);
if (op_ctx_map)
{
@@ -80,7 +80,7 @@
axis2_hash_set(op_ctx_map, "op_ctx2", AXIS2_HASH_KEY_STRING, op_ctx2);
}
- svc_ctx_map = AXIS2_CONF_CTX_GET_SVC_CTX_MAP(conf_ctx, env);
+ svc_ctx_map = axis2_conf_ctx_get_svc_ctx_map(conf_ctx, env);
if (svc_ctx_map)
{
@@ -88,7 +88,7 @@
axis2_hash_set(svc_ctx_map, "svc_ctx2", AXIS2_HASH_KEY_STRING, svc_ctx2);
}
- svc_grp_ctx_map = AXIS2_CONF_CTX_GET_SVC_GRP_CTX_MAP(conf_ctx, env);
+ svc_grp_ctx_map = axis2_conf_ctx_get_svc_grp_ctx_map(conf_ctx, env);
if (svc_grp_ctx_map)
{
@@ -96,7 +96,7 @@
axis2_hash_set(svc_ctx_map, "svc_grp_ctx2", AXIS2_HASH_KEY_STRING, svc_grp_ctx2);
}
- status = AXIS2_CONF_CTX_INIT(conf_ctx, env, conf);
+ status = axis2_conf_ctx_init(conf_ctx, env, conf);
if (status != AXIS2_SUCCESS)
{
@@ -105,7 +105,7 @@
else
printf("SUCCESS\n");
- AXIS2_CONF_CTX_FREE(conf_ctx, env);
+ axis2_conf_ctx_free(conf_ctx, env);
}
int main()
Modified: webservices/axis2/trunk/c/test/core/engine/test_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/engine/test_engine.c?view=diff&rev=517255&r1=517254&r2=517255
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Mon Mar 12 08:32:23 2007
@@ -67,7 +67,7 @@
else
printf("axis2_test_engine_send SUCCESS\n");
- AXIS2_CONF_CTX_FREE(conf_ctx, env);
+ axis2_conf_ctx_free(conf_ctx, env);
AXIS2_MSG_CTX_FREE(msg_ctx, env);
AXIS2_QNAME_FREE(qname, env);
AXIS2_SVC_GRP_CTX_FREE(svc_grp_ctx, env);
@@ -102,7 +102,7 @@
}
else
printf("axis2_test_engine_receive SUCCESS\n");
- AXIS2_CONF_CTX_FREE(conf_ctx, env);
+ axis2_conf_ctx_free(conf_ctx, env);
AXIS2_MSG_CTX_FREE(msg_ctx, env);
AXIS2_ENGINE_FREE(engine, env);
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org