Author: jeff.yuchang Date: 2010-10-20 23:35:56 -0400 (Wed, 20 Oct 2010) New Revision: 1048 Modified: trunk/distribution/src/main/release/db/bpel.properties trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql Log: * RIFTSAW-291, RIFTSAW-292, update ODE_JOB's schema a bit. * using JPA based simple scheduler by default. Modified: trunk/distribution/src/main/release/db/bpel.properties =================================================================== --- trunk/distribution/src/main/release/db/bpel.properties 2010-10-21 03:29:59 UTC (rev 1047) +++ trunk/distribution/src/main/release/db/bpel.properties 2010-10-21 03:35:56 UTC (rev 1048) @@ -56,7 +56,7 @@ bpel.dao.factory=org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl bpel.dao.factory.store=org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl -bpel.dao.factory.scheduler=org.apache.ode.scheduler.simple.jdbc.SchedulerDAOConnectionFactoryImpl +bpel.dao.factory.scheduler=org.apache.ode.dao.jpa.hibernate.SchedulerDAOConnectionFactoryImpl ## Transaction Factory ## default is org.apache.ode.il.EmbeddedGeronimoFactory Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql 2010-10-21 03:29:59 UTC (rev 1047) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql 2010-10-21 03:35:56 UTC (rev 1048) @@ -1,13 +1,13 @@ create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (6); +insert into ODE_SCHEMA_VERSION values (220); CREATE TABLE ODE_JOB ( - jobid CHAR(64) NOT NULL DEFAULT '', - ts BIGINT NOT NULL DEFAULT 0, - nodeid char(64), - scheduled int NOT NULL DEFAULT 0, - transacted int NOT NULL DEFAULT 0, + jobid varchar(64) NOT NULL, + ts BIGINT NOT NULL, + nodeid varchar(64), + scheduled smallint NOT NULL, + transacted smallint NOT NULL, instanceId BIGINT, mexId varchar(255), @@ -16,8 +16,8 @@ channel varchar(255), correlatorId varchar(255), correlationKeySet varchar(255), - retryCount int, - inMem int, + retryCount integer, + inMem smallint, detailsExt blob(4096), PRIMARY KEY(jobid)); Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-10-21 03:29:59 UTC (rev 1047) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-10-21 03:35:56 UTC (rev 1048) @@ -1,12 +1,12 @@ create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (6); +insert into ODE_SCHEMA_VERSION values (220); CREATE TABLE ODE_JOB ( - jobid CHAR(64) NOT NULL DEFAULT '', - ts BIGINT NOT NULL DEFAULT 0, - nodeid char(64), - scheduled int NOT NULL DEFAULT 0, - transacted int NOT NULL DEFAULT 0, + jobid varchar(64) not null, + ts BIGINT NOT NULL, + nodeid varchar(64), + scheduled boolean NOT NULL DEFAULT 0, + transacted boolean NOT NULL DEFAULT 0, instanceId BIGINT, mexId varchar(255), @@ -15,8 +15,8 @@ channel varchar(255), correlatorId varchar(255), correlationKeySet varchar(255), - retryCount int, - inMem int, + retryCount integer, + inMem boolean, detailsExt varbinary, PRIMARY KEY(jobid)); Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-10-21 03:29:59 UTC (rev 1047) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-10-21 03:35:56 UTC (rev 1048) @@ -1,14 +1,14 @@ create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (6); +insert into ODE_SCHEMA_VERSION values (220); DROP TABLE IF EXISTS ODE_JOB; CREATE TABLE ODE_JOB ( jobid CHAR(64) NOT NULL DEFAULT '', ts BIGINT NOT NULL DEFAULT 0, - nodeid char(64) NULL, - scheduled int NOT NULL DEFAULT 0, - transacted int NOT NULL DEFAULT 0, + nodeid varchar(64), + scheduled bit NOT NULL, + transacted bit NOT NULL, instanceId BIGINT, mexId varchar(255), @@ -17,9 +17,9 @@ channel varchar(255), correlatorId varchar(255), correlationKeySet varchar(255), - retryCount int, - inMem int, - detailsExt blob(4096), + retryCount integer, + inMem bit, + detailsExt blob, PRIMARY KEY(jobid), INDEX IDX_ODE_JOB_TS(ts), Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-10-21 03:29:59 UTC (rev 1047) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-10-21 03:35:56 UTC (rev 1048) @@ -1,23 +1,23 @@ create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (6); +insert into ODE_SCHEMA_VERSION values (220); CREATE TABLE ODE_JOB ( - jobid VARCHAR(64) NOT NULL, - ts number(37) NOT NULL, - nodeid varchar(64), - scheduled int NOT NULL, - transacted int NOT NULL, + jobid VARCHAR2(64) NOT NULL, + ts number(19,0) NOT NULL, + nodeid varchar2(64), + scheduled number(1,0) NOT NULL, + transacted number(1,0) NOT NULL, instanceId number(37), mexId varchar(255), - processId varchar(255), - type varchar(255), - channel varchar(255), - correlatorId varchar(255), - correlationKeySet varchar(255), - retryCount int, - inMem int, + processId varchar2(255), + type varchar2(255), + channel varchar2(255), + correlatorId varchar2(255), + correlationKeySet varchar2(255), + retryCount number(10,0), + inMem number(1,0), detailsExt blob, PRIMARY KEY(jobid)); Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-10-21 03:29:59 UTC (rev 1047) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-10-21 03:35:56 UTC (rev 1048) @@ -1,27 +1,27 @@ create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (6); +insert into ODE_SCHEMA_VERSION values (220); -CREATE TABLE ODE_JOB ( - jobid CHAR(64) NOT NULL DEFAULT '', - ts BIGINT NOT NULL DEFAULT 0, - nodeid char(64), - scheduled int NOT NULL DEFAULT 0, - transacted int NOT NULL DEFAULT 0, + create table ODE_JOB ( + jobid varchar(64) not null, + ts int8 not null, + nodeid varchar(64), + scheduled bool not null, + transacted bool not null, + instanceId int8, + mexId varchar(255), + processId varchar(255), + type varchar(255), + channel varchar(255), + correlatorId varchar(255), + correlationKeySet varchar(255), + retryCount int4, + inMem bool, + detailsExt oid, - instanceId BIGINT, - mexId varchar(255), - processId varchar(255), - type varchar(255), - channel varchar(255), - correlatorId varchar(255), - correlationKeySet varchar(255), - retryCount int, - inMem int, - detailsExt bytea, + primary key (jobid) + ); - PRIMARY KEY(jobid)); - CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql 2010-10-21 03:29:59 UTC (rev 1047) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/sqlserver.sql 2010-10-21 03:35:56 UTC (rev 1048) @@ -1,23 +1,23 @@ create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (6); +insert into ODE_SCHEMA_VERSION values (220); CREATE TABLE ODE_JOB ( - jobid CHAR(64) NOT NULL DEFAULT '', - ts BIGINT NOT NULL DEFAULT 0, - nodeid char(64), - scheduled int NOT NULL DEFAULT 0, - transacted int NOT NULL DEFAULT 0, + jobid varchar(64) NOT NULL, + ts numeric(19,0) NOT NULL, + nodeid varchar(64) null, + scheduled tinyint NOT NULL, + transacted tinyint NOT NULL, - instanceId BIGINT, - mexId varchar(255), - processId varchar(255), - type varchar(255), - channel varchar(255), - correlatorId varchar(255), - correlationKeySet varchar(255), - retryCount int, - inMem int, + instanceId numeric(19,0) null, + mexId varchar(255) null, + processId varchar(255) null, + type varchar(255) null, + channel varchar(255) null, + correlatorId varchar(255) null, + correlationKeySet varchar(255) null, + retryCount int null, + inMem tinyint null, detailsExt image null, PRIMARY KEY(jobid));