Repository: ode Updated Branches: refs/heads/ode-1.3.x bb4789156 -> c05b82f79
ODE-1034: HSQLDB upgraded to 2.3.3 Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/c05b82f7 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/c05b82f7 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/c05b82f7 Branch: refs/heads/ode-1.3.x Commit: c05b82f79a28df4069130a24cb0673bf36754ba1 Parents: bb47891 Author: sathwik <[email protected]> Authored: Mon Jul 27 14:34:37 2015 +0530 Committer: sathwik <[email protected]> Committed: Mon Jul 27 14:34:37 2015 +0530 ---------------------------------------------------------------------- .../ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java | 6 +++--- .../src/main/java/org/apache/ode/store/ProcessStoreImpl.java | 4 ++-- bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java | 6 +++--- .../java/org/apache/ode/dao/jpa/test/InsertObjectTest.java | 4 ++-- .../java/org/apache/ode/dao/jpa/test/SelectObjectTest.java | 4 ++-- dependencies.rb | 2 +- .../java/org/apache/ode/scheduler/simple/DelegateSupport.java | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/c05b82f7/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java ---------------------------------------------------------------------- diff --git a/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java b/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java index da364c5..7708099 100644 --- a/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java +++ b/bpel-runtime/src/test/java/org/apache/ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java @@ -32,7 +32,7 @@ import org.apache.ode.utils.DOMUtils; import org.apache.ode.utils.GUID; import org.apache.ode.bpel.evar.ExternalVariableModule.Locator; import org.apache.ode.bpel.evar.ExternalVariableModule.Value; -import org.hsqldb.jdbc.jdbcDataSource; +import org.hsqldb.jdbc.JDBCDataSource; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -54,12 +54,12 @@ public class JdbcExternalVariableEngineTest extends TestCase { final QName _varType = new QName("foo", "foobar"); ExternalVariableConf _econf; - jdbcDataSource _ds; + JDBCDataSource _ds; JdbcExternalVariableModule _engine; Element _el1; public void setUp() throws Exception { - _ds = new org.hsqldb.jdbc.jdbcDataSource(); + _ds = new org.hsqldb.jdbc.JDBCDataSource(); _ds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString()); _ds.setUser("sa"); http://git-wip-us.apache.org/repos/asf/ode/blob/c05b82f7/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 138336c..4c1670a 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 @@ -29,7 +29,7 @@ import org.apache.ode.store.DeploymentUnitDir.CBPInfo; import org.apache.ode.utils.DOMUtils; import org.apache.ode.utils.GUID; import org.apache.ode.utils.msg.MessageBundle; -import org.hsqldb.jdbc.jdbcDataSource; +import org.hsqldb.jdbc.JDBCDataSource; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -861,7 +861,7 @@ public class ProcessStoreImpl implements ProcessStore { } public static DataSource createInternalDS(String guid) { - jdbcDataSource hsqlds = new jdbcDataSource(); + JDBCDataSource hsqlds = new JDBCDataSource(); hsqlds.setDatabase("jdbc:hsqldb:mem:" + guid); hsqlds.setUser("sa"); hsqlds.setPassword(""); http://git-wip-us.apache.org/repos/asf/ode/blob/c05b82f7/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java b/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java index fbfe721..57de78c 100644 --- a/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java +++ b/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java @@ -25,17 +25,17 @@ import org.apache.ode.store.ConfStoreConnection; import org.apache.ode.store.ConfStoreConnectionFactory; import org.apache.ode.store.DeploymentUnitDAO; import org.apache.ode.store.ProcessConfDAO; -import org.hsqldb.jdbc.jdbcDataSource; +import org.hsqldb.jdbc.JDBCDataSource; import java.util.Properties; import javax.xml.namespace.QName; public class DaoTest extends TestCase { - jdbcDataSource hsqlds; + JDBCDataSource hsqlds; ConfStoreConnectionFactory cf; public void setUp() throws Exception { - hsqlds = new jdbcDataSource(); + hsqlds = new JDBCDataSource(); hsqlds.setDatabase("jdbc:hsqldb:mem:test"); hsqlds.setUser("sa"); hsqlds.setPassword(""); http://git-wip-us.apache.org/repos/asf/ode/blob/c05b82f7/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java ---------------------------------------------------------------------- diff --git a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java index 1b98cbd..2552abd 100644 --- a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java +++ b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java @@ -37,7 +37,7 @@ import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl; import org.apache.ode.il.EmbeddedGeronimoFactory; import org.apache.ode.utils.DOMUtils; import org.apache.ode.utils.GUID; -import org.hsqldb.jdbc.jdbcDataSource; +import org.hsqldb.jdbc.JDBCDataSource; import org.xml.sax.SAXException; import javax.sql.DataSource; @@ -62,7 +62,7 @@ public class InsertObjectTest extends TestCase { @Override protected void setUp() throws Exception { - jdbcDataSource hsqlds = new jdbcDataSource(); + JDBCDataSource hsqlds = new JDBCDataSource(); hsqlds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString()); hsqlds.setUser("sa"); hsqlds.setPassword(""); http://git-wip-us.apache.org/repos/asf/ode/blob/c05b82f7/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java ---------------------------------------------------------------------- diff --git a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java index 477af4a..38e5bf9 100644 --- a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java +++ b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java @@ -39,7 +39,7 @@ import org.apache.ode.bpel.dao.XmlDataDAO; import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl; import org.apache.ode.il.EmbeddedGeronimoFactory; import org.apache.ode.utils.GUID; -import org.hsqldb.jdbc.jdbcDataSource; +import org.hsqldb.jdbc.JDBCDataSource; import javax.persistence.EntityManager; import javax.sql.DataSource; @@ -65,7 +65,7 @@ public class SelectObjectTest extends TestCase { @Override protected void setUp() throws Exception { - jdbcDataSource hsqlds = new jdbcDataSource(); + JDBCDataSource hsqlds = new JDBCDataSource(); hsqlds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString()); hsqlds.setUser("sa"); hsqlds.setPassword(""); http://git-wip-us.apache.org/repos/asf/ode/blob/c05b82f7/dependencies.rb ---------------------------------------------------------------------- diff --git a/dependencies.rb b/dependencies.rb index c0b190c..abf3410 100644 --- a/dependencies.rb +++ b/dependencies.rb @@ -77,7 +77,7 @@ GERONIMO = struct( ) HIBERNATE = [ "org.hibernate:hibernate:jar:3.2.5.ga", "asm:asm:jar:1.5.3", "antlr:antlr:jar:2.7.6", "cglib:cglib:jar:2.1_3", "net.sf.ehcache:ehcache:jar:1.2.3" ] -HSQLDB = "hsqldb:hsqldb:jar:1.8.0.7" +HSQLDB = "org.hsqldb:hsqldb:jar:2.3.3" JAVAX = struct( :activation =>"javax.activation:activation:jar:1.1", #:activation =>"geronimo-spec:geronimo-spec-activation:jar:1.0.2-rc4", http://git-wip-us.apache.org/repos/asf/ode/blob/c05b82f7/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java ---------------------------------------------------------------------- diff --git a/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java b/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java index 66e4977..91359a5 100644 --- a/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java +++ b/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java @@ -26,7 +26,7 @@ import javax.sql.DataSource; import javax.transaction.TransactionManager; import org.apache.ode.utils.GUID; -import org.hsqldb.jdbc.jdbcDataSource; +import org.hsqldb.jdbc.JDBCDataSource; /** @@ -48,7 +48,7 @@ public class DelegateSupport { } protected void initialize(TransactionManager txm) throws Exception { - jdbcDataSource ds = new jdbcDataSource(); + JDBCDataSource ds = new JDBCDataSource(); ds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString()); ds.setUser("sa"); ds.setPassword("");
