You are viewing a plain text version of this content. The canonical link for it is here.
Posted to savan-dev@ws.apache.org by sh...@apache.org on 2009/10/21 14:56:52 UTC
svn commit: r827997 - in /webservices/savan/trunk/c/src: data/module.xml
subs_mgrs/registry/subs_mgr.c subs_mgrs/service/subs_mgr.c
subs_mgrs/sqlite/subs_mgr.c util/savan_util.c
Author: shankar
Date: Wed Oct 21 12:56:52 2009
New Revision: 827997
URL: http://svn.apache.org/viewvc?rev=827997&view=rev
Log:
Fix for issue AXIS2C-1405
Modified:
webservices/savan/trunk/c/src/data/module.xml
webservices/savan/trunk/c/src/subs_mgrs/registry/subs_mgr.c
webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr.c
webservices/savan/trunk/c/src/subs_mgrs/sqlite/subs_mgr.c
webservices/savan/trunk/c/src/util/savan_util.c
Modified: webservices/savan/trunk/c/src/data/module.xml
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/data/module.xml?rev=827997&r1=827996&r2=827997&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/data/module.xml (original)
+++ webservices/savan/trunk/c/src/data/module.xml Wed Oct 21 12:56:52 2009
@@ -1,7 +1,7 @@
<module name="savan" class="mod_savan">
<!-- Resource parameters -->
<!-- savan_storage could be one of inmemory, sqlite and service-->
- <parameter name="savan_resource" locked="false">/tmp/savan_db</parameter>
+ <!--parameter name="savan_resource" locked="false">/tmp/savan_db</parameter>-->
<!--parameter name="savan_resource" locked="false">http://localhost:9763/registry</parameter>
<parameter name="username" locked="false">admin</parameter>
<parameter name="password" locked="false">admin</parameter-->
Modified: webservices/savan/trunk/c/src/subs_mgrs/registry/subs_mgr.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/registry/subs_mgr.c?rev=827997&r1=827996&r2=827997&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/registry/subs_mgr.c (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/registry/subs_mgr.c Wed Oct 21 12:56:52 2009
@@ -143,7 +143,7 @@
memset ((void *) subsmgrimpl, 0, sizeof(savan_registry_subs_mgr_t));
subsmgrimpl->remote_registry = NULL;
- subsmgrimpl->reg_url = axutil_strdup(env, savan_util_get_resource_connection_string(env, conf));
+ subsmgrimpl->reg_url = savan_util_get_resource_connection_string(env, conf);
subsmgrimpl->username = axutil_strdup(env, savan_util_get_resource_username(env, conf));
subsmgrimpl->password = axutil_strdup(env, savan_util_get_resource_password(env, conf));
subsmgrimpl->conf = conf;
Modified: webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr.c?rev=827997&r1=827996&r2=827997&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr.c (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr.c Wed Oct 21 12:56:52 2009
@@ -159,7 +159,7 @@
memset ((void *) subs_mgr_impl, 0, sizeof(savan_service_subs_mgr_t));
- subs_mgr_impl->subs_mgr_url = axutil_strdup(env, savan_util_get_resource_connection_string(env, conf));
+ subs_mgr_impl->subs_mgr_url = savan_util_get_resource_connection_string(env, conf);
subs_mgr_impl->conf = conf;
subs_mgr_impl->subs_mgr.ops = &subs_mgr_ops;
Modified: webservices/savan/trunk/c/src/subs_mgrs/sqlite/subs_mgr.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/sqlite/subs_mgr.c?rev=827997&r1=827996&r2=827997&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/sqlite/subs_mgr.c (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/sqlite/subs_mgr.c Wed Oct 21 12:56:52 2009
@@ -151,7 +151,7 @@
memset ((void *) subs_mgr_impl, 0, sizeof(savan_sqlite_subs_mgr_t));
- subs_mgr_impl->dbname = axutil_strdup(env, savan_util_get_resource_connection_string(env, conf));
+ subs_mgr_impl->dbname = savan_util_get_resource_connection_string(env, conf);
subs_mgr_impl->conf = conf;
subs_mgr_impl->subs_mgr.ops = &subs_mgr_ops;
Modified: webservices/savan/trunk/c/src/util/savan_util.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/savan_util.c?rev=827997&r1=827996&r2=827997&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/savan_util.c (original)
+++ webservices/savan/trunk/c/src/util/savan_util.c Wed Oct 21 12:56:52 2009
@@ -326,7 +326,7 @@
const axutil_env_t *env,
axis2_conf_t *conf)
{
- axis2_char_t *resource_str = "./savan_db";
+ axis2_char_t *resource_str = NULL;
axis2_module_desc_t *module_desc = NULL;
axutil_qname_t *qname = NULL;
@@ -338,11 +338,26 @@
resource_param = axis2_module_desc_get_param(module_desc, env, SAVAN_RESOURCE);
if(resource_param)
{
- resource_str = (axis2_char_t *) axutil_param_get_value(resource_param, env);
+ resource_str = axutil_strdup(
+ env, (axis2_char_t *) axutil_param_get_value(resource_param, env));
}
}
axutil_qname_free(qname, env);
+ if(!resource_str)
+ {
+ axis2_char_t *home = NULL;
+ home = AXIS2_GETENV("AXIS2C_HOME");
+ if(home)
+ {
+ resource_str = axutil_stracat(env, home, "/savan_db");
+ }
+ else
+ {
+ resource_str = axutil_strdup(env, "./savan_db");
+ }
+ }
+
return resource_str;
}