Repository: ode Updated Branches: refs/heads/ode-1.3.x ef8879bb0 -> c5c72831c
ODE-1015: Added an overloaded constructor to DbConfStoreConnectionFactory to take in odeconfig properties as done in hib Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/760ecf9a Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/760ecf9a Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/760ecf9a Branch: refs/heads/ode-1.3.x Commit: 760ecf9a52d54da0bb9ff50a9207150011b7279e Parents: ef8879b Author: sathwik <[email protected]> Authored: Wed Jul 23 21:01:51 2014 +0530 Committer: sathwik <[email protected]> Committed: Wed Jul 23 21:01:51 2014 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/ode/store/ProcessStoreImpl.java | 4 ++-- .../apache/ode/store/jpa/DbConfStoreConnectionFactory.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/760ecf9a/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java b/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java index 795037e..9061cbd 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java +++ b/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java @@ -113,7 +113,7 @@ public class ProcessStoreImpl implements ProcessStore { if (persistenceType.toLowerCase().indexOf("hib") != -1) { _cf = new org.apache.ode.store.hib.DbConfStoreConnectionFactory(ds, props.getProperties(), createDatamodel, props.getTxFactoryClass()); } else { - _cf = new org.apache.ode.store.jpa.DbConfStoreConnectionFactory(ds, createDatamodel, props.getTxFactoryClass()); + _cf = new org.apache.ode.store.jpa.DbConfStoreConnectionFactory(ds, props.getProperties(), createDatamodel, props.getTxFactoryClass()); } } else { // If the datasource is not provided, then we create a HSQL-based @@ -122,7 +122,7 @@ public class ProcessStoreImpl implements ProcessStore { if ("hibernate".equalsIgnoreCase(persistenceType)) { _cf = new org.apache.ode.store.hib.DbConfStoreConnectionFactory(hsqlds, props.getProperties(), createDatamodel, props.getTxFactoryClass()); } else { - _cf = new org.apache.ode.store.jpa.DbConfStoreConnectionFactory(hsqlds, createDatamodel, props.getTxFactoryClass()); + _cf = new org.apache.ode.store.jpa.DbConfStoreConnectionFactory(hsqlds, props.getProperties(), createDatamodel, props.getTxFactoryClass()); } _inMemDs = hsqlds; } http://git-wip-us.apache.org/repos/asf/ode/blob/760ecf9a/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java b/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java index 8588236..339690f 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java +++ b/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java @@ -31,6 +31,7 @@ import javax.sql.DataSource; import javax.transaction.TransactionManager; import java.util.HashMap; +import java.util.Properties; /** * @author Matthieu Riou <mriou at apache dot org> @@ -45,6 +46,10 @@ public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory @SuppressWarnings("unchecked") public DbConfStoreConnectionFactory(DataSource ds, boolean createDatamodel, String txFactoryClassName) { + this(ds,new Properties(),createDatamodel,txFactoryClassName); + } + + public DbConfStoreConnectionFactory(DataSource ds, Properties initialProps, boolean createDatamodel, String txFactoryClassName) { _ds = ds; initTxMgr(txFactoryClassName); @@ -55,7 +60,7 @@ public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory propMap.put("openjpa.ConnectionFactoryMode", "managed"); propMap.put("openjpa.FlushBeforeQueries", "false"); propMap.put("openjpa.FetchBatchSize", 1000); - //propMap.put("openjpa.jdbc.TransactionIsolation", "read-committed"); + propMap.put("openjpa.jdbc.TransactionIsolation", "read-committed"); propMap.put("javax.persistence.provider", "org.apache.openjpa.persistence.PersistenceProviderImpl"); if (createDatamodel) propMap.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=false)");
