Author: damitha
Date: Fri Feb 2 03:56:36 2007
New Revision: 502585
URL: http://svn.apache.org/viewvc?view=rev&rev=502585
Log:
Fixed SANDESHA2C-12
Modified:
webservices/sandesha/trunk/c/config/module.xml
webservices/sandesha/trunk/c/include/sandesha2_constants.h
webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
Modified: webservices/sandesha/trunk/c/config/module.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/module.xml?view=diff&rev=502585&r1=502584&r2=502585
==============================================================================
--- webservices/sandesha/trunk/c/config/module.xml (original)
+++ webservices/sandesha/trunk/c/config/module.xml Fri Feb 2 03:56:36 2007
@@ -67,11 +67,8 @@
</operation>
- <!-- General Properties -->
- <parameter name="" locked="false"></parameter>
<!-- Database connection parameters -->
- <parameter name="sandesah2_svr_db"
locked="false">/axis2c/deploy/sandesha2_svr_db</parameter>
- <parameter name="sandesha2_client_db"
locked="false">/axis2c/deploy/sandesha2_client_db</parameter>
+ <parameter name="sandesha2_db" locked="false">/axis2c/deploy</parameter>
</module>
Modified: webservices/sandesha/trunk/c/include/sandesha2_constants.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_constants.h?view=diff&rev=502585&r1=502584&r2=502585
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_constants.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_constants.h Fri Feb 2
03:56:36 2007
@@ -495,8 +495,7 @@
#define SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR ",,,"
#define SANDESHA2_BUSY_WAIT_TIME 8
#define SANDESHA2_IS_SVR_SIDE "is_svr_side"
- #define SANDESHA2_SVR_DB "sandesha2_svr_db"
- #define SANDESHA2_CLIENT_DB "sandesha2_client_db"
+ #define SANDESHA2_DB "sandesha2_db"
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/mod_sandesha2.c?view=diff&rev=502585&r1=502584&r2=502585
==============================================================================
--- webservices/sandesha/trunk/c/src/core/mod_sandesha2.c (original)
+++ webservices/sandesha/trunk/c/src/core/mod_sandesha2.c Fri Feb 2 03:56:36
2007
@@ -69,10 +69,11 @@
sandesha2_property_bean_t *const_property_bean = NULL;
sandesha2_property_bean_t *property_bean = NULL;
axis2_param_t *param = NULL;
+ axis2_param_t *db_param = NULL;
axis2_conf_t *conf = NULL;
axis2_ctx_t *ctx = NULL;
sandesha2_storage_mgr_t *storage_mgr = NULL;
- axis2_char_t *repo_path = NULL;
+ axis2_char_t *db_path = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
@@ -87,13 +88,17 @@
property_bean = const_property_bean;
param = axis2_param_create(env, SANDESHA2_SANDESHA_PROPERTY_BEAN,
- property_bean);
+ property_bean);
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
AXIS2_CONF_ADD_PARAM(conf, env, param);
- repo_path = (axis2_char_t *) AXIS2_CONF_GET_REPO(
- (const axis2_conf_t *) conf, env);
- sandesha2_property_bean_set_db_path(property_bean, env, repo_path);
+ db_param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env, SANDESHA2_DB);
+ if(db_param)
+ {
+ db_path = (axis2_char_t *) axis2_param_get_value(db_param, env);
+ sandesha2_property_bean_set_db_path(property_bean, env, db_path);
+ }
+
ctx = AXIS2_CONF_CTX_GET_BASE(conf_ctx, env);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_INMEMORY_STORAGE_MGR, NULL,
AXIS2_FALSE);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
