Author: jeff.yuchang Date: 2010-08-19 23:11:46 -0400 (Thu, 19 Aug 2010) New Revision: 914 Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/build.xml branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java Log: * RIFTSAW-269, Add DB2 scripts. Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/build.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/build.xml 2010-08-19 07:40:54 UTC (rev 913) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/build.xml 2010-08-20 03:11:46 UTC (rev 914) @@ -33,7 +33,7 @@ <mkdir dir="target/db" /> <mkdir dir="${db.scripts.dir}" /> - <create-ddl db="postgres"/> + <create-ddl db="db2"/> </target> Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties (rev 0) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/files/hibernate.cfg/db2.properties 2010-08-20 03:11:46 UTC (rev 914) @@ -0,0 +1 @@ +dialect=org.hibernate.dialect.DB2Dialect \ No newline at end of file Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-08-19 07:40:54 UTC (rev 913) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-08-20 03:11:46 UTC (rev 914) @@ -47,7 +47,7 @@ <properties> <property name="hibernate.show_sql" value="false" /> - <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.DB2Dialect" /> <property name="hibernate.connection.datasource" value="java:BPELDB" /> <property name="hibernate.transaction.factory_class" value="org.hibernate.transaction.JTATransactionFactory" /> <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" /> Added: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql (rev 0) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/src/main/scripts/simplesched-db2.sql 2010-08-20 03:11:46 UTC (rev 914) @@ -0,0 +1,30 @@ +-- Apache ODE - SimpleScheduler Database Schema +-- +-- Apache Derby scripts by Maciej Szefler. +-- +-- + +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, + + 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 blob(1073741823) NULL, + + PRIMARY KEY(jobid)); + +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); + + Modified: branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java 2010-08-19 07:40:54 UTC (rev 913) +++ branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java 2010-08-20 03:11:46 UTC (rev 914) @@ -155,7 +155,7 @@ _immediateTransactionRetryLimit = getIntProperty(conf, "ode.scheduler.immediateTransactionRetryLimit", _immediateTransactionRetryLimit); _immediateTransactionRetryInterval = getLongProperty(conf, "ode.scheduler.immediateTransactionRetryInterval", _immediateTransactionRetryInterval); - _todo = new SchedulerThread(this); + _todo = new SchedulerThread(this); } public void setPollIntervalForPolledRunnable(long pollIntervalForPolledRunnable) { @@ -313,7 +313,9 @@ } while( immediateRetryCount-- > 0 ); } finally { // 0 restores the default value - _txm.setTransactionTimeout(0); + if (_txm != null) { + _txm.setTransactionTimeout(0); + } } throw ex; @@ -915,3 +917,5 @@ } } } + + \ No newline at end of file