You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by am...@apache.org on 2008/12/04 08:27:41 UTC
svn commit: r723231 -
/webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentStorageManager.java
Author: amilas
Date: Wed Dec 3 23:27:38 2008
New Revision: 723231
URL: http://svn.apache.org/viewvc?rev=723231&view=rev
Log:
Reading the persistence storage parameters from the module parameters as well
Modified:
webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentStorageManager.java
Modified: webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentStorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentStorageManager.java?rev=723231&r1=723230&r2=723231&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentStorageManager.java (original)
+++ webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentStorageManager.java Wed Dec 3 23:27:38 2008
@@ -114,26 +114,28 @@
if (policy.isInOrder()) invoker = new Invoker();
if (policy.isEnableMakeConnection()) pollingManager = new PollingManager();
ModuleConfiguration mc = context.getAxisConfiguration().getModuleConfig("sandesha2");
- Parameter param = mc.getParameter("db.connectionstring");
- if (param != null) {
- dbConnectionString = (String) param.getValue();
- log.debug(param.getName() + "=" + dbConnectionString);
- }
- param = mc.getParameter("db.driver");
- if (param != null) {
- dbDriver = (String) param.getValue();
- log.debug(param.getName() + "=" + dbDriver);
- }
- param = mc.getParameter("db.user");
- if (param != null) {
- dbUser = (String) param.getValue();
- log.debug(param.getName() + "=" + dbUser);
- }
- param = mc.getParameter("db.password");
- if (param != null) {
- dbPassword = (String) param.getValue();
- log.debug(param.getName() + "=" + dbPassword);
- }
+ if (mc != null) {
+ Parameter param = mc.getParameter("db.connectionstring");
+ if (param != null) {
+ dbConnectionString = (String) param.getValue();
+ log.debug(param.getName() + "=" + dbConnectionString);
+ }
+ param = mc.getParameter("db.driver");
+ if (param != null) {
+ dbDriver = (String) param.getValue();
+ log.debug(param.getName() + "=" + dbDriver);
+ }
+ param = mc.getParameter("db.user");
+ if (param != null) {
+ dbUser = (String) param.getValue();
+ log.debug(param.getName() + "=" + dbUser);
+ }
+ param = mc.getParameter("db.password");
+ if (param != null) {
+ dbPassword = (String) param.getValue();
+ log.debug(param.getName() + "=" + dbPassword);
+ }
+ }
}
public void shutdown() {
@@ -208,9 +210,32 @@
public void initStorage(AxisModule moduleDesc)
throws SandeshaStorageException {
log.info("init PersistentStorageManager");
- if (dbConnectionString == null || dbDriver == null)
+ if (dbConnectionString == null){
+ if (moduleDesc.getParameter("db.connectionstring") != null){
+ dbConnectionString = (String) moduleDesc.getParameter("db.connectionstring").getValue();
+ }
+ }
+
+ if (dbDriver == null){
+ if (moduleDesc.getParameter("db.driver") != null){
+ dbDriver = (String) moduleDesc.getParameter("db.driver").getValue();
+ }
+ }
+
+ if (dbUser == null){
+ if (moduleDesc.getParameter("db.user") != null){
+ dbUser = (String) moduleDesc.getParameter("db.user").getValue();
+ }
+ }
+
+ if (dbPassword == null){
+ if (moduleDesc.getParameter("db.password") != null){
+ dbPassword = (String) moduleDesc.getParameter("db.password").getValue();
+ }
+ }
+ if (dbConnectionString == null || dbDriver == null)
throw new SandeshaStorageException("Can't proceed. Needed properties are not set.");
-
+
dbConnection = dbConnect();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org