You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2006/08/08 17:54:39 UTC
svn commit: r429699 - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ modules/core/deployment/
modules/core/phaseresolver/ modules/core/transport/http/
test/core/deployment/
Author: samisa
Date: Tue Aug 8 08:54:38 2006
New Revision: 429699
URL: http://svn.apache.org/viewvc?rev=429699&view=rev
Log:
Fixed build breaks caused due to updates to conf API
Modified:
webservices/axis2/trunk/c/include/axis2_conf.h
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.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/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
Modified: webservices/axis2/trunk/c/include/axis2_conf.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf.h?rev=429699&r1=429698&r2=429699&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf.h Tue Aug 8 08:54:38 2006
@@ -304,7 +304,7 @@
* @param qname pointer to qname
* @return module description corresponding to the given qname
*/
- axis2_module_desc_t *(AXIS2_CALL *
+ struct axis2_module_desc *(AXIS2_CALL *
get_module)(
const axis2_conf_t *conf,
const axis2_env_t *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?rev=429699&r1=429698&r2=429699&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Tue Aug 8 08:54:38 2006
@@ -242,7 +242,7 @@
axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
axis2_char_t *svc_grp_name = NULL;
axis2_hash_t *ops = NULL;
- axis2_char_t *repos_path = NULL;
+ const axis2_char_t *repos_path = NULL;
axis2_char_t *wsdl_path = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -281,7 +281,7 @@
}
svc_client_impl->conf = AXIS2_CONF_CTX_GET_CONF(svc_client_impl->conf_ctx, env);
- repos_path = AXIS2_CONF_GET_REPOS(svc_client_impl->conf, 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);
svc_client_impl->options = axis2_options_create(env);
@@ -301,7 +301,7 @@
op = (axis2_op_t *) v;
/* Setting operation phase */
- info = AXIS2_CONF_GET_PHASESINFO(svc_client_impl->conf, env);
+ info = AXIS2_CONF_GET_PHASES_INFO(svc_client_impl->conf, env);
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op);
}
}
@@ -1257,7 +1257,7 @@
AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op_robust_out_only, env, AXIS2_MEP_URI_ROBUST_OUT_ONLY);
/* Setting operation phase */
- info = AXIS2_CONF_GET_PHASESINFO(svc_client_impl->conf, env);
+ info = AXIS2_CONF_GET_PHASES_INFO(svc_client_impl->conf, env);
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_out_in);
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_out_only);
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_robust_out_only);
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?rev=429699&r1=429698&r2=429699&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_init.c Tue Aug 8 08:54:38 2006
@@ -126,7 +126,7 @@
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
if (conf)
{
- axis2_hash_t *module_map = AXIS2_CONF_GET_MODULES(conf, env);
+ axis2_hash_t *module_map = AXIS2_CONF_GET_ALL_MODULES(conf, env);
if (module_map)
{
axis2_hash_index_t *hi = NULL;
@@ -167,7 +167,7 @@
{
axis2_hash_t *transport_map = NULL;
- transport_map = AXIS2_CONF_GET_TRANSPORTS_IN(conf, env);
+ transport_map = AXIS2_CONF_GET_ALL_IN_TRANSPORTS(conf, env);
if (transport_map)
{
axis2_hash_index_t *hi = NULL;
@@ -189,7 +189,7 @@
}
}
- transport_map = AXIS2_CONF_GET_TRANSPORTS_OUT(conf, env);
+ transport_map = AXIS2_CONF_GET_ALL_OUT_TRANSPORTS(conf, env);
if (transport_map)
{
axis2_hash_index_t *hi = NULL;
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?rev=429699&r1=429698&r2=429699&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Tue Aug 8 08:54:38 2006
@@ -802,9 +802,9 @@
AXIS2_CONF_FREE(dep_engine_impl->conf, env);
return NULL;
}
- AXIS2_CONF_SET_REPOS(dep_engine_impl->conf, env, dep_engine_impl->axis2_repos);
+ AXIS2_CONF_SET_REPO(dep_engine_impl->conf, env, dep_engine_impl->axis2_repos);
axis2_core_utils_calculate_default_module_version(env,
- AXIS2_CONF_GET_MODULES(dep_engine_impl->conf, env),
+ AXIS2_CONF_GET_ALL_MODULES(dep_engine_impl->conf, env),
dep_engine_impl->conf);
status = axis2_dep_engine_validate_system_predefined_phases(dep_engine, env);
if(AXIS2_SUCCESS != status)
@@ -816,9 +816,9 @@
return NULL;
}
- status = AXIS2_CONF_SET_PHASESINFO(dep_engine_impl->conf, env,
+ status = AXIS2_CONF_SET_PHASES_INFO(dep_engine_impl->conf, env,
dep_engine_impl->phases_info);
- AXIS2_CONF_SET_OUT_FAULTPHASES(dep_engine_impl->conf, env,
+ AXIS2_CONF_SET_OUT_FAULT_PHASES(dep_engine_impl->conf, env,
AXIS2_PHASES_INFO_GET_OP_OUT_FAULTPHASES(dep_engine_impl->phases_info,
env));
if(AXIS2_SUCCESS != status)
@@ -914,11 +914,11 @@
dep_engine_impl->folder_name, dep_engine);
}
- AXIS2_CONF_SET_REPOS(dep_engine_impl->conf, env, dep_engine_impl->axis2_repos);
+ AXIS2_CONF_SET_REPO(dep_engine_impl->conf, env, dep_engine_impl->axis2_repos);
axis2_core_utils_calculate_default_module_version(env,
- AXIS2_CONF_GET_MODULES(dep_engine_impl->conf, env),
+ AXIS2_CONF_GET_ALL_MODULES(dep_engine_impl->conf, env),
dep_engine_impl->conf);
- AXIS2_CONF_SET_PHASESINFO(dep_engine_impl->conf, env, dep_engine_impl->
+ AXIS2_CONF_SET_PHASES_INFO(dep_engine_impl->conf, env, dep_engine_impl->
phases_info);
status = axis2_dep_engine_engage_modules(dep_engine, env);
if(AXIS2_FAILURE == status)
@@ -1589,7 +1589,7 @@
AXIS2_CONF_REMOVE_SVC(dep_engine_impl->conf, env, svc_name);
}
- faulty_svcs = AXIS2_CONF_GET_FAULTY_SVCS(dep_engine_impl->conf, env);
+ faulty_svcs = AXIS2_CONF_GET_ALL_FAULTY_SVCS(dep_engine_impl->conf, env);
axis2_hash_set(faulty_svcs, svc_name, AXIS2_HASH_KEY_STRING, NULL);
}
@@ -1712,7 +1712,7 @@
AXIS2_PARAM_CHECK(env->error, conf, NULL);
dep_engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
- phases_info = AXIS2_CONF_GET_PHASESINFO(conf, env);
+ phases_info = AXIS2_CONF_GET_PHASES_INFO(conf, env);
axis2_dep_engine_set_phases_info(dep_engine, env, phases_info);
dep_engine_impl->curr_file = axis2_arch_file_data_create_with_type_and_file(
env, AXIS2_MODULE, module_archive);
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?rev=429699&r1=429698&r2=429699&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Tue Aug 8 08:54:38 2006
@@ -350,7 +350,7 @@
/********************* Handlers from axis2.xml from modules *************/
/**************************************************************************/
- moduleqnames = AXIS2_CONF_GET_ENGAGED_MODULES(
+ moduleqnames = AXIS2_CONF_GET_ALL_ENGAGED_MODULES(
resolver_impl->axis2_config, env);
size = AXIS2_ARRAY_LIST_SIZE(moduleqnames, env);
@@ -708,7 +708,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
- transports_in = AXIS2_CONF_GET_TRANSPORTS_IN(resolver_impl->axis2_config,
+ transports_in = AXIS2_CONF_GET_ALL_IN_TRANSPORTS(resolver_impl->axis2_config,
env);
if(!transports_in)
{
@@ -717,7 +717,7 @@
return AXIS2_SUCCESS;
}
- transports_out = AXIS2_CONF_GET_TRANSPORTS_OUT(resolver_impl->axis2_config,
+ transports_out = AXIS2_CONF_GET_ALL_OUT_TRANSPORTS(resolver_impl->axis2_config,
env);
if(!transports_out)
{
@@ -1046,7 +1046,7 @@
{
return status;
}
- svc_grps = AXIS2_CONF_GET_SVC_GRPS(resolver_impl->axis2_config, env);
+ svc_grps = AXIS2_CONF_GET_ALL_SVC_GRPS(resolver_impl->axis2_config, env);
if(!svc_grps)
{
return AXIS2_FAILURE;
@@ -1341,7 +1341,7 @@
{
axis2_array_list_t *phase_list = NULL;
- phase_list = AXIS2_CONF_GET_OUTFLOW(resolver_impl->axis2_config,
+ phase_list = AXIS2_CONF_GET_OUT_FLOW(resolver_impl->axis2_config,
env);
if(resolver_impl->phase_holder)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?rev=429699&r1=429698&r2=429699&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Tue Aug 8 08:54:38 2006
@@ -699,9 +699,9 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
- services_map = AXIS2_CONF_GET_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_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(NULL != services_map && 0 != axis2_hash_count(services_map))
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?rev=429699&r1=429698&r2=429699&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c Tue Aug 8 08:54:38 2006
@@ -523,7 +523,7 @@
AXIS2_PARAM_CHECK(env->error, simple_response, AXIS2_FAILURE);
config = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
- tranport_outs = AXIS2_CONF_GET_TRANSPORTS_OUT(config, env);
+ tranport_outs = AXIS2_CONF_GET_ALL_OUT_TRANSPORTS(config, env);
/*
Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?rev=429699&r1=429698&r2=429699&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Tue Aug 8 08:54:38 2006
@@ -61,7 +61,7 @@
return -1;
}
- svc_map = AXIS2_CONF_GET_SVCS(conf, env);
+ svc_map = AXIS2_CONF_GET_ALL_SVCS(conf, env);
if (svc_map)
printf("svc_map count = %d\n", axis2_hash_count(svc_map));
else
@@ -243,7 +243,7 @@
module5 = axis2_module_desc_create_with_qname(env, mod_qname5);
AXIS2_CONF_ADD_MODULE(axis_conf, env, module5);
- axis2_core_utils_calculate_default_module_version(env, AXIS2_CONF_GET_MODULES(
+ axis2_core_utils_calculate_default_module_version(env, AXIS2_CONF_GET_ALL_MODULES(
axis_conf, env), axis_conf);
def_mod = AXIS2_CONF_GET_DEFAULT_MODULE(axis_conf, env, "module1");
if(def_mod != module1)
@@ -275,7 +275,7 @@
AXIS2_CONF_ENGAGE_MODULE_WITH_VERSION(axis_conf, env, "test_module", "1.92");
- engaged_modules = AXIS2_CONF_GET_ENGAGED_MODULES(axis_conf, env);
+ engaged_modules = AXIS2_CONF_GET_ALL_ENGAGED_MODULES(axis_conf, env);
if(NULL != engaged_modules)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org