Author: damitha
Date: Thu Nov 15 01:09:32 2007
New Revision: 595250
URL: http://svn.apache.org/viewvc?rev=595250&view=rev
Log:
for sqlite we dont' have separte client/server database names now.
database name is sandesha2_db
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c?rev=595250&r1=595249&r2=595250&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c Thu
Nov 15 01:09:32 2007
@@ -1139,19 +1139,15 @@
axis2_char_t thread_id_key[128];
sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
- /*axutil_thread_mutex_lock(storage_mgr_impl->mutex);*/
sprintf(thread_id_key, "%lu", thread_id);
axutil_allocator_switch_to_global_pool(env->allocator);
transaction = (sandesha2_transaction_t *) axutil_hash_get(
storage_mgr_impl->transactions, thread_id_key, AXIS2_HASH_KEY_STRING);
axutil_allocator_switch_to_local_pool(env->allocator);
- /*transaction =
sandesha2_permanent_storage_mgr_get_transaction(storage_mgr,
- env);*/
if(transaction)
{
dbconn = (sqlite3 *)
sandesha2_permanent_transaction_get_dbconn(transaction, env);
}
- /*axutil_thread_mutex_unlock(storage_mgr_impl->mutex);*/
return dbconn;
}
@@ -1277,8 +1273,6 @@
axis2_char_t *path = "./";
int rc = -1;
sqlite3 *dbconn = NULL;
- axis2_ctx_t *conf_ctx_base = NULL;
- /*axutil_property_t *property = NULL;*/
axis2_char_t *db_name = NULL;
axis2_char_t *sql_stmt1 = NULL;
axis2_char_t *sql_stmt2 = NULL;
@@ -1306,21 +1300,7 @@
}
axutil_qname_free(qname, env);
}
- conf_ctx_base = axis2_conf_ctx_get_base(conf_ctx, env);
- /*property = axis2_ctx_get_property(conf_ctx_base, env,
- AXIS2_IS_SVR_SIDE);
- if(property && 0 == axutil_strcmp(AXIS2_VALUE_TRUE,
- axutil_property_get_value(property, env)))*/
- {
- db_name = axutil_strcat(env, path, AXIS2_PATH_SEP_STR,
- "sandesha2_svr_db", NULL);
- }
- /*else if(property && 0 == axutil_strcmp(AXIS2_VALUE_FALSE,
- axutil_property_get_value(property, env)))
- {
- db_name = axutil_strcat(env, path, AXIS2_PATH_SEP_STR,
- "sandesha2_client_db", NULL);
- }*/
+ db_name = axutil_strcat(env, path, AXIS2_PATH_SEP_STR, "sandesha2_db",
NULL);
rc = sqlite3_open(db_name, &dbconn);
if(rc != SQLITE_OK)
{
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c?rev=595250&r1=595249&r2=595250&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c Thu
Nov 15 01:09:32 2007
@@ -101,8 +101,6 @@
int rc = -1;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
- axis2_ctx_t *conf_ctx_base = NULL;
- /*axutil_property_t *property = NULL;*/
trans_impl = (sandesha2_permanent_transaction_impl_t *)AXIS2_MALLOC
(env->allocator, sizeof(sandesha2_permanent_transaction_impl_t));
@@ -121,7 +119,6 @@
{
return NULL;
}
- /*path = sandesha2_property_bean_get_db_path(prop_bean, env);*/
{
axis2_module_desc_t *module_desc = NULL;
axutil_qname_t *qname = NULL;
@@ -138,19 +135,8 @@
}
axutil_qname_free(qname, env);
}
- conf_ctx_base = axis2_conf_ctx_get_base(conf_ctx, env);
- /*property = axis2_ctx_get_property(conf_ctx_base, env,
- SANDESHA2_IS_SVR_SIDE);
- if(!property)*/
- {
- db_name = axutil_strcat(env, path, AXIS2_PATH_SEP_STR,
- "sandesha2_svr_db", NULL);
- }
- /*else
- {
- db_name = axutil_strcat(env, path, AXIS2_PATH_SEP_STR,
- "sandesha2_client_db", NULL);
- }*/
+ db_name = axutil_strcat(env, path, AXIS2_PATH_SEP_STR,
+ "sandesha2_db", NULL);
rc = sqlite3_open(db_name, &(trans_impl->dbconn));
if(rc != SQLITE_OK)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
