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/13 07:32:56 UTC
svn commit: r517563 - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ modules/core/context/ modules/core/deployment/
modules/core/description/ modules/core/engine/ modules/core/phaseresolver/
samples/server/sg_math/ test/core/engine/
Author: dinesh
Date: Mon Mar 12 23:32:55 2007
New Revision: 517563
URL: http://svn.apache.org/viewvc?view=rev&rev=517563
Log:
removed macros and unwanted env checks form svc_grp_ctx.c and svc_grp.c
Modified:
webservices/axis2/trunk/c/include/axis2_svc_grp.h
webservices/axis2/trunk/c/include/axis2_svc_grp_ctx.h
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/svc_ctx.c
webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/description/svc_grp.c
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/samples/server/sg_math/add.c
webservices/axis2/trunk/c/test/core/engine/test_engine.c
Modified: webservices/axis2/trunk/c/include/axis2_svc_grp.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc_grp.h?view=diff&rev=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_grp.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_grp.h Mon Mar 12 23:32:55 2007
@@ -310,82 +310,6 @@
axis2_svc_grp_create_with_conf(const axis2_env_t *env,
struct axis2_conf *conf);
-/** Frees service group. */
-#define AXIS2_SVC_GRP_FREE(svc_grp, env) axis2_svc_grp_free (svc_grp , env)
-
-/** Sets name. */
-#define AXIS2_SVC_GRP_SET_NAME(svc_grp, env , svc_grp_name) \
- axis2_svc_grp_set_name (svc_grp, env, svc_grp_name)
-
-/** Gets name. */
-#define AXIS2_SVC_GRP_GET_NAME(svc_grp, env) \
- axis2_svc_grp_get_name(svc_grp, env)
-
-/** Adds service. */
-#define AXIS2_SVC_GRP_ADD_SVC(svc_grp, env , svc) \
- axis2_svc_grp_add_svc (svc_grp, env, svc)
-
-/** Gets named service. */
-#define AXIS2_SVC_GRP_GET_SVC(svc_grp, env , svc_name) \
- axis2_svc_grp_get_svc(svc_grp, env, svc_names)
-
-/** Gets all services. */
-#define AXIS2_SVC_GRP_GET_ALL_SVCS(svc_grp, env) \
- axis2_svc_grp_get_all_svcs(svc_grp, env)
-
-/** Removes named service. */
-#define AXIS2_SVC_GRP_REMOVE_SVC(svc_grp, env, svc_name) \
- axis2_svc_grp_remove_svc(svc_grp, env, svc_name)
-
-/** Adds parameter. */
-#define AXIS2_SVC_GRP_ADD_PARAM(svc_grp, env, param) \
- axis2_svc_grp_add_param(svc_grp, env, param)
-
-/** Gets named parameter. */
-#define AXIS2_SVC_GRP_GET_PARAM(svc_grp, env, name) \
- axis2_svc_grp_get_param(svc_grp, env, name)
-
-/** Gets all parameters. */
-#define AXIS2_SVC_GRP_GET_ALL_PARAMS(svc_grp, env) \
- axis2_svc_grp_get_all_params(svc_grp, env)
-
-/** Checks if the named parameter is locked. */
-#define AXIS2_SVC_GRP_IS_PARAM_LOCKED(svc_grp, env , param_name) \
- axis2_svc_grp_is_param_locked(svc_grp, env, param_name)
-
-/** Adds module QName. */
-#define AXIS2_SVC_GRP_ADD_MODULE_QNAME(svc_grp, env , module_qname) \
- axis2_svc_grp_add_module_qname(svc_grp, env, module_qname)
-
-/** Gets parent configuration. */
-#define AXIS2_SVC_GRP_GET_PARENT(svc_grp, env) \
- axis2_svc_grp_get_parent(svc_grp, env)
-
-/** Sets parent configuration. */
-#define AXIS2_SVC_GRP_SET_PARENT(svc_grp, env , parent) \
- axis2_svc_grp_set_parent(svc_grp, env, parent)
-
-/** Engages module to service group. */
-#define AXIS2_SVC_GRP_ENGAGE_MODULE(svc_grp, env, module_name) \
- ((svc_grp)engage_module_modulep, env, module_name)
-
-/** Gets all module QNames. */
-#define AXIS2_SVC_GRP_GET_ALL_MODULE_QNAMES(svc_grp, env) \
- axis2_svc_grp_get_all_module_qnames(svc_grp, env)
-
-/** Adds module reference. */
-#define AXIS2_SVC_GRP_ADD_MODULE_REF(svc_grp, env, moduleref) \
- axis2_svc_grp_add_module_ref(svc_grp, env, moduleref)
-
-/** Get all module references. */
-#define AXIS2_SVC_GRP_GET_ALL_MODULE_REFS(svc_grp, env) \
- axis2_svc_grp_get_all_module_refs(svc_grp, env)
-
-/** Gets service group context related to service. */
-#define AXIS2_SVC_GRP_GET_SVC_GRP_CTX(svc_grp, env, parent) \
- axis2_svc_grp_get_svc_grp_ctx(svc_grp, env, parent)
-
-/** @} */
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/include/axis2_svc_grp_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc_grp_ctx.h?view=diff&rev=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_grp_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_grp_ctx.h Mon Mar 12 23:32:55 2007
@@ -175,47 +175,6 @@
axis2_svc_grp_ctx_get_svc_ctx_map(const axis2_svc_grp_ctx_t *svc_grp_ctx,
const axis2_env_t *env);
-/** Gets base context. */
-#define AXIS2_SVC_GRP_CTX_GET_BASE(svc_grp_ctx, env) \
- axis2_svc_grp_ctx_get_base(svc_grp_ctx, env)
-
-/** Gets parent configuration context. */
-#define AXIS2_SVC_GRP_CTX_GET_PARENT(svc_grp_ctx, env) \
- axis2_svc_grp_ctx_get_parent(svc_grp_ctx, env)
-
-/** Frees service group context. */
-#define AXIS2_SVC_GRP_CTX_FREE(svc_grp_ctx, env)\
- axis2_svc_grp_ctx_free(svc_grp_ctx, env)
-
-/** Initializes service group context. */
-#define AXIS2_SVC_GRP_CTX_INIT(svc_grp_ctx, env, conf)\
- axis2_svc_grp_ctx_init(svc_grp_ctx, env, conf)
-
-/** Gets ID. */
-#define AXIS2_SVC_GRP_CTX_GET_ID(svc_grp_ctx, env) \
- axis2_svc_grp_ctx_get_id(svc_grp_ctx, env)
-
-/** Sets ID. */
-#define AXIS2_SVC_GRP_CTX_SET_ID(svc_grp_ctx, env, id) \
- axis2_svc_grp_ctx_set_id(svc_grp_ctx, env, id)
-
-/** Gets named service context. */
-#define AXIS2_SVC_GRP_CTX_GET_SVC_CTX(svc_grp_ctx, env, svc_name) \
- axis2_svc_grp_ctx_get_svc_ctx(svc_grp_ctx, env, svc_name)
-
-/** Gets service context map. */
-#define AXIS2_SVC_GRP_CTX_FILL_SVC_CTX_MAP(svc_grp_ctx, env) \
- axis2_svc_grp_ctx_fill_svc_ctx_map(svc_grp_ctx, env)
-
-/** Gets service group related to service group context. */
-#define AXIS2_SVC_GRP_GET_SVC_GRP(svc_grp_ctx, env) \
- axis2_svc_grp_ctx_get_svc_grp(svc_grp_ctx, env)
-
-/** Gets service context map. */
-#define AXIS2_SVC_GRP_GET_SVC_CTX_MAP(svc_grp_ctx, env) \
- axis2_svc_grp_ctx_get_svc_ctx_map(svc_grp_ctx, env)
-
-/** @} */
#ifdef __cplusplus
}
#endif
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=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Mon Mar 12 23:32:55 2007
@@ -331,19 +331,19 @@
if (!svc_grp)
return NULL;
- svc_grp_ctx = AXIS2_SVC_GRP_GET_SVC_GRP_CTX(svc_grp, env,
+ svc_grp_ctx = axis2_svc_grp_get_svc_grp_ctx(svc_grp, env,
svc_client_impl->conf_ctx);
if (!svc_grp_ctx)
return NULL;
- svc_grp_name = AXIS2_SVC_GRP_GET_NAME(svc_grp, env);
+ svc_grp_name = axis2_svc_grp_get_name(svc_grp, env);
if (!svc_grp_name)
return NULL; /* service group name is mandatory */
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,
+ svc_client_impl->svc_ctx = axis2_svc_grp_ctx_get_svc_ctx(svc_grp_ctx, env,
AXIS2_SVC_GET_NAME(svc_client_impl->svc, env));
/* create ops */
@@ -442,19 +442,19 @@
if (!svc_grp)
return NULL;
- svc_grp_ctx = AXIS2_SVC_GRP_GET_SVC_GRP_CTX(svc_grp, env,
+ svc_grp_ctx = axis2_svc_grp_get_svc_grp_ctx(svc_grp, env,
svc_client_impl->conf_ctx);
if (!svc_grp_ctx)
return NULL;
- svc_grp_name = AXIS2_SVC_GRP_GET_NAME(svc_grp, env);
+ svc_grp_name = axis2_svc_grp_get_name(svc_grp, env);
if (!svc_grp_name)
return NULL; /* service group name is mandatory */
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,
+ svc_client_impl->svc_ctx = axis2_svc_grp_ctx_get_svc_ctx(svc_grp_ctx, env,
AXIS2_SVC_GET_NAME(svc_client_impl->svc, env));
/* create ops */
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=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Mon Mar 12 23:32:55 2007
@@ -348,7 +348,7 @@
if (ctx)
{
axis2_svc_grp_ctx_t *svc_grp_ctx = (axis2_svc_grp_ctx_t*) ctx;
- AXIS2_SVC_GRP_CTX_INIT(svc_grp_ctx, env, conf);
+ axis2_svc_grp_ctx_init(svc_grp_ctx, env, conf);
}
}
axis2_thread_mutex_unlock(conf_ctx->mutex);
@@ -417,7 +417,7 @@
axis2_hash_this(hi, NULL, NULL, &val);
svc_grp_ctx = (axis2_svc_grp_ctx_t *) val;
if (svc_grp_ctx)
- AXIS2_SVC_GRP_CTX_FREE(svc_grp_ctx, env);
+ axis2_svc_grp_ctx_free(svc_grp_ctx, env);
val = NULL;
svc_grp_ctx = NULL;
@@ -486,7 +486,7 @@
svc_grp = AXIS2_SVC_GET_PARENT(svc, env);
if (svc_grp)
{
- svc_grp_ctx_id = (axis2_char_t*)AXIS2_SVC_GRP_GET_NAME(svc_grp, env);
+ svc_grp_ctx_id = (axis2_char_t*) axis2_svc_grp_get_name(svc_grp, env);
}
if (!svc_grp_ctx_id)
@@ -504,7 +504,7 @@
svc_grp_ctx_id, AXIS2_HASH_KEY_STRING);
if (svc_grp_ctx)
{
- svc_ctx = AXIS2_SVC_GRP_CTX_GET_SVC_CTX(svc_grp_ctx, env, svc_id);
+ svc_ctx = axis2_svc_grp_ctx_get_svc_ctx(svc_grp_ctx, env, svc_id);
if (!svc_ctx)
{
AXIS2_ERROR_SET(env->error,
@@ -530,14 +530,14 @@
{
axis2_svc_grp_t *svc_grp = NULL;
svc_grp = AXIS2_SVC_GET_PARENT(svc, env);
- svc_grp_ctx = AXIS2_SVC_GRP_GET_SVC_GRP_CTX(svc_grp, env, conf_ctx);
- svc_ctx = AXIS2_SVC_GRP_CTX_GET_SVC_CTX(svc_grp_ctx, env, svc_id);
+ svc_grp_ctx = axis2_svc_grp_get_svc_grp_ctx(svc_grp, env, conf_ctx);
+ svc_ctx = axis2_svc_grp_ctx_get_svc_ctx(svc_grp_ctx, env, svc_id);
if (!svc_ctx)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_SVC_GRP, AXIS2_FAILURE);
return NULL;
}
- AXIS2_SVC_GRP_CTX_SET_ID(svc_grp_ctx, env, svc_grp_ctx_id);
+ axis2_svc_grp_ctx_set_id(svc_grp_ctx, env, svc_grp_ctx_id);
axis2_conf_ctx_register_svc_grp_ctx(conf_ctx, env, svc_grp_ctx_id, 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=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Mon Mar 12 23:32:55 2007
@@ -1123,7 +1123,7 @@
if (msg_ctx->svc_grp)
{
- param = AXIS2_SVC_GRP_GET_PARAM(msg_ctx->svc_grp, env, key);
+ param = axis2_svc_grp_get_param(msg_ctx->svc_grp, env, key);
if (param)
{
return param;
@@ -1186,7 +1186,7 @@
if (msg_ctx->svc_grp_ctx)
{
- ctx = AXIS2_SVC_GRP_CTX_GET_BASE(msg_ctx->svc_grp_ctx, env);
+ ctx = axis2_svc_grp_ctx_get_base(msg_ctx->svc_grp_ctx, env);
if (ctx)
{
obj = axis2_ctx_get_property(ctx, env, key, persistent);
@@ -1441,7 +1441,7 @@
{
msg_ctx->svc_grp = svc_grp;
msg_ctx->svc_grp_id =
- (axis2_char_t *)AXIS2_SVC_GRP_GET_NAME(svc_grp, env);
+ (axis2_char_t *) axis2_svc_grp_get_name(svc_grp, env);
}
}
@@ -1468,7 +1468,7 @@
{
msg_ctx->svc_grp = svc_grp;
msg_ctx->svc_grp_id =
- (axis2_char_t *)AXIS2_SVC_GRP_GET_NAME(svc_grp, env);
+ (axis2_char_t *) axis2_svc_grp_get_name(svc_grp, env);
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_ctx.c?view=diff&rev=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_ctx.c Mon Mar 12 23:32:55 2007
@@ -184,7 +184,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_SVC_GRP_CTX_GET_PARENT(svc_ctx->parent, env);
+ return axis2_svc_grp_ctx_get_parent(svc_ctx->parent, env);
}
axis2_op_ctx_t *AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c?view=diff&rev=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c Mon Mar 12 23:32:55 2007
@@ -71,7 +71,7 @@
if (svc_grp)
{
svc_grp_ctx->svc_grp = svc_grp;
- svc_grp_ctx->svc_grp_name = (axis2_char_t *)AXIS2_SVC_GRP_GET_NAME(svc_grp_ctx->svc_grp, env);
+ svc_grp_ctx->svc_grp_name = (axis2_char_t *) axis2_svc_grp_get_name(svc_grp_ctx->svc_grp, env);
}
if (conf_ctx)
@@ -96,7 +96,6 @@
const axis2_svc_grp_ctx_t *svc_grp_ctx,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return svc_grp_ctx->base;
}
@@ -105,7 +104,6 @@
const axis2_svc_grp_ctx_t *svc_grp_ctx,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return svc_grp_ctx->parent;
}
@@ -119,13 +117,11 @@
if (svc_grp_ctx->id)
{
AXIS2_FREE(env->allocator, svc_grp_ctx->id);
- svc_grp_ctx->id = NULL;
}
if (svc_grp_ctx->base)
{
axis2_ctx_free(svc_grp_ctx->base, env);
- svc_grp_ctx->base = NULL;
}
if (svc_grp_ctx->svc_ctx_map)
@@ -149,7 +145,6 @@
}
AXIS2_FREE(env->allocator, svc_grp_ctx);
- svc_grp_ctx = NULL;
return AXIS2_SUCCESS;
}
@@ -176,7 +171,6 @@
const axis2_svc_grp_ctx_t *svc_grp_ctx,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return svc_grp_ctx->id;
}
@@ -208,8 +202,6 @@
const axis2_env_t *env,
const axis2_char_t *svc_name)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return (axis2_svc_ctx_t *) axis2_hash_get(svc_grp_ctx->svc_ctx_map, svc_name, AXIS2_HASH_KEY_STRING);
}
@@ -225,7 +217,7 @@
if (svc_grp_ctx->svc_grp)
{
- axis2_hash_t *service_map = AXIS2_SVC_GRP_GET_ALL_SVCS(svc_grp_ctx->svc_grp, env);
+ axis2_hash_t *service_map = axis2_svc_grp_get_all_svcs(svc_grp_ctx->svc_grp, env);
if (service_map)
{
for (hi = axis2_hash_first(service_map, env);
@@ -254,7 +246,6 @@
const axis2_svc_grp_ctx_t *svc_grp_ctx,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return svc_grp_ctx->svc_grp;
}
@@ -263,6 +254,5 @@
const axis2_svc_grp_ctx_t *svc_grp_ctx,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return svc_grp_ctx->svc_ctx_map;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Mon Mar 12 23:32:55 2007
@@ -327,7 +327,7 @@
}
arch_file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(dep_engine, env);
svc_name = AXIS2_ARCH_FILE_DATA_GET_SVC_NAME(arch_file_data, env);
- AXIS2_SVC_GRP_SET_NAME(svc_grp, env, svc_name);
+ axis2_svc_grp_set_name(svc_grp, env, svc_name);
}
else
{
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=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Mon Mar 12 23:32:55 2007
@@ -1103,7 +1103,7 @@
AXIS2_SVC_SET_FILE_NAME(svc, env, file_name);
/* modules from svc group */
- grp_modules = AXIS2_SVC_GRP_GET_ALL_MODULE_QNAMES(svc_metadata, env);
+ grp_modules = axis2_svc_grp_get_all_module_qnames(svc_metadata, env);
if (grp_modules)
sizej = axis2_array_list_size(grp_modules, env);
for (j = 0; j < sizej; j++)
@@ -1199,7 +1199,7 @@
}
}
}
- AXIS2_SVC_GRP_ADD_SVC(svc_metadata, env, svc);
+ axis2_svc_grp_add_svc(svc_metadata, env, svc);
}
return AXIS2_CONF_ADD_SVC_GRP(dep_engine_impl->conf, env, svc_metadata);
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?view=diff&rev=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Mon Mar 12 23:32:55 2007
@@ -187,7 +187,7 @@
qparamst = NULL;
}
- parent = AXIS2_SVC_GRP_GET_PARENT(svc_grp, env);
+ parent = axis2_svc_grp_get_parent(svc_grp, env);
status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(grp_builder_impl->svc_grp_builder.
desc_builder, env, itr,
axis2_svc_grp_get_param_container(svc_grp, env), parent->param_container);
@@ -324,7 +324,7 @@
}
else
{
- AXIS2_SVC_GRP_ADD_MODULE_REF(svc_grp, env, qrefname);
+ axis2_svc_grp_add_module_ref(svc_grp, env, qrefname);
}
AXIS2_QNAME_FREE(qrefname, env);
}
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=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Mon Mar 12 23:32:55 2007
@@ -429,7 +429,7 @@
parent = (axis2_svc_grp_t *) axis2_svc_get_parent(svc, env);
if (parent)
{
- conf = (axis2_conf_t *) AXIS2_SVC_GRP_GET_PARENT(parent, env);
+ conf = (axis2_conf_t *) axis2_svc_grp_get_parent(parent, env);
}
if (module_desc)
module_impl = axis2_module_desc_get_module(module_desc, env);
@@ -591,7 +591,7 @@
param = AXIS2_PARAM_CONTAINER_GET_PARAM(svc->param_container, env, name);
if (param == NULL && svc->parent)
{
- param = AXIS2_SVC_GRP_GET_PARAM(svc->parent, env, name);
+ param = axis2_svc_grp_get_param(svc->parent, env, name);
}
return param;
}
@@ -624,7 +624,7 @@
parent = axis2_svc_get_parent(svc, env);
if (parent)
- locked = AXIS2_SVC_GRP_IS_PARAM_LOCKED(parent, env, param_name);
+ locked = axis2_svc_grp_is_param_locked(parent, env, param_name);
if (parent && AXIS2_TRUE == locked)
{
return AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?view=diff&rev=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Mon Mar 12 23:32:55 2007
@@ -57,7 +57,7 @@
svc_grp->module_list = NULL;
svc_grp->param_container = axis2_param_container_create(env);
- if (NULL == svc_grp->param_container)
+ if (!svc_grp->param_container)
{
axis2_svc_grp_free(svc_grp, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -65,7 +65,7 @@
}
svc_grp->module_qnames = axis2_array_list_create(env, 20);
- if (NULL == svc_grp->module_qnames)
+ if (!svc_grp->module_qnames)
{
axis2_svc_grp_free(svc_grp, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -73,7 +73,7 @@
}
svc_grp->module_list = axis2_array_list_create(env, 0);
- if (NULL == svc_grp->module_list)
+ if (!svc_grp->module_list)
{
axis2_svc_grp_free(svc_grp, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -81,7 +81,7 @@
}
svc_grp->svcs = axis2_hash_make(env);
- if (NULL == svc_grp->svcs)
+ if (!svc_grp->svcs)
{
axis2_svc_grp_free(svc_grp, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -120,38 +120,32 @@
{
AXIS2_PARAM_CONTAINER_FREE(svc_grp->param_container,
env);
- svc_grp->param_container = NULL;
}
if (svc_grp->svc_grp_name)
{
AXIS2_FREE(env->allocator, svc_grp->svc_grp_name);
- svc_grp->svc_grp_name = NULL;
}
if (svc_grp->svcs)
{
/* services are freed by arch_file_data */
axis2_hash_free(svc_grp->svcs, env);
- svc_grp->svcs = NULL;
}
if (svc_grp->module_qnames)
{
axis2_array_list_free(svc_grp->module_qnames, env);
- svc_grp->module_qnames = NULL;
}
if (svc_grp->module_list)
{
axis2_array_list_free(svc_grp->module_list, env);
- svc_grp->module_list = NULL;
}
if (svc_grp)
{
AXIS2_FREE(env->allocator, svc_grp);
- svc_grp = NULL;
}
return AXIS2_SUCCESS;
}
@@ -181,8 +175,6 @@
const axis2_svc_grp_t *svc_grp,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return svc_grp->svc_grp_name;
}
@@ -213,7 +205,7 @@
handler_resolver = axis2_phase_resolver_create_with_config_and_svc(env,
svc_grp->parent, svc);
- if (NULL == handler_resolver)
+ if (!handler_resolver)
{
/* remove the previously added service */
axis2_hash_set(svc_grp->svcs, svc_name, AXIS2_HASH_KEY_STRING,
@@ -274,7 +266,6 @@
const axis2_svc_grp_t *svc_grp,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return svc_grp->svcs;
}
@@ -404,8 +395,6 @@
const axis2_svc_grp_t *svc_grp,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return svc_grp->parent;
}
@@ -463,7 +452,7 @@
}
svc_map = axis2_svc_grp_get_all_svcs(svc_grp, env);
- if (NULL == svc_map)
+ if (!svc_map)
{
return AXIS2_FAILURE;
}
@@ -471,7 +460,7 @@
phase_resolver = axis2_phase_resolver_create_with_config(env, svc_grp->
parent);
- if (NULL == phase_resolver)
+ if (!phase_resolver)
{
return AXIS2_FAILURE;
}
@@ -515,8 +504,6 @@
const axis2_svc_grp_t *svc_grp,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return svc_grp->module_qnames;
}
@@ -543,8 +530,6 @@
const axis2_svc_grp_t *svc_grp,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return svc_grp->module_list;
}
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=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Mon Mar 12 23:32:55 2007
@@ -239,7 +239,7 @@
if (svc_grp_ctx)
{
axis2_string_t *svc_grp_ctx_id_str =
- axis2_string_create(env, AXIS2_SVC_GRP_CTX_GET_ID(svc_grp_ctx, env));
+ axis2_string_create(env, axis2_svc_grp_ctx_get_id(svc_grp_ctx, env));
axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str);
axis2_string_free(svc_grp_ctx_id_str, env);
}
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=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Mar 12 23:32:55 2007
@@ -675,7 +675,7 @@
axis2_hash_this(hi, NULL, NULL, &val);
svc_grp = (axis2_svc_grp_t *) val;
if (svc_grp)
- AXIS2_SVC_GRP_FREE(svc_grp, env);
+ axis2_svc_grp_free(svc_grp, env);
val = NULL;
svc_grp = NULL;
@@ -963,7 +963,7 @@
AXIS2_PARAM_CHECK(env->error, svc_grp, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
- svcs = AXIS2_SVC_GRP_GET_ALL_SVCS(svc_grp, env);
+ svcs = axis2_svc_grp_get_all_svcs(svc_grp, env);
if (!config_impl->all_svcs)
{
config_impl->all_svcs = axis2_hash_make(env);
@@ -996,7 +996,7 @@
index_i = axis2_hash_next(env, index_i);
}
- svcs = AXIS2_SVC_GRP_GET_ALL_SVCS(svc_grp, env);
+ svcs = axis2_svc_grp_get_all_svcs(svc_grp, env);
index_i = axis2_hash_first(svcs, env);
while (index_i)
{
@@ -1011,7 +1011,7 @@
index_i = axis2_hash_next(env, index_i);
}
- svc_grp_name = AXIS2_SVC_GRP_GET_NAME(svc_grp, env);
+ svc_grp_name = axis2_svc_grp_get_name(svc_grp, env);
if (!config_impl->svc_grps)
{
config_impl->svc_grps = axis2_hash_make(env);
@@ -1088,17 +1088,17 @@
{
return AXIS2_FAILURE;
}
- status = AXIS2_SVC_GRP_SET_NAME(svc_grp, env, svc_grp_name);
+ status = axis2_svc_grp_set_name(svc_grp, env, svc_grp_name);
if (AXIS2_FAILURE == status)
{
return status;
}
- status = AXIS2_SVC_GRP_SET_PARENT(svc_grp, env, conf);
+ status = axis2_svc_grp_set_parent(svc_grp, env, conf);
if (AXIS2_FAILURE == status)
{
return status;
}
- status = AXIS2_SVC_GRP_ADD_SVC(svc_grp, env, svc);
+ status = axis2_svc_grp_add_svc(svc_grp, env, svc);
if (AXIS2_FAILURE == status)
{
return status;
@@ -1430,7 +1430,7 @@
{
axis2_hash_this(index_i, NULL, NULL, &value);
axis_svc_grp = (axis2_svc_grp_t *) value;
- svcs = AXIS2_SVC_GRP_GET_ALL_SVCS(axis_svc_grp, env);
+ svcs = axis2_svc_grp_get_all_svcs(axis_svc_grp, env);
index_j = axis2_hash_first(svcs, env);
while (index_j)
{
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=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c Mon Mar 12 23:32:55 2007
@@ -114,7 +114,7 @@
if (svc_grp_ctx)
{
axis2_string_t *svc_grp_ctx_id_str =
- axis2_string_create(env, AXIS2_SVC_GRP_CTX_GET_ID(svc_grp_ctx, env));
+ axis2_string_create(env, axis2_svc_grp_ctx_get_id(svc_grp_ctx, env));
axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str);
axis2_string_free(svc_grp_ctx_id_str, env);
}
@@ -137,7 +137,7 @@
axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx);
axis2_msg_ctx_set_svc_grp_ctx(msg_ctx, env, svc_grp_ctx);
- svc_grp_ctx_id_str = axis2_string_create(env, AXIS2_SVC_GRP_CTX_GET_ID(svc_grp_ctx, env));
+ svc_grp_ctx_id_str = axis2_string_create(env, axis2_svc_grp_ctx_get_id(svc_grp_ctx, env));
axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str);
axis2_string_free(svc_grp_ctx_id_str, env);
}
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=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Mon Mar 12 23:32:55 2007
@@ -1036,7 +1036,7 @@
axis2_hash_this(index_i, NULL, NULL, &v);
svc_grp = (axis2_svc_grp_t *) v;
- svcs = AXIS2_SVC_GRP_GET_ALL_SVCS(svc_grp, env);
+ svcs = axis2_svc_grp_get_all_svcs(svc_grp, env);
for (index_j = axis2_hash_first(svcs, env); index_j; index_j =
axis2_hash_next(env, index_j))
@@ -1070,7 +1070,7 @@
}*/
}
mod_name = axis2_module_desc_get_qname(module_desc, env);
- status = AXIS2_SVC_GRP_ADD_MODULE_QNAME(svc_grp, env,
+ status = axis2_svc_grp_add_module_qname(svc_grp, env,
mod_name);
if (AXIS2_SUCCESS != status)
Modified: webservices/axis2/trunk/c/samples/server/sg_math/add.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add.c?view=diff&rev=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add.c Mon Mar 12 23:32:55 2007
@@ -129,7 +129,7 @@
if (svc_grp_ctx)
{
axis2_ctx_t* ctx = NULL;
- ctx = AXIS2_SVC_GRP_CTX_GET_BASE(svc_grp_ctx, env);
+ ctx = axis2_svc_grp_ctx_get_base(svc_grp_ctx, env);
if (ctx)
{
axis2_property_t* prop = NULL;
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=517563&r1=517562&r2=517563
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Mon Mar 12 23:32:55 2007
@@ -70,7 +70,7 @@
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);
+ axis2_svc_grp_ctx_free(svc_grp_ctx, env);
axis2_svc_ctx_free(svc_ctx, env);
AXIS2_SVC_FREE(svc, env);
axis2_op_ctx_free(op_ctx, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org