[riftsaw-commits] riftsaw SVN: r664 - branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple.
Author: jeff.yuchang
Date: 2010-05-25 12:45:03 -0400 (Tue, 25 May 2010)
New Revision: 664
Modified:
branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java
Log:
* update the hsql db to h2.
Modified:
branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
===================================================================
---
branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java 2010-05-25
16:20:16 UTC (rev 663)
+++
branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java 2010-05-25
16:45:03 UTC (rev 664)
@@ -25,7 +25,7 @@
import javax.transaction.TransactionManager;
import org.apache.ode.utils.GUID;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.h2.jdbcx.JdbcDataSource;
/**
@@ -47,8 +47,8 @@
}
protected void initialize(TransactionManager txm) throws Exception {
- jdbcDataSource ds = new jdbcDataSource();
- ds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
+ JdbcDataSource ds = new JdbcDataSource();
+ ds.setURL("jdbc:h2:mem:" + new GUID().toString() +
";DB_CLOSE_DELAY=-1");
ds.setUser("sa");
ds.setPassword("");
_ds = ds;
@@ -64,7 +64,7 @@
public void setup() throws Exception {
Connection c = _ds.getConnection();
try {
- c.createStatement().executeUpdate("CREATE ALIAS MOD FOR
\"org.apache.ode.scheduler.simple.DelegateSupport.mod\";");
+ //c.createStatement().executeUpdate("CREATE ALIAS MOD FOR
\"org.apache.ode.scheduler.simple.DelegateSupport.mod\";");
String sql = "CREATE TABLE \"ODE_JOB\" (\"JOBID\"
CHAR(64) NOT NULL, \"TS\" NUMERIC NOT NULL, \"NODEID\" char(64)
NULL, \"SCHEDULED\" int NOT NULL, \"TRANSACTED\" int NOT NULL,
\"DETAILS\" BINARY(4096) NULL, PRIMARY KEY(\"JOBID\"));";
c.createStatement().executeUpdate(sql);
} finally {
Modified:
branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java
===================================================================
---
branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java 2010-05-25
16:20:16 UTC (rev 663)
+++
branches/ODE/ODE-1.x-jpa/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java 2010-05-25
16:45:03 UTC (rev 664)
@@ -27,7 +27,7 @@
@Override
protected void initialize(TransactionManager txm) throws Exception {
- _ds = createGeronimoDataSource(txm, "jdbc:hsqldb:mem:" + new
GUID().toString(), "org.hsqldb.jdbcDriver", "sa", "");
+ _ds = createGeronimoDataSource(txm, "jdbc:h2:mem:" + new
GUID().toString(), org.h2.Driver.class.getName(), "sa", "");
setup();
_del = new JdbcDelegate(_ds);
}