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 2015/08/03 12:21:22 UTC
[1/5] ode git commit: ODE-1034: HSQLDB upgraded to 2.3.3
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 <sa...@apache.org>
Authored: Mon Aug 3 14:56:07 2015 +0530
Committer: sathwik <sa...@apache.org>
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",
[3/5] ode git commit: ODE-1034: Fixes for some failing testcases
Posted by sa...@apache.org.
ODE-1034: Fixes for some failing testcases
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/31e4d24c
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/31e4d24c
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/31e4d24c
Branch: refs/heads/master
Commit: 31e4d24c037f0a3099263abc9c74b629f219b58b
Parents: c7dcee5
Author: sathwik <sa...@apache.org>
Authored: Mon Aug 3 15:09:55 2015 +0530
Committer: sathwik <sa...@apache.org>
Committed: Mon Aug 3 15:09:55 2015 +0530
----------------------------------------------------------------------
dao-hibernate-db/src/main/sql/simplesched-hsql.sql | 6 +++---
.../java/org/apache/ode/dao/jpa/test/InsertObjectTest.java | 3 +++
.../java/org/apache/ode/dao/jpa/test/SelectObjectTest.java | 3 +++
scheduler-simple/src/test/resources/simplesched-hsql.sql | 6 +++---
4 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/31e4d24c/dao-hibernate-db/src/main/sql/simplesched-hsql.sql
----------------------------------------------------------------------
diff --git a/dao-hibernate-db/src/main/sql/simplesched-hsql.sql b/dao-hibernate-db/src/main/sql/simplesched-hsql.sql
index 1074afc..6ade040 100644
--- a/dao-hibernate-db/src/main/sql/simplesched-hsql.sql
+++ b/dao-hibernate-db/src/main/sql/simplesched-hsql.sql
@@ -5,9 +5,9 @@
--
CREATE TABLE ode_job (
- jobid CHAR(64) NOT NULL DEFAULT '',
+ jobid varchar(64) NOT NULL DEFAULT '',
ts BIGINT NOT NULL DEFAULT 0,
- nodeid char(64),
+ nodeid varchar(64),
scheduled int NOT NULL DEFAULT 0,
transacted int NOT NULL DEFAULT 0,
@@ -20,7 +20,7 @@ CREATE TABLE ode_job (
correlationKeySet varchar(255),
retryCount int,
inMem int,
- detailsExt binary(4096),
+ detailsExt blob(4096),
PRIMARY KEY(jobid));
http://git-wip-us.apache.org/repos/asf/ode/blob/31e4d24c/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 deb8d7a..20798f5 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
@@ -66,6 +66,9 @@ public class InsertObjectTest extends TestCase {
hsqlds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
hsqlds.setUser("sa");
hsqlds.setPassword("");
+ Properties prop = new Properties();
+ prop.setProperty("sql.enforce_size", "false");
+ hsqlds.setProperties(prop);
_ds = hsqlds;
_txm = new EmbeddedGeronimoFactory().getTransactionManager();
http://git-wip-us.apache.org/repos/asf/ode/blob/31e4d24c/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 4cb6b3d..a54eb49 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
@@ -69,6 +69,9 @@ public class SelectObjectTest extends TestCase {
hsqlds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
hsqlds.setUser("sa");
hsqlds.setPassword("");
+ Properties prop = new Properties();
+ prop.setProperty("sql.enforce_size", "false");
+ hsqlds.setProperties(prop);
_ds = hsqlds;
_txm = new EmbeddedGeronimoFactory().getTransactionManager();
http://git-wip-us.apache.org/repos/asf/ode/blob/31e4d24c/scheduler-simple/src/test/resources/simplesched-hsql.sql
----------------------------------------------------------------------
diff --git a/scheduler-simple/src/test/resources/simplesched-hsql.sql b/scheduler-simple/src/test/resources/simplesched-hsql.sql
index 8edaec7..b62a1b4 100644
--- a/scheduler-simple/src/test/resources/simplesched-hsql.sql
+++ b/scheduler-simple/src/test/resources/simplesched-hsql.sql
@@ -1,7 +1,7 @@
CREATE TABLE ode_job (
- jobid CHAR(64) NOT NULL,
+ jobid varchar(64) NOT NULL DEFAULT '',
ts BIGINT NOT NULL,
- nodeid char(64),
+ nodeid varchar(64),
scheduled int NOT NULL,
transacted int NOT NULL,
@@ -14,7 +14,7 @@ CREATE TABLE ode_job (
correlationKeySet varchar(255),
retryCount int,
inMem int,
- detailsExt binary(4096),
+ detailsExt blob(4096),
PRIMARY KEY(jobid));
[4/5] ode git commit: ODE-1035: Added LOB column
Posted by sa...@apache.org.
ODE-1035: Added LOB column
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/122d1790
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/122d1790
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/122d1790
Branch: refs/heads/master
Commit: 122d17904396d9f5f30ad0dad7de1d33d57c9c1b
Parents: 31e4d24
Author: sathwik <sa...@apache.org>
Authored: Mon Aug 3 15:21:41 2015 +0530
Committer: sathwik <sa...@apache.org>
Committed: Mon Aug 3 15:21:41 2015 +0530
----------------------------------------------------------------------
.../main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java | 2 +-
.../java/org/apache/ode/store/jpa/ProcessConfPropertyDaoImpl.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/122d1790/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java
----------------------------------------------------------------------
diff --git a/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java b/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java
index 6816cc2..2aba974 100644
--- a/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java
+++ b/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java
@@ -68,7 +68,7 @@ public class ProcessConfDaoImpl extends HibObj implements ProcessConfDAO {
* @hibernate.map table="STORE_PROCESS_PROP" role="properties_"
* @hibernate.collection-key column="propId" foreign-key="none"
* @hibernate.collection-index column="name" type="string"
- * @hibernate.collection-element column="value" type="string" length="2048"
+ * @hibernate.collection-element column="data" type="text"
*/
public Map<String,String> getProperties_() {
return _properties;
http://git-wip-us.apache.org/repos/asf/ode/blob/122d1790/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfPropertyDaoImpl.java
----------------------------------------------------------------------
diff --git a/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfPropertyDaoImpl.java b/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfPropertyDaoImpl.java
index 08ef39a..60b2cdc 100644
--- a/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfPropertyDaoImpl.java
+++ b/bpel-store/src/main/java/org/apache/ode/store/jpa/ProcessConfPropertyDaoImpl.java
@@ -22,6 +22,7 @@ package org.apache.ode.store.jpa;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.Lob;
import javax.persistence.Table;
/**
@@ -33,7 +34,7 @@ public class ProcessConfPropertyDaoImpl {
@Basic @Column(name="PROP_KEY")
private String _key;
- @Basic @Column(name="PROP_VAL")
+ @Lob @Column(name="DATA")
private String _value;
public String getKey() {
[2/5] ode git commit: ODE-1034: JdbcExternalVariableEngineTest fixed
Posted by sa...@apache.org.
ODE-1034: JdbcExternalVariableEngineTest fixed
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/c7dcee53
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/c7dcee53
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/c7dcee53
Branch: refs/heads/master
Commit: c7dcee5380df56b2e9ca732ec3aa5afda1f0297f
Parents: 74d9490
Author: sathwik <sa...@apache.org>
Authored: Mon Aug 3 15:01:33 2015 +0530
Committer: sathwik <sa...@apache.org>
Committed: Mon Aug 3 15:01:33 2015 +0530
----------------------------------------------------------------------
.../extvar/jdbc/JdbcExternalVariableEngineTest.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/c7dcee53/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 3f7c64a..ee2716e 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
@@ -63,17 +63,22 @@ public class JdbcExternalVariableEngineTest extends TestCase {
_ds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
_ds.setUser("sa");
+ //this is to allow column names to start with underscores.
+ Properties prop = new Properties();
+ prop.setProperty("sql.regular_names", "false");
+ _ds.setProperties(prop);
+
Connection conn = _ds.getConnection();
Statement s = conn.createStatement();
s.execute("create table extvartable1 (" +
- "id1 VARCHAR PRIMARY KEY," +
- "_id2_ VARCHAR," +
- "pid VARCHAR, " +
+ "id1 VARCHAR(255) PRIMARY KEY," +
+ "_id2_ VARCHAR(255)," +
+ "pid VARCHAR(255), " +
"iid INT," +
"cts DATETIME," +
"uts DATETIME," +
- "foo VARCHAR," +
- "bar VARCHAR );");
+ "foo VARCHAR(255)," +
+ "bar VARCHAR(255));");
_engine = new JdbcExternalVariableModule();
_engine.registerDataSource("testds",_ds);
[5/5] ode git commit: fixed missing import
Posted by sa...@apache.org.
fixed missing import
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/88eadd93
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/88eadd93
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/88eadd93
Branch: refs/heads/master
Commit: 88eadd935c8bb04df092d76fe8442346477d9ef3
Parents: 122d179
Author: sathwik <sa...@apache.org>
Authored: Mon Aug 3 15:50:53 2015 +0530
Committer: sathwik <sa...@apache.org>
Committed: Mon Aug 3 15:50:53 2015 +0530
----------------------------------------------------------------------
.../ode/bpel/extvar/jdbc/JdbcExternalVariableEngineTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/88eadd93/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 ee2716e..4bfb2ab 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
@@ -21,7 +21,7 @@ package org.apache.ode.bpel.extvar.jdbc;
import java.sql.Connection;
import java.sql.Statement;
import java.util.ArrayList;
-
+import java.util.Properties;
import javax.xml.namespace.QName;
import junit.framework.TestCase;