Author: damitha Date: Wed Jun 13 01:56:38 2007 New Revision: 546783 URL: http://svn.apache.org/viewvc?view=rev&rev=546783 Log: renameing the functions concerned with initial service loading.
Modified: webservices/axis2/trunk/c/include/axis2_conf.h webservices/axis2/trunk/c/include/axis2_const.h webservices/axis2/trunk/c/src/core/deployment/conf_init.c webservices/axis2/trunk/c/src/core/engine/conf.c Modified: webservices/axis2/trunk/c/include/axis2_conf.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf.h?view=diff&rev=546783&r1=546782&r2=546783 ============================================================================== --- webservices/axis2/trunk/c/include/axis2_conf.h (original) +++ webservices/axis2/trunk/c/include/axis2_conf.h Wed Jun 13 01:56:38 2007 @@ -391,7 +391,7 @@ * reference, not a cloned copy */ AXIS2_EXTERN axutil_hash_t *AXIS2_CALL - axis2_conf_get_all_init_svcs( + axis2_conf_get_all_svcs_to_load( const axis2_conf_t *conf, const axutil_env_t *env); Modified: webservices/axis2/trunk/c/include/axis2_const.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_const.h?view=diff&rev=546783&r1=546782&r2=546783 ============================================================================== --- webservices/axis2/trunk/c/include/axis2_const.h (original) +++ webservices/axis2/trunk/c/include/axis2_const.h Wed Jun 13 01:56:38 2007 @@ -331,6 +331,9 @@ #define AXIS2_TESTING_REPOSITORY "target/test-resources/samples" +/* Indicate whether the axis2 service should be loaded at start up */ +#define AXIS2_LOAD_SVC_STARTUP "loadServiceAtStartup" + /*************************** REST_WITH_GET ************************************/ Modified: webservices/axis2/trunk/c/src/core/deployment/conf_init.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/conf_init.c?view=diff&rev=546783&r1=546782&r2=546783 ============================================================================== --- webservices/axis2/trunk/c/src/core/deployment/conf_init.c (original) +++ webservices/axis2/trunk/c/src/core/deployment/conf_init.c Wed Jun 13 01:56:38 2007 @@ -30,7 +30,7 @@ axis2_conf_ctx_t *conf_ctx); static axis2_status_t AXIS2_CALL -axis2_init_services( +axis2_load_services( const axutil_env_t *env, axis2_conf_ctx_t *conf_ctx); @@ -73,7 +73,7 @@ axis2_phase_resolver_build_chains(phase_resolver, env); axis2_init_modules(env, conf_ctx); - axis2_init_services(env, conf_ctx); + axis2_load_services(env, conf_ctx); axis2_init_transports(env, conf_ctx); axis2_phase_resolver_free(phase_resolver, env); @@ -120,7 +120,7 @@ axis2_phase_resolver_build_chains(phase_resolver, env); axis2_init_modules(env, conf_ctx); - axis2_init_services(env, conf_ctx); + axis2_load_services(env, conf_ctx); axis2_init_transports(env, conf_ctx); axis2_phase_resolver_free(phase_resolver, env); @@ -171,7 +171,7 @@ } static axis2_status_t AXIS2_CALL -axis2_init_services( +axis2_load_services( const axutil_env_t *env, axis2_conf_ctx_t *conf_ctx) { @@ -184,7 +184,7 @@ conf = axis2_conf_ctx_get_conf(conf_ctx, env); if (conf) { - axutil_hash_t *svc_map = axis2_conf_get_all_init_svcs(conf, env); + axutil_hash_t *svc_map = axis2_conf_get_all_svcs_to_load(conf, env); if (svc_map) { axutil_hash_index_t *hi = NULL; Modified: webservices/axis2/trunk/c/src/core/engine/conf.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/engine/conf.c?view=diff&rev=546783&r1=546782&r2=546783 ============================================================================== --- webservices/axis2/trunk/c/src/core/engine/conf.c (original) +++ webservices/axis2/trunk/c/src/core/engine/conf.c Wed Jun 13 01:56:38 2007 @@ -981,7 +981,7 @@ } AXIS2_EXTERN axutil_hash_t *AXIS2_CALL -axis2_conf_get_all_init_svcs( +axis2_conf_get_all_svcs_to_load( const axis2_conf_t *conf, const axutil_env_t *env) { @@ -1012,7 +1012,7 @@ svc = (axis2_svc_t *) value2; svc_name = axutil_qname_get_localpart(axis2_svc_get_qname(svc, env), env); - param = axis2_svc_get_param(svc, env, "Axis2InitService"); + param = axis2_svc_get_param(svc, env, AXIS2_LOAD_SVC_STARTUP); if(param) axutil_hash_set(conf->all_init_svcs, svc_name, AXIS2_HASH_KEY_STRING, svc); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]