You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2014/07/23 19:58:31 UTC
[2/4] git commit: ODE-1015: Added an overloaded constructor to
DbConfStoreConnectionFactory to take in odeconfig properties as done in hib
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/798e58a5
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/798e58a5
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/798e58a5
Branch: refs/heads/master
Commit: 798e58a58c319925e0fa875dbf9aac266c967522
Parents: b49bf46
Author: sathwik <sa...@apache.org>
Authored: Wed Jul 23 23:16:31 2014 +0530
Committer: sathwik <sa...@apache.org>
Committed: Wed Jul 23 23:16:31 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/798e58a5/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 13884e4..b689bd1 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/798e58a5/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..a425a29 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)");