svn commit: r661525 - in /ode/branches/APACHE_ODE_1.1: bpel-epr/src/main/java/org/apache/ode/il/config/ bpel-store/src/main/java/org/apache/ode/store/hib/ dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/

[mriou]

Author: mriou
Date: Thu May 29 16:30:30 2008
New Revision: 661525

URL: http://svn.apache.org/viewvc?rev=661525&view=rev
Log:
Configuration properties weren't properly passed to DAOs config.

Modified:
    
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
    
ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
    
ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java

Modified: 
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java?rev=661525&r1=661524&r2=661525&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
 Thu May 29 16:30:30 2008
@@ -152,7 +152,7 @@
             throw new FileNotFoundException("" + _cfgFile);
         }
         for (Object key : _props.keySet()) {
-               String value = (String) _props.get(key);
+            String value = (String) _props.get(key);
                value = SystemUtils.replaceSystemProperties(value);
                _props.put(key, value);
         }

Modified: 
ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java?rev=661525&r1=661524&r2=661525&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
 Thu May 29 16:30:30 2008
@@ -82,7 +82,10 @@
         _ds = ds;
 
         // Don't want to pollute original properties
-        Properties properties = new Properties(initialProps);
+        Properties properties = new Properties();
+        for (Object prop : initialProps.keySet()) {
+            properties.put(prop, initialProps.get(prop));
+        }
 
         __log.debug("using data source: " + ds);
         _dataSources.put(_guid, ds);

Modified: 
ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java?rev=661525&r1=661524&r2=661525&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.1/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
 Thu May 29 16:30:30 2008
@@ -83,7 +83,10 @@
 
         if (initialProps == null) initialProps = new Properties();
         // Don't want to pollute original properties
-        Properties properties = new Properties(initialProps);
+        Properties properties = new Properties();
+        for (Object prop : initialProps.keySet()) {
+            properties.put(prop, initialProps.get(prop));
+        }
 
         // Note that we don't allow the following properties to be overriden by
         // the client.