Repository: ode Updated Branches: refs/heads/master 137429a43 -> fb731a748
ODE-666: Rectified to pickup conf for H2 Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/fb731a74 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/fb731a74 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/fb731a74 Branch: refs/heads/master Commit: fb731a748e4c86496c8f2084f8f47bada96f556b Parents: 137429a Author: sathwik <[email protected]> Authored: Sat Aug 8 15:50:57 2015 +0530 Committer: sathwik <[email protected]> Committed: Sat Aug 8 15:50:57 2015 +0530 ---------------------------------------------------------------------- axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java | 2 +- axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties | 4 +++- .../src/main/java/org/apache/ode/il/dbutil/H2EmbeddedDB.java | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/fb731a74/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java b/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java index 4fe655d..a718462 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java @@ -162,7 +162,7 @@ public abstract class Axis2TestBase { String odeRootAbsolutePath = getClass().getClassLoader().getResource("webapp/WEB-INF").getFile(); String axis2RepoAbsolutePath = getClass().getClassLoader().getResource(axis2RepoDir).getFile(); String axis2ConfAbsolutePath = axis2ConfLocation == null ? null : getClass().getClassLoader().getResource(axis2ConfLocation).getFile(); - ODEConfigProperties config = new ODEConfigProperties(new File(System.getProperty("org.apache.ode.configDir", odeRootAbsolutePath + "/conf.hib-derby"))); + ODEConfigProperties config = new ODEConfigProperties(new File(System.getProperty("org.apache.ode.configDir", odeRootAbsolutePath + "/conf"))); config.load(); server = new ODEAxis2Server(odeRootAbsolutePath, axis2RepoAbsolutePath, axis2ConfAbsolutePath, getTestPort(0), config); server.txMgrCreatedCallback = new Runnable() { http://git-wip-us.apache.org/repos/asf/ode/blob/fb731a74/axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties b/axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties index e12b199..0a59324 100644 --- a/axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties +++ b/axis2-war/src/test/webapp/WEB-INF/conf/ode-axis2.properties @@ -16,9 +16,11 @@ # ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.HibDaoConnectionFactoryImpl -#ode-axis2.db.mode=INTERNAL +ode-axis2.db.mode=EMBEDDED #ode-axis2.db.int.jdbcurl=jdbc:h2:file:axis2-war/target/test/classes/webapp/WEB-INF/h2-hibdb/ode-hib-h2;DB_CLOSE_ON_EXIT=false;user=sa;TRACE_LEVEL_FILE=3 #ode-axis2.db.int.driver=org.h2.Driver +ode-axis2.db.emb.type=H2 +ode-axis2.db.emb.name=h2-hibdb/ode-hib-h2 ode-axis2.cluster.localRoute.targets=http://doesntexist:8080/ode/processes/ ode-axis2.cluster.localRoute.base=http://localhost:8888/ode/processes/ ode-axis2.event.listeners=org.apache.ode.bpel.common.evt.DebugBpelEventListener http://git-wip-us.apache.org/repos/asf/ode/blob/fb731a74/bpel-epr/src/main/java/org/apache/ode/il/dbutil/H2EmbeddedDB.java ---------------------------------------------------------------------- diff --git a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/H2EmbeddedDB.java b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/H2EmbeddedDB.java index fea740d..e75cdcc 100644 --- a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/H2EmbeddedDB.java +++ b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/H2EmbeddedDB.java @@ -35,7 +35,7 @@ public class H2EmbeddedDB extends InternalDB { } /** - * Initialize embedded (DERBY) database. + * Initialize embedded (H2) database. */ @Override protected void initDataSource() throws DatabaseConfigException { @@ -47,7 +47,7 @@ public class H2EmbeddedDB extends InternalDB { hds.setUser("sa"); _datasource = hds; } else { - _dbUrl = "jdbc:h2:" + _workRoot + File.separator + db; + _dbUrl = "jdbc:h2:" + _workRoot + File.separator + db + ";DB_CLOSE_ON_EXIT=FALSE"; if (!_odeConfig.isDbEmbeddedCreate()) { _dbUrl += ";IFEXISTS=TRUE"; }
