Repository: ode Updated Branches: refs/heads/master 27a3ec105 -> 88eadd935
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/74d94903 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/74d94903 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/74d94903 Branch: refs/heads/master Commit: 74d9490384ee1a487df3e1e0d0edbba9879bbbe7 Parents: 27a3ec1 Author: sathwik <[email protected]> Authored: Mon Aug 3 14:56:07 2015 +0530 Committer: sathwik <[email protected]> Committed: Mon Aug 3 14:56:07 2015 +0530 ---------------------------------------------------------------------- .../ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java | 6 +++--- .../src/main/java/org/apache/ode/store/ProcessStoreImpl.java | 4 ++-- .../java/org/apache/ode/dao/jpa/test/InsertObjectTest.java | 4 ++-- .../java/org/apache/ode/dao/jpa/test/SelectObjectTest.java | 4 ++-- dependencies.rb | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/74d94903/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 e5a9992..3f7c64a 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/74d94903/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 2547088..5043d73 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; @@ -857,7 +857,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/74d94903/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 6fc25e3..deb8d7a 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/74d94903/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 e17995f..4cb6b3d 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/74d94903/dependencies.rb ---------------------------------------------------------------------- diff --git a/dependencies.rb b/dependencies.rb index 23781df..0857cf1 100644 --- a/dependencies.rb +++ b/dependencies.rb @@ -77,7 +77,7 @@ GERONIMO = struct( ) HIBERNATE = [ "org.hibernate:hibernate-core:jar:3.3.2.GA", "javassist:javassist:jar:3.9.0.GA", "antlr:antlr:jar:2.7.6", "asm:asm:jar:3.3.1", "cglib:cglib:jar:2.2", "net.sf.ehcache:ehcache:jar:1.2.3" ] -HSQLDB = "hsqldb:hsqldb:jar:1.8.0.7" +HSQLDB = "org.hsqldb:hsqldb:jar:2.3.3" JACKSON = [ "com.fasterxml.jackson.core:jackson-core:jar:2.4.0", "com.fasterxml.jackson.core:jackson-databind:jar:2.4.0", "com.fasterxml.jackson.core:jackson-annotations:jar:2.4.0",
