May 2010 - riftsaw-commits - Jboss List Archives

Hudson build became unstable: RiftSaw-postgres #117

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-postgres/117/changes>

14 years, 6 months

1
6
0 / 0

Hudson build became unstable: Riftsaw-soa-p #38

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/Riftsaw-soa-p/38/changes>

14 years, 6 months

1
3
0 / 0

Hudson build became unstable: RiftSaw #184

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/RiftSaw/184/changes>

14 years, 6 months

1
13
0 / 0

RiftSaw-mysql - Build # 105 - Failure!

by jboss-qa-internal＠redhat.com

RiftSaw-mysql Build number 105 status: Failure Details available at http://hudson.jboss.org/hudson/job/RiftSaw-mysql/105/

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r687 - trunk/distribution/src/main/release/db/sql.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-05-31 08:23:39 -0400 (Mon, 31 May 2010) New Revision: 687 Modified: trunk/distribution/src/main/release/db/sql/mysql.drop.sql trunk/distribution/src/main/release/db/sql/oracle.drop.sql trunk/distribution/src/main/release/db/sql/postgres.drop.sql trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql Log: * update the drop sqls for DB. Modified: trunk/distribution/src/main/release/db/sql/mysql.drop.sql =================================================================== --- trunk/distribution/src/main/release/db/sql/mysql.drop.sql 2010-05-31 10:38:38 UTC (rev 686) +++ trunk/distribution/src/main/release/db/sql/mysql.drop.sql 2010-05-31 12:23:39 UTC (rev 687) @@ -1,27 +1,28 @@ drop table ODE_SCHEMA_VERSION; drop table ODE_JOB; -drop table BPEL_ACTIVITY_RECOVERY; -drop table BPEL_CORRELATION_PROP; -drop table BPEL_CORRELATION_SET; -drop table BPEL_CORRELATOR; -drop table BPEL_CORRELATOR_MESSAGE_CKEY; -drop table BPEL_EVENT; -drop table BPEL_FAULT; -drop table BPEL_INSTANCE; -drop table BPEL_MESSAGE; -drop table BPEL_MEX_PROPS; -drop table BPEL_PLINK_VAL; -drop table BPEL_PROCESS; -drop table BPEL_SCOPE; -drop table BPEL_SELECTORS; -drop table BPEL_UNMATCHED; -drop table BPEL_XML_DATA; -drop table VAR_PROPERTY; + +drop table ODE_ACTIVITY_RECOVERY; +drop table ODE_CORRELATION_SET; +drop table ODE_CORRELATOR; +drop table ODE_CORSET_PROP; +drop table ODE_EVENT; +drop table ODE_FAULT; +drop table ODE_MESSAGE; +drop table ODE_MESSAGE_EXCHANGE; +drop table ODE_MESSAGE_ROUTE; +drop table ODE_MEX_PROP; +drop table ODE_PARTNER_LINK; +drop table ODE_PROCESS; +drop table ODE_PROCESS_INSTANCE; +drop table ODE_SCOPE; +drop table ODE_XML_DATA; +drop table ODE_XML_DATA_PROP; drop table STORE_DU; drop table STORE_PROCESS; drop table STORE_PROCESS_PROP; +drop table STORE_PROC_TO_PROP; drop table STORE_VERSIONS; -drop table BPEL_MESSAGE_EXCHANGE; + Modified: trunk/distribution/src/main/release/db/sql/oracle.drop.sql =================================================================== --- trunk/distribution/src/main/release/db/sql/oracle.drop.sql 2010-05-31 10:38:38 UTC (rev 686) +++ trunk/distribution/src/main/release/db/sql/oracle.drop.sql 2010-05-31 12:23:39 UTC (rev 687) @@ -1,29 +1,30 @@ drop table ODE_SCHEMA_VERSION; drop table ODE_JOB; -drop table BPEL_ACTIVITY_RECOVERY; -drop table BPEL_CORRELATION_PROP; -drop table BPEL_CORRELATION_SET; -drop table BPEL_CORRELATOR; -drop table BPEL_CORRELATOR_MESSAGE_CKEY; -drop table BPEL_EVENT; -drop table BPEL_FAULT; -drop table BPEL_INSTANCE; -drop table BPEL_MESSAGE; -drop table BPEL_MEX_PROPS; -drop table BPEL_PLINK_VAL; -drop table BPEL_PROCESS; -drop table BPEL_SCOPE; -drop table BPEL_SELECTORS; -drop table BPEL_UNMATCHED; -drop table BPEL_XML_DATA; -drop table VAR_PROPERTY; -drop sequence hibernate_seqhilo; + +drop table ODE_ACTIVITY_RECOVERY; +drop table ODE_CORRELATION_SET; +drop table ODE_CORRELATOR; +drop table ODE_CORSET_PROP; +drop table ODE_EVENT; +drop table ODE_FAULT; +drop table ODE_MESSAGE; +drop table ODE_MESSAGE_EXCHANGE; +drop table ODE_MESSAGE_ROUTE; +drop table ODE_MEX_PROP; +drop table ODE_PARTNER_LINK; +drop table ODE_PROCESS; +drop table ODE_PROCESS_INSTANCE; +drop table ODE_SCOPE; +drop table ODE_XML_DATA; +drop table ODE_XML_DATA_PROP; drop table STORE_DU; drop table STORE_PROCESS; drop table STORE_PROCESS_PROP; +drop table STORE_PROC_TO_PROP; drop table STORE_VERSIONS; -drop table BPEL_MESSAGE_EXCHANGE; +drop sequence hibernate_sequence; + Modified: trunk/distribution/src/main/release/db/sql/postgres.drop.sql =================================================================== --- trunk/distribution/src/main/release/db/sql/postgres.drop.sql 2010-05-31 10:38:38 UTC (rev 686) +++ trunk/distribution/src/main/release/db/sql/postgres.drop.sql 2010-05-31 12:23:39 UTC (rev 687) @@ -1,26 +1,27 @@ drop table ODE_SCHEMA_VERSION; drop table ODE_JOB; -drop table BPEL_ACTIVITY_RECOVERY; -drop table BPEL_CORRELATION_PROP; -drop table BPEL_CORRELATION_SET; -drop table BPEL_CORRELATOR; -drop table BPEL_CORRELATOR_MESSAGE_CKEY; -drop table BPEL_EVENT; -drop table BPEL_FAULT; -drop table BPEL_INSTANCE; -drop table BPEL_MESSAGE; -drop table BPEL_MEX_PROPS; -drop table BPEL_PLINK_VAL; -drop table BPEL_PROCESS; -drop table BPEL_SCOPE; -drop table BPEL_SELECTORS; -drop table BPEL_UNMATCHED; -drop table BPEL_XML_DATA; -drop table VAR_PROPERTY; -drop sequence hibernate_seqhilo; + +drop table ODE_ACTIVITY_RECOVERY; +drop table ODE_CORRELATION_SET; +drop table ODE_CORRELATOR; +drop table ODE_CORSET_PROP; +drop table ODE_EVENT; +drop table ODE_FAULT; +drop table ODE_MESSAGE; +drop table ODE_MESSAGE_EXCHANGE; +drop table ODE_MESSAGE_ROUTE; +drop table ODE_MEX_PROP; +drop table ODE_PARTNER_LINK; +drop table ODE_PROCESS; +drop table ODE_PROCESS_INSTANCE; +drop table ODE_SCOPE; +drop table ODE_XML_DATA; +drop table ODE_XML_DATA_PROP; drop table STORE_DU; drop table STORE_PROCESS; drop table STORE_PROCESS_PROP; +drop table STORE_PROC_TO_PROP; drop table STORE_VERSIONS; -drop table BPEL_MESSAGE_EXCHANGE; +drop sequence hibernate_sequence; + Modified: trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql =================================================================== --- trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql 2010-05-31 10:38:38 UTC (rev 686) +++ trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql 2010-05-31 12:23:39 UTC (rev 687) @@ -1,26 +1,27 @@ drop table ODE_SCHEMA_VERSION; drop table ODE_JOB; -drop table BPEL_ACTIVITY_RECOVERY; -drop table BPEL_CORRELATION_PROP; -drop table BPEL_CORRELATION_SET; -drop table BPEL_CORRELATOR; -drop table BPEL_CORRELATOR_MESSAGE_CKEY; -drop table BPEL_EVENT; -drop table BPEL_FAULT; -drop table BPEL_INSTANCE; -drop table BPEL_MESSAGE; -drop table BPEL_MEX_PROPS; -drop table BPEL_PLINK_VAL; -drop table BPEL_PROCESS; -drop table BPEL_SCOPE; -drop table BPEL_SELECTORS; -drop table BPEL_UNMATCHED; -drop table BPEL_XML_DATA; -drop table VAR_PROPERTY; -drop table hibernate_unique_key; + +drop table ODE_ACTIVITY_RECOVERY; +drop table ODE_CORRELATION_SET; +drop table ODE_CORRELATOR; +drop table ODE_CORSET_PROP; +drop table ODE_EVENT; +drop table ODE_FAULT; +drop table ODE_MESSAGE; +drop table ODE_MESSAGE_EXCHANGE; +drop table ODE_MESSAGE_ROUTE; +drop table ODE_MEX_PROP; +drop table ODE_PARTNER_LINK; +drop table ODE_PROCESS; +drop table ODE_PROCESS_INSTANCE; +drop table ODE_SCOPE; +drop table ODE_XML_DATA; +drop table ODE_XML_DATA_PROP; drop table STORE_DU; drop table STORE_PROCESS; drop table STORE_PROCESS_PROP; +drop table STORE_PROC_TO_PROP; drop table STORE_VERSIONS; -drop table BPEL_MESSAGE_EXCHANGE; +drop sequence hibernate_sequence; +

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r686 - in trunk/distribution/src/main: release and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-05-31 06:38:38 -0400 (Mon, 31 May 2010) New Revision: 686 Removed: trunk/distribution/src/main/release/version.properties Modified: trunk/distribution/src/main/assembly/bin.xml Log: * remove the version.properties, as it isn't needed anymore. Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2010-05-31 07:53:33 UTC (rev 685) +++ trunk/distribution/src/main/assembly/bin.xml 2010-05-31 10:38:38 UTC (rev 686) @@ -34,7 +34,6 @@ <outputDirectory>/</outputDirectory> <includes> <include>*.txt</include> - <include>*.properties</include> </includes> </fileSet> Deleted: trunk/distribution/src/main/release/version.properties =================================================================== --- trunk/distribution/src/main/release/version.properties 2010-05-31 07:53:33 UTC (rev 685) +++ trunk/distribution/src/main/release/version.properties 2010-05-31 10:38:38 UTC (rev 686) @@ -1 +0,0 @@ -riftsaw.version=2.0.1-SNAPSHOT

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r685 - in trunk: console and 20 other directories.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-05-31 03:53:33 -0400 (Mon, 31 May 2010) New Revision: 685 Modified: trunk/console/identity/pom.xml trunk/console/integration/pom.xml trunk/console/pom.xml trunk/distribution/pom.xml trunk/distribution/src/main/assembly/bin.xml trunk/docs/docbook/gettingstartedguide/pom.xml trunk/docs/docbook/gettingstartedguide/src/main/master.xml trunk/docs/docbook/pom.xml trunk/docs/docbook/userguide/pom.xml trunk/docs/docbook/userguide/src/main/master.xml trunk/integration-tests/pom.xml trunk/pom.xml trunk/qa/build.xml trunk/qa/hudson-riftsaw-db.sh trunk/qa/hudson-riftsaw-jboss.sh trunk/qa/hudson-riftsaw-jdk5.sh trunk/qa/hudson-riftsaw-soa-p.sh trunk/qa/hudson-riftsaw-ws.sh trunk/runtime/deployer/pom.xml trunk/runtime/engine-assembly/pom.xml trunk/runtime/engine/pom.xml trunk/runtime/jbossesb-bpel-assembly/pom.xml trunk/runtime/jbossesb-bpel/pom.xml trunk/runtime/pom.xml trunk/runtime/uddi/pom.xml trunk/runtime/uddi300/pom.xml trunk/stress-tests/pom.xml Log: * update the version to 2.1.0-CR1, for the testing. Modified: trunk/console/identity/pom.xml =================================================================== --- trunk/console/identity/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/console/identity/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -4,13 +4,13 @@ <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>identity</artifactId> <packaging>jar</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <name>RiftSaw::Console::Identity</name> <parent> <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>parent</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <build> Modified: trunk/console/integration/pom.xml =================================================================== --- trunk/console/integration/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/console/integration/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -4,13 +4,13 @@ <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>integration</artifactId> <packaging>jar</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <name>RiftSaw::Console::Integration</name> <parent> <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>parent</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent>  Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/console/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>parent</artifactId> <packaging>pom</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <name>RiftSaw::Console</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <modules> Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/distribution/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -23,12 +23,12 @@ <artifactId>distribution</artifactId> <packaging>pom</packaging> <name>RiftSaw::Distribution</name> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/distribution/src/main/assembly/bin.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -95,11 +95,6 @@ </fileSet> <fileSet> - <directory>../runtime/engine-assembly/target/ode-distro/jboss-riftsaw-war-2.0-M2/lib</directory> - <outputDirectory>lib</outputDirectory> - </fileSet> - - <fileSet> <directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory> <outputDirectory>docs/gettingstartedguide</outputDirectory> </fileSet> Modified: trunk/docs/docbook/gettingstartedguide/pom.xml =================================================================== --- trunk/docs/docbook/gettingstartedguide/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/docs/docbook/gettingstartedguide/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -6,14 +6,14 @@ <groupId>org.jboss.soa.bpel.docs</groupId> <artifactId>gettingstartedguide</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <packaging>jdocbook</packaging> <name>RiftSaw::Docs::gettingstartedguide</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>docs</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> Modified: trunk/docs/docbook/gettingstartedguide/src/main/master.xml =================================================================== --- trunk/docs/docbook/gettingstartedguide/src/main/master.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/docs/docbook/gettingstartedguide/src/main/master.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -5,7 +5,7 @@ <book lang="en"> <bookinfo> - <title>RiftSaw 2.0.1-SNAPSHOT</title> + <title>RiftSaw 2.1.0-CR1</title> <subtitle>Getting Started Guide</subtitle> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/> </bookinfo> Modified: trunk/docs/docbook/pom.xml =================================================================== --- trunk/docs/docbook/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/docs/docbook/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -6,14 +6,14 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>docs</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <packaging>pom</packaging> <name>RiftSaw::Docs</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <profiles> Modified: trunk/docs/docbook/userguide/pom.xml =================================================================== --- trunk/docs/docbook/userguide/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/docs/docbook/userguide/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -6,14 +6,14 @@ <groupId>org.jboss.soa.bpel.docs</groupId> <artifactId>userguide</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <packaging>jdocbook</packaging> <name>RiftSaw::Docs::userguide</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>docs</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> Modified: trunk/docs/docbook/userguide/src/main/master.xml =================================================================== --- trunk/docs/docbook/userguide/src/main/master.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/docs/docbook/userguide/src/main/master.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -5,7 +5,7 @@ <book lang="en"> <bookinfo> - <title>RiftSaw 2.0.1-SNAPSHOT</title> + <title>RiftSaw 2.1.0-CR1</title> <subtitle>User Guide</subtitle> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/> </bookinfo> Modified: trunk/integration-tests/pom.xml =================================================================== --- trunk/integration-tests/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/integration-tests/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -4,12 +4,12 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>integration-tests</artifactId> <packaging>pom</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <name>RiftSaw::Integration-Tests</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <properties> <jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <packaging>pom</packaging> <name>RiftSaw</name> <url>http://www.jboss.org/riftsaw</url> @@ -73,7 +73,7 @@ <properties> <riftsaw.ode.version>2.1.0.CR1-SNAPSHOT</riftsaw.ode.version> - <riftsaw.engine.version>2.0.1-SNAPSHOT</riftsaw.engine.version> + <riftsaw.engine.version>2.1.0-CR1</riftsaw.engine.version> <bpm.console.version>2.1-SNAPSHOT</bpm.console.version> <commons.logging.version>1.1.1</commons.logging.version> <junit.version>3.8.1</junit.version> Modified: trunk/qa/build.xml =================================================================== --- trunk/qa/build.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/qa/build.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -9,7 +9,7 @@  <property name="database" value="hsqldb" /> - <property name="riftsaw.version" value="2.0.1-SNAPSHOT" /> + <property name="riftsaw.version" value="2.1.0-CR1" /> <property name="riftsaw.home" value="${riftsaw.parent.dir}/riftsaw-${riftsaw.version}" />  <property name="jboss.parent.dir" value="${riftsaw.home}" /> Modified: trunk/qa/hudson-riftsaw-db.sh =================================================================== --- trunk/qa/hudson-riftsaw-db.sh 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/qa/hudson-riftsaw-db.sh 2010-05-31 07:53:33 UTC (rev 685) @@ -7,7 +7,7 @@ RIFTSAW_PARENT_DIR="$WORKSPACE" JBOSS_VERSION="5.1.0.GA" -RIFTSAW_VERSION="2.0.1-SNAPSHOT" +RIFTSAW_VERSION="2.1.0-CR1" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" REPLACE_QA_JDBC="true" Modified: trunk/qa/hudson-riftsaw-jboss.sh =================================================================== --- trunk/qa/hudson-riftsaw-jboss.sh 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/qa/hudson-riftsaw-jboss.sh 2010-05-31 07:53:33 UTC (rev 685) @@ -7,7 +7,7 @@ RIFTSAW_PARENT_DIR="$WORKSPACE" JBOSS_VERSION="5.1.0.GA" -RIFTSAW_VERSION="2.0.1-SNAPSHOT" +RIFTSAW_VERSION="2.1.0-CR1" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" REPLACE_QA_JDBC="true" Modified: trunk/qa/hudson-riftsaw-jdk5.sh =================================================================== --- trunk/qa/hudson-riftsaw-jdk5.sh 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/qa/hudson-riftsaw-jdk5.sh 2010-05-31 07:53:33 UTC (rev 685) @@ -9,7 +9,7 @@ DATABASE="hsql" JBOSS_FILENAME="jboss-$JBOSS_VERSION.zip" REPLACE_QA_JDBC="true" -RIFTSAW_VERSION="2.0.1-SNAPSHOT" +RIFTSAW_VERSION="2.1.0-CR1" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" Modified: trunk/qa/hudson-riftsaw-soa-p.sh =================================================================== --- trunk/qa/hudson-riftsaw-soa-p.sh 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/qa/hudson-riftsaw-soa-p.sh 2010-05-31 07:53:33 UTC (rev 685) @@ -7,7 +7,7 @@ RIFTSAW_PARENT_DIR="$WORKSPACE" DATABASE="hsql" -RIFTSAW_VERSION="2.0.1-SNAPSHOT" +RIFTSAW_VERSION="2.1.0-CR1" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-soa-p.5.0.0/jboss-as" AS_CONFIG="default" REPLACE_QA_JDBC="true" Modified: trunk/qa/hudson-riftsaw-ws.sh =================================================================== --- trunk/qa/hudson-riftsaw-ws.sh 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/qa/hudson-riftsaw-ws.sh 2010-05-31 07:53:33 UTC (rev 685) @@ -6,7 +6,7 @@ RIFTSAW_PARENT_DIR="$WORKSPACE" JBOSS_VERSION="5.1.0.GA" DATABASE="hsql" -RIFTSAW_VERSION="2.0.1-SNAPSHOT" +RIFTSAW_VERSION="2.1.0-CR1" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" Modified: trunk/runtime/deployer/pom.xml =================================================================== --- trunk/runtime/deployer/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/runtime/deployer/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -4,13 +4,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>deployer</artifactId> <packaging>jar</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <name>RiftSaw::Runtime::Deployer</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <dependencies> Modified: trunk/runtime/engine/pom.xml =================================================================== --- trunk/runtime/engine/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/runtime/engine/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -4,13 +4,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw-engine</artifactId> <packaging>jar</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <name>RiftSaw::Runtime::Engine</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <dependencies> Modified: trunk/runtime/engine-assembly/pom.xml =================================================================== --- trunk/runtime/engine-assembly/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/runtime/engine-assembly/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <packaging>pom</packaging> <name>RiftSaw::Runtime::Engine-Assembly</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <dependencies> Modified: trunk/runtime/jbossesb-bpel/pom.xml =================================================================== --- trunk/runtime/jbossesb-bpel/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/runtime/jbossesb-bpel/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -4,13 +4,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>jbossesb-bpel</artifactId> <packaging>jar</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <name>RiftSaw::Runtime::JBossESB-BPEL</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <dependencies> Modified: trunk/runtime/jbossesb-bpel-assembly/pom.xml =================================================================== --- trunk/runtime/jbossesb-bpel-assembly/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/runtime/jbossesb-bpel-assembly/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>bpel.esb</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <packaging>pom</packaging> <name>RiftSaw::Runtime::JBossESB-BPEL-Assembly</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <dependencies> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/runtime/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> <packaging>pom</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <name>RiftSaw::Runtime</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <modules> Modified: trunk/runtime/uddi/pom.xml =================================================================== --- trunk/runtime/uddi/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/runtime/uddi/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -4,13 +4,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw-uddi</artifactId> <packaging>jar</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <name>RiftSaw::Runtime::UDDI</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <dependencies> Modified: trunk/runtime/uddi300/pom.xml =================================================================== --- trunk/runtime/uddi300/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/runtime/uddi300/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -4,13 +4,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw-uddi300</artifactId> <packaging>jar</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <name>RiftSaw::Runtime::UDDI300</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <dependencies> Modified: trunk/stress-tests/pom.xml =================================================================== --- trunk/stress-tests/pom.xml 2010-05-31 07:36:33 UTC (rev 684) +++ trunk/stress-tests/pom.xml 2010-05-31 07:53:33 UTC (rev 685) @@ -4,12 +4,12 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>stress-tests</artifactId> <packaging>pom</packaging> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> <name>RiftSaw::Stress-Tests</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-CR1</version> </parent> <profiles>

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r684 - in trunk: distribution/src/main/assembly and 9 other directories.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-05-31 03:36:33 -0400 (Mon, 31 May 2010) New Revision: 684 Removed: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/derby.sql Modified: trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/db/bpel.properties trunk/distribution/src/main/release/db/jdbc/mysql.properties trunk/pom.xml trunk/runtime/engine-assembly/pom.xml trunk/runtime/engine-assembly/src/main/assembly/sar.xml 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.properties trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java Log: * Update the distribution to use the dao-jpa-hibernate as DAO implementation. * Update the DDL script, remove the derby DB, as we won't support them. * Use the Scheduler.execTransaction, instead of using UserTransaction. * Update it to Use the RiftSaw-ODE 2.1.0.CR1-SNAPSHOT. Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/distribution/src/main/assembly/bin.xml 2010-05-31 07:36:33 UTC (rev 684) @@ -153,7 +153,7 @@ <include>mysql:mysql-connector-java</include> <include>org.apache.derby:derby</include> <include>org.apache.derby:derbytools</include> - <include>com.h2database:h2</include> + <include>com.h2database:h2</include> </includes> </dependencySet> Modified: trunk/distribution/src/main/release/db/bpel.properties =================================================================== --- trunk/distribution/src/main/release/db/bpel.properties 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/distribution/src/main/release/db/bpel.properties 2010-05-31 07:36:33 UTC (rev 684) @@ -53,8 +53,10 @@ ## DAO Connection Factory class. ## uncomment the following for hibernate. -bpel.dao.factory=org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl +bpel.dao.factory=org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl +bpel.dao.factory.store=org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl + ## Transaction Factory ## default is org.apache.ode.il.EmbeddedGeronimoFactory ## available alternatives are: @@ -86,6 +88,7 @@ #bpel.extension.bundles.validation = bpel.db.mode=EXTERNAL +db.emb.create=false bpel.db.ext.dataSource=java:BPELDB # if set to true will self-register BPEL endpoints upon deployment to a UDDI. # this uses the juddi-client-3.0.x and the uddi client config can be set in the uddi.xml Modified: trunk/distribution/src/main/release/db/jdbc/mysql.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/mysql.properties 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/distribution/src/main/release/db/jdbc/mysql.properties 2010-05-31 07:36:33 UTC (rev 684) @@ -1,5 +1,5 @@ connection.url=jdbc:mysql://localhost:3306/riftsaw driver=com.mysql.jdbc.Driver -username=riftsaw -password=riftsaw -dialect=org.hibernate.dialect.MySQLInnoDBDialect \ No newline at end of file +username=root +password= +dialect=org.hibernate.dialect.MySQLInnoDBDialect Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/pom.xml 2010-05-31 07:36:33 UTC (rev 684) @@ -72,13 +72,13 @@ </profiles> <properties> - <riftsaw.ode.version>2.1.0-SNAPSHOT</riftsaw.ode.version> + <riftsaw.ode.version>2.1.0.CR1-SNAPSHOT</riftsaw.ode.version> <riftsaw.engine.version>2.0.1-SNAPSHOT</riftsaw.engine.version> <bpm.console.version>2.1-SNAPSHOT</bpm.console.version> <commons.logging.version>1.1.1</commons.logging.version> <junit.version>3.8.1</junit.version> - <jboss.version>5.1.0.GA</jboss.version> - <log4j.version>1.2.14</log4j.version> + <jboss.version>5.1.0.GA</jboss.version> + <log4j.version>1.2.14</log4j.version> <jbossesb.version>4.7</jbossesb.version> <wsdl4j.version>1.6.2</wsdl4j.version> <h2.version>1.2.124</h2.version> @@ -209,11 +209,16 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-hibernate</artifactId> + <artifactId>riftsaw-dao-jpa</artifactId> <version>${riftsaw.ode.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-dao-jpa-hibernate</artifactId> + <version>${riftsaw.ode.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-jacob</artifactId> <version>${riftsaw.ode.version}</version> </dependency> Modified: trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java =================================================================== --- trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/runtime/engine/src/main/java/org/apache/ode/store/RiftSawProcessStore.java 2010-05-31 07:36:33 UTC (rev 684) @@ -18,28 +18,23 @@ package org.apache.ode.store; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.naming.InitialContext; -import javax.sql.DataSource; +import javax.transaction.TransactionManager; import javax.xml.namespace.QName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.compiler.api.CompilationException; -import org.apache.ode.bpel.engine.BpelProcess; -//import org.apache.ode.bpel.extension.ExtensionValidator; import org.apache.ode.bpel.iapi.ContextException; import org.apache.ode.bpel.iapi.EndpointReferenceContext; import org.apache.ode.bpel.iapi.ProcessState; import org.apache.ode.bpel.iapi.ProcessStoreEvent; -import org.apache.ode.il.config.OdeConfigProperties; -import org.apache.ode.store.ProcessStoreImpl.Callable; +import org.apache.ode.dao.store.ConfStoreDAOConnection; +import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory; +import org.apache.ode.dao.store.DeploymentUnitDAO; import org.jboss.soa.bpel.deployer.BPELDeployer; import org.jboss.soa.bpel.deployer.BPELDeploymentUnit; @@ -48,10 +43,9 @@ private static final Log __log = LogFactory.getLog(RiftSawProcessStore.class); private DeployScheduler m_deployScheduler=new DeployScheduler(); - //private Map<QName, ExtensionValidator> m_extensionValidators = new HashMap<QName, ExtensionValidator>(); - - public RiftSawProcessStore(EndpointReferenceContext eprContext, DataSource ds, String persistenceType, OdeConfigProperties props, boolean createDatamodel) { - super(eprContext, ds, persistenceType, props, createDatamodel); + + public RiftSawProcessStore(EndpointReferenceContext eprContext, TransactionManager txm, ConfStoreDAOConnectionFactory cf) { + super(eprContext, txm, cf); } public void loadAll() { @@ -144,7 +138,7 @@ // Check for the deployment unit associated with the name boolean deploy=exec(new ProcessStoreImpl.Callable<Boolean>() { - public Boolean call(ConfStoreConnection conn) { + public Boolean call(ConfStoreDAOConnection conn) { boolean ret=false; DeploymentUnitDAO dudao = conn.getDeploymentUnit(bdu.getName()); if (dudao == null) Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-05-31 07:36:33 UTC (rev 684) @@ -20,7 +20,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.common.evt.DebugBpelEventListener; -import org.apache.ode.bpel.dao.BpelDAOConnectionFactory; import org.apache.ode.bpel.engine.BpelManagementFacadeImpl; import org.apache.ode.bpel.engine.BpelServerImpl; import org.apache.ode.bpel.engine.CountLRUDehydrationPolicy; @@ -29,6 +28,8 @@ import org.apache.ode.bpel.iapi.*; import org.apache.ode.bpel.intercept.MessageExchangeInterceptor; import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl; +import org.apache.ode.dao.bpel.BpelDAOConnectionFactory; +import org.apache.ode.dao.store.ConfStoreDAOConnectionFactory; import org.apache.ode.il.config.OdeConfigProperties; import org.apache.ode.il.dbutil.Database; import org.apache.ode.scheduler.simple.JdbcDelegate; @@ -65,6 +66,7 @@ protected OdeConfigProperties _odeConfig; protected TransactionManager _txMgr; protected BpelDAOConnectionFactory _daoCF; + protected ConfStoreDAOConnectionFactory _storeCF; protected Scheduler _scheduler; protected Database _db; protected ExecutorService _executorService; @@ -359,10 +361,19 @@ try { _daoCF.shutdown(); } catch (Throwable ex) { - __log.debug("DOA shutdown failed.", ex); + __log.debug("Bpel DAO shutdown failed.", ex); } finally { _daoCF = null; } + + if (_storeCF != null) + try { + _storeCF.shutdown(); + } catch (Throwable ex) { + __log.debug("Store DAO shutdown failed.", ex); + } finally { + _storeCF = null; + } if (_db != null) try { @@ -422,8 +433,9 @@ __log.debug("USING DAO: "+_odeConfig.getDAOConnectionFactory()); try { _daoCF = _db.createDaoCF(); + _storeCF = _db.createDaoStoreCF(); } catch (Exception ex) { - String errmsg = "DAO INSTANTIATION FAILED: "+_odeConfig.getDAOConnectionFactory(); + String errmsg = "DAO INSTANTIATION FAILED: "+_odeConfig.getDAOConnectionFactory() + " and " + _odeConfig.getDAOConfStoreConnectionFactory(); __log.error(errmsg, ex); throw new Exception(errmsg, ex); @@ -431,12 +443,12 @@ } protected void initProcessStore(EndpointReferenceContext eprContext) { - _store = createProcessStore(eprContext, _db.getDataSource()); + _store = createProcessStore(eprContext, _txMgr, _storeCF); _store.registerListener(new ProcessStoreListenerImpl()); } - protected ProcessStoreImpl createProcessStore(EndpointReferenceContext eprContext, DataSource ds) { - return new RiftSawProcessStore(eprContext, ds, _odeConfig.getDAOConnectionFactory(), _odeConfig, false); + protected ProcessStoreImpl createProcessStore(EndpointReferenceContext eprContext, TransactionManager txm, ConfStoreDAOConnectionFactory cf) { + return new RiftSawProcessStore(eprContext, txm, cf); } protected Scheduler createScheduler() { Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-05-31 07:36:33 UTC (rev 684) @@ -110,14 +110,15 @@ boolean isTwoWay = mex.getMessageExchangePattern() == org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern.REQUEST_RESPONSE; - + + final Callable executionCallable; + if(isTwoWay) { // Defer the invoke until the transaction commits. Scheduler scheduler = executionEnvironment.getScheduler(); - scheduler.registerSynchronizer( - new Scheduler.Synchronizer() - { + executionCallable = new TwoWayCallable(mex); + scheduler.registerSynchronizer(new Scheduler.Synchronizer() { public void afterCompletion(boolean success) { @@ -127,84 +128,9 @@ // The invocation must happen in a separate thread, holding on the afterCompletion // blocks other operations that could have been listed there as well. ExecutorService executorService = executionEnvironment.getExecutorService(); - executorService.submit(new Callable<Object>() { - public Object call() throws Exception { - - // TODO: If we use Scheduler.execTransaction - // we could probably bypass the UserTX - UserTransaction tx = getUserTransaction(); - tx.begin(); - - try - { - // Create SOAPMessage - SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); - if(log.isDebugEnabled()) - log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); - - messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); - - if (log.isDebugEnabled()) { - log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); - } - - // The actual WS invocation - Dispatch proxy = getDispatcher(port); - - try { - SOAPMessage soapResponseMessage = (SOAPMessage)proxy.invoke(soapRequestMessage); - - // Create ODE response - Message odeResponse = mex.createMessage(mex.getOperation().getOutput().getMessage().getQName()); - if(soapResponseMessage.getSOAPBody().hasFault()) - { - // fault handling - Document odeMsg = DOMUtils.newDocument(); - Element odeMsgEl = odeMsg.createElementNS(null, "message"); - odeMsg.appendChild(odeMsgEl); - - Fault fault = messageAdapter.parseSoapFault( - odeMsgEl, soapResponseMessage, mex.getOperation() - ); - - handleFault(mex, fault, soapResponseMessage.getSOAPBody().getFault(), odeMsgEl); - - } - else - { - messageAdapter.parseSoapResponse(odeResponse,soapResponseMessage,mex.getOperation()); - mex.reply(odeResponse); - } - - if(log.isDebugEnabled()) - log.debug( "ODE inbound message: \n" +DOMWriter.printNode(odeResponse.getMessage(), true) ); - - } catch(javax.xml.ws.soap.SOAPFaultException fe) { - - // fault handling - Document odeMsg = DOMUtils.newDocument(); - Element odeMsgEl = odeMsg.createElementNS(null, "message"); - odeMsg.appendChild(odeMsgEl); - - Fault fault=messageAdapter.parseSoapFault(odeMsgEl, fe.getFault(), - mex.getOperation()); - - handleFault(mex, fault, fe.getFault(), odeMsgEl); - } - - tx.commit(); - } - catch (Throwable e) - { - tx.rollback(); - log.error("WS invocation failed", e); - mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); - } - return null; - } - }); + executorService.submit(executionCallable); } - + public void beforeCompletion(){} } ); @@ -215,48 +141,138 @@ { // one-way invocation ExecutorService executorService = executionEnvironment.getExecutorService(); - executorService.submit( - new Callable<Object>() - { - public Object call() throws Exception - { + executionCallable = new OneWayCallable(mex); + executorService.submit(executionCallable); - UserTransaction tx = getUserTransaction(); - tx.begin(); - try - { - // Create SOAPMessage - SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); - if(log.isDebugEnabled()) - log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); - - messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); + mex.replyOneWayOk(); + } + } + + private class TwoWayCallable implements Callable<Object> { + + private PartnerRoleMessageExchange mex; + + public TwoWayCallable(PartnerRoleMessageExchange mex) { + this.mex = mex; + } + + public Object call() throws Exception { + + return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){ - if (log.isDebugEnabled()) { - log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); - } - - // The actual WS invocation - Dispatch proxy = getDispatcher(port); - proxy.invokeOneWay(soapRequestMessage); + public Object call() throws Exception { + try + { + // Create SOAPMessage + SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); + if(log.isDebugEnabled()) + log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); + + messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); + + if (log.isDebugEnabled()) { + log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); + } + + // The actual WS invocation + Dispatch proxy = getDispatcher(port); + + try { + SOAPMessage soapResponseMessage = (SOAPMessage)proxy.invoke(soapRequestMessage); - tx.commit(); - } - catch (Throwable e) - { - tx.rollback(); - log.error("WS invocation failed", e); - mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); - } + // Create ODE response + Message odeResponse = mex.createMessage(mex.getOperation().getOutput().getMessage().getQName()); + if(soapResponseMessage.getSOAPBody().hasFault()) + { + // fault handling + Document odeMsg = DOMUtils.newDocument(); + Element odeMsgEl = odeMsg.createElementNS(null, "message"); + odeMsg.appendChild(odeMsgEl); + + Fault fault = messageAdapter.parseSoapFault(odeMsgEl, soapResponseMessage, mex.getOperation()); - return null; - } - } - ); + handleFault(mex, fault, soapResponseMessage.getSOAPBody().getFault(), odeMsgEl); + + } + else + { + messageAdapter.parseSoapResponse(odeResponse,soapResponseMessage,mex.getOperation()); + mex.reply(odeResponse); + } - mex.replyOneWayOk(); - } + if(log.isDebugEnabled()) + log.debug( "ODE inbound message: \n" +DOMWriter.printNode(odeResponse.getMessage(), true) ); + + } catch(javax.xml.ws.soap.SOAPFaultException fe) { + + // fault handling + Document odeMsg = DOMUtils.newDocument(); + Element odeMsgEl = odeMsg.createElementNS(null, "message"); + odeMsg.appendChild(odeMsgEl); + + Fault fault=messageAdapter.parseSoapFault(odeMsgEl, fe.getFault(), + mex.getOperation()); + + handleFault(mex, fault, fe.getFault(), odeMsgEl); + } + } + catch (Throwable e) + { + log.error("WS invocation failed", e); + mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); + } + return null; + } + + }); + } + } + + + private class OneWayCallable implements Callable<Object> { + + private PartnerRoleMessageExchange mex; + + public OneWayCallable(PartnerRoleMessageExchange mex) { + this.mex = mex; + } + + public Object call() throws Exception { + return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){ + + public Object call() throws Exception { + try + { + // Create SOAPMessage + SOAPMessage soapRequestMessage = MessageFactory.newInstance().createMessage(); + if(log.isDebugEnabled()) + log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) ); + + messageAdapter.createSoapRequest(soapRequestMessage, mex.getRequest(), mex.getOperation()); + + if (log.isDebugEnabled()) { + log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); + } + + // The actual WS invocation + Dispatch proxy = getDispatcher(port); + proxy.invokeOneWay(soapRequestMessage); + + } + catch (Throwable e) + { + log.error("WS invocation failed", e); + mex.replyWithFailure(MessageExchange.FailureType.COMMUNICATION_ERROR, e.getMessage(), null); + } + + return null; + } + + }); + } + } + private void handleFault(PartnerRoleMessageExchange mex, Fault fault, SOAPFault soapFault, Element odeMsgEl) { Modified: trunk/runtime/engine-assembly/pom.xml =================================================================== --- trunk/runtime/engine-assembly/pom.xml 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/runtime/engine-assembly/pom.xml 2010-05-31 07:36:33 UTC (rev 684) @@ -48,10 +48,14 @@ </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> - <artifactId>riftsaw-dao-hibernate</artifactId> + <artifactId>riftsaw-dao-jpa</artifactId> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-dao-jpa-hibernate</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-jacob</artifactId> </dependency> <dependency> Modified: trunk/runtime/engine-assembly/src/main/assembly/sar.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-05-31 07:36:33 UTC (rev 684) @@ -53,7 +53,9 @@ <include>org.jboss.soa.bpel:riftsaw-bpel-runtime</include> <include>org.jboss.soa.bpel:riftsaw-bpel-schemas</include> <include>org.jboss.soa.bpel:riftsaw-bpel-store</include> - <include>org.jboss.soa.bpel:riftsaw-dao-hibernate</include> + <include>org.jboss.soa.bpel:riftsaw-dao-jpa</include> + <include>org.jboss.soa.bpel:riftsaw-dao-jpa-hibernate</include> +  <include>org.jboss.soa.bpel.runtime:riftsaw-engine</include> <include>org.jboss.soa.bpel:riftsaw-jacob</include> <include>org.jboss.soa.bpel:riftsaw-scheduler-simple</include> Deleted: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/derby.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/derby.sql 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/derby.sql 2010-05-31 07:36:33 UTC (rev 684) @@ -1,54 +0,0 @@ --- 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, - details blob(4096), - PRIMARY KEY(jobid)); - -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); - - -create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (5); - -create table BPEL_ACTIVITY_RECOVERY (ID bigint not null, PIID bigint, AID bigint, CHANNEL varchar(255), REASON varchar(255), DATE_TIME timestamp, DETAILS blob(2G), ACTIONS varchar(255), RETRIES integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATION_PROP (ID bigint not null, NAME varchar(255), NAMESPACE varchar(255), VALUE varchar(255), CORR_SET_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATION_SET (ID bigint not null, VALUE varchar(255), CORR_SET_NAME varchar(255), SCOPE_ID bigint, PIID bigint, PROCESS_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATOR (ID bigint not null, CID varchar(255), PROCESS_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATOR_MESSAGE_CKEY (ID bigint not null, CKEY varchar(255), CORRELATOR_MESSAGE_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_EVENT (ID bigint not null, IID bigint, PID bigint, TSTAMP timestamp, TYPE varchar(255), DETAIL clob(32000), DATA blob(2G), SID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_FAULT (ID bigint not null, FAULTNAME varchar(255), DATA blob(2G), EXPLANATION varchar(4000), LINE_NUM integer, AID integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_INSTANCE (ID bigint not null, INSTANTIATING_CORRELATOR bigint, FAULT bigint, JACOB_STATE_DATA blob(2G), PREVIOUS_STATE smallint, PROCESS_ID bigint, STATE smallint, LAST_ACTIVE_DT timestamp, SEQUENCE bigint, FAILURE_COUNT integer, FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_MESSAGE (ID bigint not null, MEX bigint, TYPE varchar(255), MESSAGE_DATA blob(2G), MESSAGE_HEADER blob(2G), INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_MESSAGE_EXCHANGE (ID bigint not null, PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), ENDPOINT blob(2G), CALLBACK_ENDPOINT blob(2G), REQUEST bigint, RESPONSE bigint, INSERT_DT timestamp, OPERATION varchar(255), STATE varchar(255), PROCESS bigint, PIID bigint, DIR char(1), PLINK_MODELID integer, PATTERN varchar(255), CORR_STATUS varchar(255), FAULT_TYPE varchar(255), FAULT_EXPL varchar(255), CALLEE varchar(255), PARTNERLINK bigint, PIPED_ID varchar(255), SUBSCRIBER_COUNT integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_MEX_PROPS (MEX bigint not null, VALUE varchar(8000), NAME varchar(255) not null, primary key (MEX, NAME)); -create table BPEL_PLINK_VAL (ID bigint not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR_DATA blob(2G), PARTNERROLE_EPR_DATA blob(2G), PROCESS bigint, SCOPE bigint, SVCNAME varchar(255), MYROLE varchar(100), MODELID integer, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_PROCESS (ID bigint not null, PROCID varchar(255) not null unique, deployer varchar(255), deploydate timestamp, type_name varchar(255), type_ns varchar(255), version bigint, ACTIVE_ smallint, guid varchar(255), INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_SCOPE (ID bigint not null, PIID bigint, PARENT_SCOPE_ID bigint, STATE varchar(255) not null, NAME varchar(255) not null, MODELID integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_SELECTORS (ID bigint not null, PIID bigint not null, SELGRPID varchar(255) not null, IDX integer not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255), CORRELATOR bigint not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); -create table BPEL_UNMATCHED (ID bigint not null, MEX bigint, CORRELATION_KEY varchar(255), CORRELATOR bigint not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_XML_DATA (ID bigint not null, DATA blob(2G), NAME varchar(255) not null, SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE smallint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table VAR_PROPERTY (ID bigint not null, XML_DATA_ID bigint, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID); -create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY); -create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR); -create index IDX_SELECTOR_CKEY on BPEL_SELECTORS (CORRELATION_KEY); -create index IDX_SELECTOR_SELGRPID on BPEL_SELECTORS (SELGRPID); -create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY); -create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR); -create table hibernate_unique_key ( next_hi integer ); -insert into hibernate_unique_key values ( 0 ); - -create table STORE_DU (NAME varchar(255) not null, deployer varchar(255), DEPLOYDT timestamp, DIR varchar(255), primary key (NAME)); -create table STORE_PROCESS (PID varchar(255) not null, DU varchar(255), TYPE varchar(255), version bigint, STATE varchar(255), primary key (PID)); -create table STORE_PROCESS_PROP (propId varchar(255) not null, value varchar(255), name varchar(255) not null, primary key (propId, name)); -create table STORE_VERSIONS (ID integer not null, VERSION bigint, primary key (ID)); Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/hsql.sql 2010-05-31 07:36:33 UTC (rev 684) @@ -1,49 +1,250 @@ create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (5); +insert into ODE_SCHEMA_VERSION values (6); + -- Apache ODE - SimpleScheduler Database Schema -- --- Apache Derby scripts by Maciej Szefler. +-- MySQL 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, - details varbinary, + + 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 varbinary, + PRIMARY KEY(jobid)); CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); -create table BPEL_ACTIVITY_RECOVERY (ID bigint not null, PIID bigint, AID bigint, CHANNEL varchar(255), REASON varchar(255), DATE_TIME timestamp, DETAILS varbinary, ACTIONS varchar(255), RETRIES integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATION_PROP (ID bigint not null, NAME varchar(255), NAMESPACE varchar(255), VALUE varchar(255), CORR_SET_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATION_SET (ID bigint not null, VALUE varchar(255), CORR_SET_NAME varchar(255), SCOPE_ID bigint, PIID bigint, PROCESS_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATOR (ID bigint not null, CID varchar(255), PROCESS_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATOR_MESSAGE_CKEY (ID bigint not null, CKEY varchar(255), CORRELATOR_MESSAGE_ID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_EVENT (ID bigint not null, IID bigint, PID bigint, TSTAMP timestamp, TYPE varchar(255), DETAIL longvarchar, DATA varbinary, SID bigint, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_FAULT (ID bigint not null, FAULTNAME varchar(255), DATA varbinary, EXPLANATION varchar(4000), LINE_NUM integer, AID integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_INSTANCE (ID bigint not null, INSTANTIATING_CORRELATOR bigint, FAULT bigint, JACOB_STATE_DATA varbinary, PREVIOUS_STATE smallint, PROCESS_ID bigint, STATE smallint, LAST_ACTIVE_DT timestamp, SEQUENCE bigint, FAILURE_COUNT integer, FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_MESSAGE (ID bigint not null, MEX bigint, TYPE varchar(255), MESSAGE_DATA varbinary, MESSAGE_HEADER varbinary, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_MESSAGE_EXCHANGE (ID bigint not null, PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), ENDPOINT varbinary, CALLBACK_ENDPOINT varbinary, REQUEST bigint, RESPONSE bigint, INSERT_DT timestamp, OPERATION varchar(255), STATE varchar(255), PROCESS bigint, PIID bigint, DIR char(1), PLINK_MODELID integer, PATTERN varchar(255), CORR_STATUS varchar(255), FAULT_TYPE varchar(255), FAULT_EXPL varchar(255), CALLEE varchar(255), PARTNERLINK bigint, PIPED_ID varchar(255), SUBSCRIBER_COUNT integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_MEX_PROPS (MEX bigint not null, VALUE varchar(8000), NAME varchar(255) not null, primary key (MEX, NAME)); -create table BPEL_PLINK_VAL (ID bigint not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR_DATA varbinary, PARTNERROLE_EPR_DATA varbinary, PROCESS bigint, SCOPE bigint, SVCNAME varchar(255), MYROLE varchar(100), MODELID integer, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_PROCESS (ID bigint not null, PROCID varchar(255) not null, deployer varchar(255), deploydate timestamp, type_name varchar(255), type_ns varchar(255), version bigint, ACTIVE_ bit, guid varchar(255), INSERT_TIME timestamp, MLOCK integer not null, primary key (ID), unique (PROCID)); -create table BPEL_SCOPE (ID bigint not null, PIID bigint, PARENT_SCOPE_ID bigint, STATE varchar(255) not null, NAME varchar(255) not null, MODELID integer, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_SELECTORS (ID bigint not null, PIID bigint not null, SELGRPID varchar(255) not null, IDX integer not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255), CORRELATOR bigint not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); -create table BPEL_UNMATCHED (ID bigint not null, MEX bigint, CORRELATION_KEY varchar(255), CORRELATOR bigint not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table BPEL_XML_DATA (ID bigint not null, DATA varbinary, NAME varchar(255) not null, SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE bit, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create table VAR_PROPERTY (ID bigint not null, XML_DATA_ID bigint, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME timestamp, MLOCK integer not null, primary key (ID)); -create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID); -create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY); -create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR); -create index IDX_SELECTOR_CKEY on BPEL_SELECTORS (CORRELATION_KEY); -create index IDX_SELECTOR_SELGRPID on BPEL_SELECTORS (SELGRPID); -create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY); -create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR); + create table ODE_ACTIVITY_RECOVERY ( + ID bigint generated by default as identity, + ACTIONS varchar(255), + ACTIVITY_ID bigint, + CHANNEL varchar(255), + DATE_TIME timestamp, + DETAILS clob, + INSTANCE_ID bigint, + REASON varchar(255), + RETRIES integer, + primary key (ID) + ); -create sequence hibernate_seqhilo; + create table ODE_CORRELATION_SET ( + CORRELATION_SET_ID bigint generated by default as identity, + CORRELATION_KEY varchar(255), + NAME varchar(255), + SCOPE_ID bigint, + primary key (CORRELATION_SET_ID) + ); + create table ODE_CORRELATOR ( + CORRELATOR_ID bigint generated by default as identity, + CORRELATOR_KEY varchar(255), + PROC_ID bigint, + primary key (CORRELATOR_ID) + ); + + create table ODE_CORSET_PROP ( + ID bigint generated by default as identity, + CORRSET_ID bigint, + PROP_KEY varchar(255), + PROP_VALUE varchar(255), + primary key (ID) + ); + + create table ODE_EVENT ( + EVENT_ID bigint generated by default as identity, + DETAIL varchar(255), + DATA blob, + SCOPE_ID bigint, + TSTAMP timestamp, + TYPE varchar(255), + INSTANCE_ID bigint, + PROCESS_ID bigint, + primary key (EVENT_ID) + ); + + create table ODE_FAULT ( + FAULT_ID bigint generated by default as identity, + ACTIVITY_ID integer, + DATA clob, + MESSAGE varchar(4000), + LINE_NUMBER integer, + NAME varchar(255), + primary key (FAULT_ID) + ); + + create table ODE_MESSAGE ( + MESSAGE_ID bigint generated by default as identity, + DATA clob, + HEADER clob, + TYPE varchar(255), + MESSAGE_EXCHANGE_ID varchar(255), + primary key (MESSAGE_ID) + ); + + create table ODE_MESSAGE_EXCHANGE ( + MESSAGE_EXCHANGE_ID varchar(255) not null, + CALLEE varchar(255), + CHANNEL varchar(255), + CORRELATION_ID varchar(255), + CORRELATION_KEYS varchar(255), + CORRELATION_STATUS varchar(255), + CREATE_TIME timestamp, + DIRECTION char(255), + EPR clob, + FAULT varchar(255), + FAULT_EXPLANATION varchar(255), + OPERATION varchar(255), + PARTNER_LINK_MODEL_ID integer, + PATTERN varchar(255), + PIPED_ID varchar(255), + PORT_TYPE varchar(255), + PROPAGATE_TRANS boolean, + STATUS varchar(255), + SUBSCRIBER_COUNT integer, + CORR_ID bigint, + PARTNER_LINK_ID bigint, + PROCESS_ID bigint, + PROCESS_INSTANCE_ID bigint, + REQUEST_MESSAGE_ID bigint, + RESPONSE_MESSAGE_ID bigint, + primary key (MESSAGE_EXCHANGE_ID) + ); + + create table ODE_MESSAGE_ROUTE ( + MESSAGE_ROUTE_ID bigint generated by default as identity, + CORRELATION_KEY varchar(255), + GROUP_ID varchar(255), + ROUTE_INDEX integer, + PROCESS_INSTANCE_ID bigint, + ROUTE_POLICY varchar(16), + CORR_ID bigint, + primary key (MESSAGE_ROUTE_ID) + ); + + create table ODE_MEX_PROP ( + ID bigint generated by default as identity, + MEX_ID varchar(255), + PROP_KEY varchar(255), + PROP_VALUE varchar(2000), + primary key (ID) + ); + + create table ODE_PARTNER_LINK ( + PARTNER_LINK_ID bigint generated by default as identity, + MY_EPR clob, + MY_ROLE_NAME varchar(255), + MY_ROLE_SERVICE_NAME varchar(255), + MY_SESSION_ID varchar(255), + PARTNER_EPR clob, + PARTNER_LINK_MODEL_ID integer, + PARTNER_LINK_NAME varchar(255), + PARTNER_ROLE_NAME varchar(255), + PARTNER_SESSION_ID varchar(255), + SCOPE_ID bigint, + primary key (PARTNER_LINK_ID) + ); + + create table ODE_PROCESS ( + ID bigint generated by default as identity, + GUID varchar(255), + PROCESS_ID varchar(255), + PROCESS_TYPE varchar(255), + VERSION bigint, + primary key (ID) + ); + + create table ODE_PROCESS_INSTANCE ( + ID bigint generated by default as identity, + DATE_CREATED timestamp, + EXECUTION_STATE blob, + FAULT_ID bigint, + LAST_ACTIVE_TIME timestamp, + LAST_RECOVERY_DATE timestamp, + PREVIOUS_STATE smallint, + SEQUENCE bigint, + INSTANCE_STATE smallint, + INSTANTIATING_CORRELATOR_ID bigint, + PROCESS_ID bigint, + ROOT_SCOPE_ID bigint, + primary key (ID) + ); + + create table ODE_SCOPE ( + SCOPE_ID bigint generated by default as identity, + MODEL_ID integer, + SCOPE_NAME varchar(255), + SCOPE_STATE varchar(255), + PARENT_SCOPE_ID bigint, + PROCESS_INSTANCE_ID bigint, + primary key (SCOPE_ID) + ); + + create table ODE_XML_DATA ( + XML_DATA_ID bigint generated by default as identity, + DATA clob, + IS_SIMPLE_TYPE boolean, + NAME varchar(255), + SCOPE_ID bigint, + primary key (XML_DATA_ID) + ); + + create table ODE_XML_DATA_PROP ( + ID bigint generated by default as identity, + XML_DATA_ID bigint, + PROP_KEY varchar(255), + PROP_VALUE varchar(255), + primary key (ID) + ); + + create table STORE_DU ( + NAME varchar(255) not null, + DEPLOYDT timestamp, + DEPLOYER varchar(255), + DIR varchar(255), + primary key (NAME) + ); + + create table STORE_PROCESS ( + PID varchar(255) not null, + STATE varchar(255), + TYPE varchar(255), + VERSION bigint, + DU varchar(255), + primary key (PID) + ); + + create table STORE_PROCESS_PROP ( + ID bigint generated by default as identity, + PROP_KEY varchar(255), + PROP_VAL varchar(255), + primary key (ID) + ); + + create table STORE_PROC_TO_PROP ( + STORE_PROCESS_PID varchar(255) not null, + STORE_PROPERTY_ID bigint not null, + primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID), + unique (STORE_PROPERTY_ID) + ); + + create table STORE_VERSIONS ( + ID bigint generated by default as identity, + VERSION bigint, + primary key (ID) + ); \ No newline at end of file Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/mysql.sql 2010-05-31 07:36:33 UTC (rev 684) @@ -1,5 +1,25 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. +-- + create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (5); +insert into ODE_SCHEMA_VERSION values (6); + -- Apache ODE - SimpleScheduler Database Schema -- -- MySQL scripts by Maciej Szefler. @@ -13,7 +33,18 @@ nodeid char(64) NULL, scheduled int NOT NULL DEFAULT 0, transacted int NOT NULL DEFAULT 0, - details blob(4096) 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, + detailsExt blob(4096), + PRIMARY KEY(jobid), INDEX IDX_ODE_JOB_TS(ts), INDEX IDX_ODE_JOB_NODEID(nodeid) @@ -22,52 +53,222 @@ COMMIT; -create table BPEL_ACTIVITY_RECOVERY (ID bigint not null, PIID bigint, AID bigint, CHANNEL varchar(255), REASON varchar(255), DATE_TIME datetime, DETAILS blob, ACTIONS varchar(255), RETRIES integer, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATION_PROP (ID bigint not null, NAME varchar(255), NAMESPACE varchar(255), VALUE varchar(255), CORR_SET_ID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATION_SET (ID bigint not null, VALUE varchar(255), CORR_SET_NAME varchar(255), SCOPE_ID bigint, PIID bigint, PROCESS_ID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATOR (ID bigint not null, CID varchar(255), PROCESS_ID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_CORRELATOR_MESSAGE_CKEY (ID bigint not null, CKEY varchar(255), CORRELATOR_MESSAGE_ID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_EVENT (ID bigint not null, IID bigint, PID bigint, TSTAMP datetime, TYPE varchar(255), DETAIL longtext, DATA blob, SID bigint, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_FAULT (ID bigint not null, FAULTNAME varchar(255), DATA blob, EXPLANATION varchar(4000), LINE_NUM integer, AID integer, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_INSTANCE (ID bigint not null, INSTANTIATING_CORRELATOR bigint, FAULT bigint, JACOB_STATE_DATA blob, PREVIOUS_STATE smallint, PROCESS_ID bigint, STATE smallint, LAST_ACTIVE_DT datetime, SEQUENCE bigint, FAILURE_COUNT integer, FAILURE_DT datetime, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_MESSAGE (ID bigint not null, MEX bigint, TYPE varchar(255), MESSAGE_DATA blob, MESSAGE_HEADER blob, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_MESSAGE_EXCHANGE (ID bigint not null, PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), ENDPOINT blob, CALLBACK_ENDPOINT blob, REQUEST bigint, RESPONSE bigint, INSERT_DT datetime, OPERATION varchar(255), STATE varchar(255), PROCESS bigint, PIID bigint, DIR char(1), PLINK_MODELID integer, PATTERN varchar(255), CORR_STATUS varchar(255), FAULT_TYPE varchar(255), FAULT_EXPL varchar(255), CALLEE varchar(255), PARTNERLINK bigint, PIPED_ID varchar(255), SUBSCRIBER_COUNT integer, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_MEX_PROPS (MEX bigint not null, VALUE varchar(8000), NAME varchar(255) not null, primary key (MEX, NAME)); -create table BPEL_PLINK_VAL (ID bigint not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR_DATA blob, PARTNERROLE_EPR_DATA blob, PROCESS bigint, SCOPE bigint, SVCNAME varchar(255), MYROLE varchar(100), MODELID integer, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_PROCESS (ID bigint not null, PROCID varchar(255) not null unique, deployer varchar(255), deploydate datetime, type_name varchar(255), type_ns varchar(255), version bigint, ACTIVE_ bit, guid varchar(255), INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_SCOPE (ID bigint not null, PIID bigint, PARENT_SCOPE_ID bigint, STATE varchar(255) not null, NAME varchar(255) not null, MODELID integer, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_SELECTORS (ID bigint not null, PIID bigint not null, SELGRPID varchar(255) not null, IDX integer not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255), CORRELATOR bigint not null, INSERT_TIME datetime, MLOCK integer not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); -create table BPEL_UNMATCHED (ID bigint not null, MEX bigint, CORRELATION_KEY varchar(255), CORRELATOR bigint not null, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table BPEL_XML_DATA (ID bigint not null, DATA blob, NAME varchar(255) not null, SCOPE_ID bigint, PIID bigint, IS_SIMPLE_TYPE bit, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); -create table VAR_PROPERTY (ID bigint not null, XML_DATA_ID bigint, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME datetime, MLOCK integer not null, primary key (ID)); + create table ODE_ACTIVITY_RECOVERY ( + ID bigint not null auto_increment, + ACTIONS varchar(255), + ACTIVITY_ID bigint, + CHANNEL varchar(255), + DATE_TIME datetime, + DETAILS longtext, + INSTANCE_ID bigint, + REASON varchar(255), + RETRIES integer, + primary key (ID) + ) type=InnoDB; ---create indexes + create table ODE_CORRELATION_SET ( + CORRELATION_SET_ID bigint not null auto_increment, + CORRELATION_KEY varchar(255), + NAME varchar(255), + SCOPE_ID bigint, + primary key (CORRELATION_SET_ID) + ) type=InnoDB; -create index IDX_XMLDATA_IID on BPEL_XML_DATA (PIID) ; -create index IDX_XMLDATA_SID on BPEL_XML_DATA (SCOPE_ID) ; -create index IDX_XMLDATA_NAME on BPEL_XML_DATA (NAME) ; -create index IDX_XMLDATA_NAME_SID on BPEL_XML_DATA (NAME, SCOPE_ID) ; -create index IDX_EVENT_IID on BPEL_EVENT (IID) ; -create index IDX_EVENT_PID on BPEL_EVENT (PID) ; -create index IDX_CORR_SET_NAME on BPEL_CORRELATION_SET (CORR_SET_NAME) ; -create index IDX_CORR_SET_SCOPE_ID on BPEL_CORRELATION_SET (SCOPE_ID) ; -create index IDX_BPEL_INSTANCE_PROCESS_ID on BPEL_INSTANCE (PROCESS_ID) ; -create index IDX_BPEL_INSTANCE_STATE on BPEL_INSTANCE (STATE) ; -create index IDX_BPEL_PROCESS_TYPE_NAME on BPEL_PROCESS (type_name) ; -create index IDX_BPEL_PROCESS_TYPE_NS on BPEL_PROCESS (type_ns) ; -create index IDX_BPEL_CORRELATOR_PROCESS_ID on BPEL_CORRELATOR (PROCESS_ID) ; -create index IDX_UNMATCHED_CORRELATOR_CKEY on BPEL_UNMATCHED (CORRELATOR,CORRELATION_KEY) ; -create index IDX_PLINK_VAL_PROCESS_IDX on BPEL_PLINK_VAL (PROCESS) ; -create index IDX_PLINK_VAL_SCOPE on BPEL_PLINK_VAL (SCOPE) ; -create index IDX_PLINK_VAL_MODELID on BPEL_PLINK_VAL (MODELID) ; -create index IDX_SELECTOR_INSTANCE on BPEL_SELECTORS (PIID) ; -create index IDX_VARPROP_XMLDATA on VAR_PROPERTY (XML_DATA_ID) ; -create index IDX_VARPROP_NAME on VAR_PROPERTY (PROP_NAME) ; -create index IDX_VARPROP_VALUE on VAR_PROPERTY (PROP_VALUE) ; -create index IDX_UNMATCHED_MEX on BPEL_UNMATCHED (MEX) ; + create table ODE_CORRELATOR ( + CORRELATOR_ID bigint not null auto_increment, + CORRELATOR_KEY varchar(255), + PROC_ID bigint, + primary key (CORRELATOR_ID) + ) type=InnoDB; ---Indexes for instance deletion -create index IDX_MESSAGE_MEX on BPEL_MESSAGE(MEX) ; -create index IDX_MESSAGE_EXCHANGE_PIID on BPEL_MESSAGE_EXCHANGE(PIID) ; -create index IDX_SCOPE_PIID on BPEL_SCOPE(PIID) ; + create table ODE_CORSET_PROP ( + ID bigint not null auto_increment, + CORRSET_ID bigint, + PROP_KEY varchar(255), + PROP_VALUE varchar(255), + primary key (ID) + ) type=InnoDB; + + create table ODE_EVENT ( + EVENT_ID bigint not null auto_increment, + DETAIL varchar(255), + DATA longblob, + SCOPE_ID bigint, + TSTAMP datetime, + TYPE varchar(255), + INSTANCE_ID bigint, + PROCESS_ID bigint, + primary key (EVENT_ID) + ) type=InnoDB; + + create table ODE_FAULT ( + FAULT_ID bigint not null auto_increment, + ACTIVITY_ID integer, + DATA longtext, + MESSAGE longtext, + LINE_NUMBER integer, + NAME varchar(255), + primary key (FAULT_ID) + ) type=InnoDB; + + create table ODE_MESSAGE ( + MESSAGE_ID bigint not null auto_increment, + DATA longtext, + HEADER longtext, + TYPE varchar(255), + MESSAGE_EXCHANGE_ID varchar(255), + primary key (MESSAGE_ID) + ) type=InnoDB; + + create table ODE_MESSAGE_EXCHANGE ( + MESSAGE_EXCHANGE_ID varchar(255) not null, + CALLEE varchar(255), + CHANNEL varchar(255), + CORRELATION_ID varchar(255), + CORRELATION_KEYS varchar(255), + CORRELATION_STATUS varchar(255), + CREATE_TIME datetime, + DIRECTION char(1), + EPR longtext, + FAULT varchar(255), + FAULT_EXPLANATION varchar(255), + OPERATION varchar(255), + PARTNER_LINK_MODEL_ID integer, + PATTERN varchar(255), + PIPED_ID varchar(255), + PORT_TYPE varchar(255), + PROPAGATE_TRANS bit, + STATUS varchar(255), + SUBSCRIBER_COUNT integer, + CORR_ID bigint, + PARTNER_LINK_ID bigint, + PROCESS_ID bigint, + PROCESS_INSTANCE_ID bigint, + REQUEST_MESSAGE_ID bigint, + RESPONSE_MESSAGE_ID bigint, + primary key (MESSAGE_EXCHANGE_ID) + ) type=InnoDB; + + create table ODE_MESSAGE_ROUTE ( + MESSAGE_ROUTE_ID bigint not null auto_increment, + CORRELATION_KEY varchar(255), + GROUP_ID varchar(255), + ROUTE_INDEX integer, + PROCESS_INSTANCE_ID bigint, + ROUTE_POLICY varchar(16), + CORR_ID bigint, + primary key (MESSAGE_ROUTE_ID) + ) type=InnoDB; + + create table ODE_MEX_PROP ( + ID bigint not null auto_increment, + MEX_ID varchar(255), + PROP_KEY varchar(255), + PROP_VALUE longtext, + primary key (ID) + ) type=InnoDB; + + create table ODE_PARTNER_LINK ( + PARTNER_LINK_ID bigint not null auto_increment, + MY_EPR longtext, + MY_ROLE_NAME varchar(255), + MY_ROLE_SERVICE_NAME varchar(255), + MY_SESSION_ID varchar(255), + PARTNER_EPR longtext, + PARTNER_LINK_MODEL_ID integer, + PARTNER_LINK_NAME varchar(255), + PARTNER_ROLE_NAME varchar(255), + PARTNER_SESSION_ID varchar(255), + SCOPE_ID bigint, + primary key (PARTNER_LINK_ID) + ) type=InnoDB; + + create table ODE_PROCESS ( + ID bigint not null auto_increment, + GUID varchar(255), + PROCESS_ID varchar(255), + PROCESS_TYPE varchar(255), + VERSION bigint, + primary key (ID) + ) type=InnoDB; + + create table ODE_PROCESS_INSTANCE ( + ID bigint not null auto_increment, + DATE_CREATED datetime, + EXECUTION_STATE longblob, + FAULT_ID bigint, + LAST_ACTIVE_TIME datetime, + LAST_RECOVERY_DATE datetime, + PREVIOUS_STATE smallint, + SEQUENCE bigint, + INSTANCE_STATE smallint, + INSTANTIATING_CORRELATOR_ID bigint, + PROCESS_ID bigint, + ROOT_SCOPE_ID bigint, + primary key (ID) + ) type=InnoDB; + + create table ODE_SCOPE ( + SCOPE_ID bigint not null auto_increment, + MODEL_ID integer, + SCOPE_NAME varchar(255), + SCOPE_STATE varchar(255), + PARENT_SCOPE_ID bigint, + PROCESS_INSTANCE_ID bigint, + primary key (SCOPE_ID) + ) type=InnoDB; + + create table ODE_XML_DATA ( + XML_DATA_ID bigint not null auto_increment, + DATA longtext, + IS_SIMPLE_TYPE bit, + NAME varchar(255), + SCOPE_ID bigint, + primary key (XML_DATA_ID) + ) type=InnoDB; + + create table ODE_XML_DATA_PROP ( + ID bigint not null auto_increment, + XML_DATA_ID bigint, + PROP_KEY varchar(255), + PROP_VALUE varchar(255), + primary key (ID) + ) type=InnoDB; + + create table STORE_DU ( + NAME varchar(255) not null, + DEPLOYDT datetime, + DEPLOYER varchar(255), + DIR varchar(255), + primary key (NAME) + ) type=InnoDB; + + create table STORE_PROCESS ( + PID varchar(255) not null, + STATE varchar(255), + TYPE varchar(255), + VERSION bigint, + DU varchar(255), + primary key (PID) + ) type=InnoDB; + + create table STORE_PROCESS_PROP ( + ID bigint not null auto_increment, + PROP_KEY varchar(255), + PROP_VAL varchar(255), + primary key (ID) + ) type=InnoDB; + + create table STORE_PROC_TO_PROP ( + STORE_PROCESS_PID varchar(255) not null, + STORE_PROPERTY_ID bigint not null, + primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID), + unique (STORE_PROPERTY_ID) + ) type=InnoDB; + + create table STORE_VERSIONS ( + ID bigint not null auto_increment, + VERSION bigint, + primary key (ID) + ) type=InnoDB; \ No newline at end of file Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/oracle.sql 2010-05-31 07:36:33 UTC (rev 684) @@ -1,78 +1,275 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. +-- + create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (5); +insert into ODE_SCHEMA_VERSION values (6); + -- Apache ODE - SimpleScheduler Database Schema -- -- Apache Derby scripts by Maciej Szefler. -- -- -CREATE TABLE ode_job ( +DROP TABLE ODE_JOB; + +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, - details blob, + + 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, + detailsExt blob, + PRIMARY KEY(jobid)); -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts) ; -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid) ; +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); -create table BPEL_ACTIVITY_RECOVERY (ID number(19,0) not null, PIID number(19,0), AID number(19,0), CHANNEL varchar2(255 char), REASON varchar2(255 char), DATE_TIME timestamp, DETAILS blob, ACTIONS varchar2(255 char), RETRIES number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_CORRELATION_PROP (ID number(19,0) not null, NAME varchar2(255 char), NAMESPACE varchar2(255 char), VALUE varchar2(255 char), CORR_SET_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_CORRELATION_SET (ID number(19,0) not null, VALUE varchar2(255 char), CORR_SET_NAME varchar2(255 char), SCOPE_ID number(19,0), PIID number(19,0), PROCESS_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_CORRELATOR (ID number(19,0) not null, CID varchar2(255 char), PROCESS_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_CORRELATOR_MESSAGE_CKEY (ID number(19,0) not null, CKEY varchar2(255 char), CORRELATOR_MESSAGE_ID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_EVENT (ID number(19,0) not null, IID number(19,0), PID number(19,0), TSTAMP timestamp, TYPE varchar2(255 char), DETAIL clob, DATA blob, SID number(19,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_FAULT (ID number(19,0) not null, FAULTNAME varchar2(255 char), DATA blob, EXPLANATION varchar2(4000 char), LINE_NUM number(10,0), AID number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_INSTANCE (ID number(19,0) not null, INSTANTIATING_CORRELATOR number(19,0), FAULT number(19,0), JACOB_STATE_DATA blob, PREVIOUS_STATE number(5,0), PROCESS_ID number(19,0), STATE number(5,0), LAST_ACTIVE_DT timestamp, SEQUENCE number(19,0), FAILURE_COUNT number(10,0), FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_MESSAGE (ID number(19,0) not null, MEX number(19,0), TYPE varchar2(255 char), MESSAGE_DATA blob, MESSAGE_HEADER blob, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_MESSAGE_EXCHANGE (ID number(19,0) not null, PORT_TYPE varchar2(255 char), CHANNEL_NAME varchar2(255 char), CLIENTKEY varchar2(255 char), ENDPOINT blob, CALLBACK_ENDPOINT blob, REQUEST number(19,0), RESPONSE number(19,0), INSERT_DT timestamp, OPERATION varchar2(255 char), STATE varchar2(255 char), PROCESS number(19,0), PIID number(19,0), DIR char(1 char), PLINK_MODELID number(10,0), PATTERN varchar2(255 char), CORR_STATUS varchar2(255 char), FAULT_TYPE varchar2(255 char), FAULT_EXPL varchar2(255 char), CALLEE varchar2(255 char), PARTNERLINK number(19,0), PIPED_ID varchar2(255 char), SUBSCRIBER_COUNT number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_MEX_PROPS (MEX number(19,0) not null, VALUE long, NAME varchar2(255 char) not null, primary key (MEX, NAME)); -create table BPEL_PLINK_VAL (ID number(19,0) not null, PARTNER_LINK varchar2(100 char) not null, PARTNERROLE varchar2(100 char), MYROLE_EPR_DATA blob, PARTNERROLE_EPR_DATA blob, PROCESS number(19,0), SCOPE number(19,0), SVCNAME varchar2(255 char), MYROLE varchar2(100 char), MODELID number(10,0), MYSESSIONID varchar2(255 char), PARTNERSESSIONID varchar2(255 char), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_PROCESS (ID number(19,0) not null, PROCID varchar2(255 char) not null unique, deployer varchar2(255 char), deploydate timestamp, type_name varchar2(255 char), type_ns varchar2(255 char), version number(19,0), ACTIVE_ number(1,0), guid varchar2(255 char), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_SCOPE (ID number(19,0) not null, PIID number(19,0), PARENT_SCOPE_ID number(19,0), STATE varchar2(255 char) not null, NAME varchar2(255 char) not null, MODELID number(10,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_SELECTORS (ID number(19,0) not null, PIID number(19,0) not null, SELGRPID varchar2(255 char) not null, IDX number(10,0) not null, CORRELATION_KEY varchar2(255 char) not null, PROC_TYPE varchar2(255 char) not null, ROUTE_POLICY varchar2(255 char), CORRELATOR number(19,0) not null, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); -create table BPEL_UNMATCHED (ID number(19,0) not null, MEX number(19,0), CORRELATION_KEY varchar2(255 char), CORRELATOR number(19,0) not null, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table BPEL_XML_DATA (ID number(19,0) not null, DATA blob, NAME varchar2(255 char) not null, SCOPE_ID number(19,0), PIID number(19,0), IS_SIMPLE_TYPE number(1,0), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create table VAR_PROPERTY (ID number(19,0) not null, XML_DATA_ID number(19,0), PROP_VALUE varchar2(255 char), PROP_NAME varchar2(255 char) not null, INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); -create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID); -create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY); -create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR); -create index IDX_SELECTOR_CKEY on BPEL_SELECTORS (CORRELATION_KEY); -create index IDX_SELECTOR_SELGRPID on BPEL_SELECTORS (SELGRPID); -create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY); -create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR); -create sequence hibernate_seqhilo; ---create indexes + create table ODE_ACTIVITY_RECOVERY ( + ID number(19,0) not null, + ACTIONS varchar2(255), + ACTIVITY_ID number(19,0), + CHANNEL varchar2(255), + DATE_TIME date, + DETAILS clob, + INSTANCE_ID number(19,0), + REASON varchar2(255), + RETRIES number(10,0), + primary key (ID) + ); -create index IDX_XMLDATA_IID on BPEL_XML_DATA (PIID) ; -create index IDX_XMLDATA_SID on BPEL_XML_DATA (SCOPE_ID) ; -create index IDX_XMLDATA_NAME on BPEL_XML_DATA (NAME) ; -create index IDX_XMLDATA_NAME_SID on BPEL_XML_DATA (NAME, SCOPE_ID) ; -create index IDX_EVENT_IID on BPEL_EVENT (IID) ; -create index IDX_EVENT_PID on BPEL_EVENT (PID) ; -create index IDX_CORR_SET_NAME on BPEL_CORRELATION_SET (CORR_SET_NAME) ; -create index IDX_CORR_SET_SCOPE_ID on BPEL_CORRELATION_SET (SCOPE_ID) ; -create index IDX_BPEL_INSTANCE_PROCESS_ID on BPEL_INSTANCE (PROCESS_ID) ; -create index IDX_BPEL_INSTANCE_STATE on BPEL_INSTANCE (STATE) ; -create index IDX_BPEL_PROCESS_TYPE_NAME on BPEL_PROCESS (type_name) ; -create index IDX_BPEL_PROCESS_TYPE_NS on BPEL_PROCESS (type_ns) ; -create index IDX_BPEL_CORRELATOR_PROCESS_ID on BPEL_CORRELATOR (PROCESS_ID) ; -create index IDX_UNMATCHED_CORRELATOR_CKEY on BPEL_UNMATCHED (CORRELATOR,CORRELATION_KEY) ; -create index IDX_PLINK_VAL_PROCESS_IDX on BPEL_PLINK_VAL (PROCESS) ; -create index IDX_PLINK_VAL_SCOPE on BPEL_PLINK_VAL (SCOPE) ; -create index IDX_PLINK_VAL_MODELID on BPEL_PLINK_VAL (MODELID) ; -create index IDX_SELECTOR_INSTANCE on BPEL_SELECTORS (PIID) ; -create index IDX_VARPROP_XMLDATA on VAR_PROPERTY (XML_DATA_ID) ; -create index IDX_VARPROP_NAME on VAR_PROPERTY (PROP_NAME) ; -create index IDX_VARPROP_VALUE on VAR_PROPERTY (PROP_VALUE) ; -create index IDX_UNMATCHED_MEX on BPEL_UNMATCHED (MEX) ; + create table ODE_CORRELATION_SET ( + CORRELATION_SET_ID number(19,0) not null, + CORRELATION_KEY varchar2(255), + NAME varchar2(255), + SCOPE_ID number(19,0), + primary key (CORRELATION_SET_ID) + ); ---Indexes for instance deletion -create index IDX_MESSAGE_MEX on BPEL_MESSAGE(MEX) ; -create index IDX_MESSAGE_EXCHANGE_PIID on BPEL_MESSAGE_EXCHANGE(PIID) ; -create index IDX_SCOPE_PIID on BPEL_SCOPE(PIID) ; + create table ODE_CORRELATOR ( + CORRELATOR_ID number(19,0) not null, + CORRELATOR_KEY varchar2(255), + PROC_ID number(19,0), + primary key (CORRELATOR_ID) + ); + create table ODE_CORSET_PROP ( + ID number(19,0) not null, + CORRSET_ID number(19,0), + PROP_KEY varchar2(255), + PROP_VALUE varchar2(255), + primary key (ID) + ); + + create table ODE_EVENT ( + EVENT_ID number(19,0) not null, + DETAIL varchar2(255), + DATA blob, + SCOPE_ID number(19,0), + TSTAMP date, + TYPE varchar2(255), + INSTANCE_ID number(19,0), + PROCESS_ID number(19,0), + primary key (EVENT_ID) + ); + + create table ODE_FAULT ( + FAULT_ID number(19,0) not null, + ACTIVITY_ID number(10,0), + DATA clob, + MESSAGE varchar2(4000), + LINE_NUMBER number(10,0), + NAME varchar2(255), + primary key (FAULT_ID) + ); + + create table ODE_MESSAGE ( + MESSAGE_ID number(19,0) not null, + DATA clob, + HEADER clob, + TYPE varchar2(255), + MESSAGE_EXCHANGE_ID varchar2(255), + primary key (MESSAGE_ID) + ); + + create table ODE_MESSAGE_EXCHANGE ( + MESSAGE_EXCHANGE_ID varchar2(255) not null, + CALLEE varchar2(255), + CHANNEL varchar2(255), + CORRELATION_ID varchar2(255), + CORRELATION_KEYS varchar2(255), + CORRELATION_STATUS varchar2(255), + CREATE_TIME date, + DIRECTION char(1), + EPR clob, + FAULT varchar2(255), + FAULT_EXPLANATION varchar2(255), + OPERATION varchar2(255), + PARTNER_LINK_MODEL_ID number(10,0), + PATTERN varchar2(255), + PIPED_ID varchar2(255), + PORT_TYPE varchar2(255), + PROPAGATE_TRANS number(1,0), + STATUS varchar2(255), + SUBSCRIBER_COUNT number(10,0), + CORR_ID number(19,0), + PARTNER_LINK_ID number(19,0), + PROCESS_ID number(19,0), + PROCESS_INSTANCE_ID number(19,0), + REQUEST_MESSAGE_ID number(19,0), + RESPONSE_MESSAGE_ID number(19,0), + primary key (MESSAGE_EXCHANGE_ID) + ); + + create table ODE_MESSAGE_ROUTE ( + MESSAGE_ROUTE_ID number(19,0) not null, + CORRELATION_KEY varchar2(255), + GROUP_ID varchar2(255), + ROUTE_INDEX number(10,0), + PROCESS_INSTANCE_ID number(19,0), + ROUTE_POLICY varchar2(16), + CORR_ID number(19,0), + primary key (MESSAGE_ROUTE_ID) + ); + + create table ODE_MEX_PROP ( + ID number(19,0) not null, + MEX_ID varchar2(255), + PROP_KEY varchar2(255), + PROP_VALUE varchar2(2000), + primary key (ID) + ); + + create table ODE_PARTNER_LINK ( + PARTNER_LINK_ID number(19,0) not null, + MY_EPR clob, + MY_ROLE_NAME varchar2(255), + MY_ROLE_SERVICE_NAME varchar2(255), + MY_SESSION_ID varchar2(255), + PARTNER_EPR clob, + PARTNER_LINK_MODEL_ID number(10,0), + PARTNER_LINK_NAME varchar2(255), + PARTNER_ROLE_NAME varchar2(255), + PARTNER_SESSION_ID varchar2(255), + SCOPE_ID number(19,0), + primary key (PARTNER_LINK_ID) + ); + + create table ODE_PROCESS ( + ID number(19,0) not null, + GUID varchar2(255), + PROCESS_ID varchar2(255), + PROCESS_TYPE varchar2(255), + VERSION number(19,0), + primary key (ID) + ); + + create table ODE_PROCESS_INSTANCE ( + ID number(19,0) not null, + DATE_CREATED date, + EXECUTION_STATE blob, + FAULT_ID number(19,0), + LAST_ACTIVE_TIME date, + LAST_RECOVERY_DATE date, + PREVIOUS_STATE number(5,0), + SEQUENCE number(19,0), + INSTANCE_STATE number(5,0), + INSTANTIATING_CORRELATOR_ID number(19,0), + PROCESS_ID number(19,0), + ROOT_SCOPE_ID number(19,0), + primary key (ID) + ); + + create table ODE_SCOPE ( + SCOPE_ID number(19,0) not null, + MODEL_ID number(10,0), + SCOPE_NAME varchar2(255), + SCOPE_STATE varchar2(255), + PARENT_SCOPE_ID number(19,0), + PROCESS_INSTANCE_ID number(19,0), + primary key (SCOPE_ID) + ); + + create table ODE_XML_DATA ( + XML_DATA_ID number(19,0) not null, + DATA clob, + IS_SIMPLE_TYPE number(1,0), + NAME varchar2(255), + SCOPE_ID number(19,0), + primary key (XML_DATA_ID) + ); + + create table ODE_XML_DATA_PROP ( + ID number(19,0) not null, + XML_DATA_ID number(19,0), + PROP_KEY varchar2(255), + PROP_VALUE varchar2(255), + primary key (ID) + ); + + create table STORE_DU ( + NAME varchar2(255) not null, + DEPLOYDT date, + DEPLOYER varchar2(255), + DIR varchar2(255), + primary key (NAME) + ); + + create table STORE_PROCESS ( + PID varchar2(255) not null, + STATE varchar2(255), + TYPE varchar2(255), + VERSION number(19,0), + DU varchar2(255), + primary key (PID) + ); + + create table STORE_PROCESS_PROP ( + ID number(19,0) not null, + PROP_KEY varchar2(255), + PROP_VAL varchar2(255), + primary key (ID) + ); + + create table STORE_PROC_TO_PROP ( + STORE_PROCESS_PID varchar2(255) not null, + STORE_PROPERTY_ID number(19,0) not null, + primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID), + unique (STORE_PROPERTY_ID) + ); + + create table STORE_VERSIONS ( + ID number(19,0) not null, + VERSION number(19,0), + primary key (ID) + ); + + create sequence hibernate_sequence; \ No newline at end of file Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/postgres.sql 2010-05-31 07:36:33 UTC (rev 684) @@ -1,5 +1,25 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. +-- + create table ODE_SCHEMA_VERSION(VERSION integer); -insert into ODE_SCHEMA_VERSION values (5); +insert into ODE_SCHEMA_VERSION values (6); + -- Apache ODE - SimpleScheduler Database Schema -- -- Apache Derby scripts by Maciej Szefler. @@ -12,67 +32,242 @@ nodeid char(64), scheduled int NOT NULL DEFAULT 0, transacted int NOT NULL DEFAULT 0, - details bytea, + + 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)); CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); -create table BPEL_ACTIVITY_RECOVERY (ID int8 not null, PIID int8, AID int8, CHANNEL varchar(255), REASON varchar(255), DATE_TIME timestamp, DETAILS bytea, ACTIONS varchar(255), RETRIES int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_CORRELATION_PROP (ID int8 not null, NAME varchar(255), NAMESPACE varchar(255), VALUE varchar(255), CORR_SET_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_CORRELATION_SET (ID int8 not null, VALUE varchar(255), CORR_SET_NAME varchar(255), SCOPE_ID int8, PIID int8, PROCESS_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_CORRELATOR (ID int8 not null, CID varchar(255), PROCESS_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_CORRELATOR_MESSAGE_CKEY (ID int8 not null, CKEY varchar(255), CORRELATOR_MESSAGE_ID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_EVENT (ID int8 not null, IID int8, PID int8, TSTAMP timestamp, TYPE varchar(255), DETAIL text, DATA bytea, SID int8, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_FAULT (ID int8 not null, FAULTNAME varchar(255), DATA bytea, EXPLANATION varchar(4000), LINE_NUM int4, AID int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_INSTANCE (ID int8 not null, INSTANTIATING_CORRELATOR int8, FAULT int8, JACOB_STATE_DATA bytea, PREVIOUS_STATE int2, PROCESS_ID int8, STATE int2, LAST_ACTIVE_DT timestamp, SEQUENCE int8, FAILURE_COUNT int4, FAILURE_DT timestamp, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_MESSAGE (ID int8 not null, MEX int8, TYPE varchar(255), MESSAGE_DATA bytea, MESSAGE_HEADER bytea, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_MESSAGE_EXCHANGE (ID int8 not null, PORT_TYPE varchar(255), CHANNEL_NAME varchar(255), CLIENTKEY varchar(255), ENDPOINT bytea, CALLBACK_ENDPOINT bytea, REQUEST int8, RESPONSE int8, INSERT_DT timestamp, OPERATION varchar(255), STATE varchar(255), PROCESS int8, PIID int8, DIR char(1), PLINK_MODELID int4, PATTERN varchar(255), CORR_STATUS varchar(255), FAULT_TYPE varchar(255), FAULT_EXPL varchar(255), CALLEE varchar(255), PARTNERLINK int8, PIPED_ID varchar(255), SUBSCRIBER_COUNT int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_MEX_PROPS (MEX int8 not null, VALUE varchar(8000), NAME varchar(255) not null, primary key (MEX, NAME)); -create table BPEL_PLINK_VAL (ID int8 not null, PARTNER_LINK varchar(100) not null, PARTNERROLE varchar(100), MYROLE_EPR_DATA bytea, PARTNERROLE_EPR_DATA bytea, PROCESS int8, SCOPE int8, SVCNAME varchar(255), MYROLE varchar(100), MODELID int4, MYSESSIONID varchar(255), PARTNERSESSIONID varchar(255), INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_PROCESS (ID int8 not null, PROCID varchar(255) not null unique, deployer varchar(255), deploydate timestamp, type_name varchar(255), type_ns varchar(255), version int8, ACTIVE_ bool, guid varchar(255), INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_SCOPE (ID int8 not null, PIID int8, PARENT_SCOPE_ID int8, STATE varchar(255) not null, NAME varchar(255) not null, MODELID int4, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_SELECTORS (ID int8 not null, PIID int8 not null, SELGRPID varchar(255) not null, IDX int4 not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255), CORRELATOR int8 not null, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); -create table BPEL_UNMATCHED (ID int8 not null, MEX int8, CORRELATION_KEY varchar(255), CORRELATOR int8 not null, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table BPEL_XML_DATA (ID int8 not null, DATA bytea, NAME varchar(255) not null, SCOPE_ID int8, PIID int8, IS_SIMPLE_TYPE bool, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create table VAR_PROPERTY (ID int8 not null, XML_DATA_ID int8, PROP_VALUE varchar(255), PROP_NAME varchar(255) not null, INSERT_TIME timestamp, MLOCK int4 not null, primary key (ID)); -create index IDX_CORRELATOR_CID on BPEL_CORRELATOR (CID); -create index IDX_BPEL_CORRELATOR_MESSAGE_CKEY on BPEL_CORRELATOR_MESSAGE_CKEY (CKEY); -create index IDX_SELECTOR_CORRELATOR on BPEL_SELECTORS (CORRELATOR); -create index IDX_SELECTOR_CKEY on BPEL_SELECTORS (CORRELATION_KEY); -create index IDX_SELECTOR_SELGRPID on BPEL_SELECTORS (SELGRPID); -create index IDX_UNMATCHED_CKEY on BPEL_UNMATCHED (CORRELATION_KEY); -create index IDX_UNMATCHED_CORRELATOR on BPEL_UNMATCHED (CORRELATOR); -create sequence hibernate_seqhilo; + create table ODE_ACTIVITY_RECOVERY ( + ID int8 not null, + ACTIONS varchar(255), + ACTIVITY_ID int8, + CHANNEL varchar(255), + DATE_TIME timestamp, + DETAILS text, + INSTANCE_ID int8, + REASON varchar(255), + RETRIES int4, + primary key (ID) + ); ---create indexes + create table ODE_CORRELATION_SET ( + CORRELATION_SET_ID int8 not null, + CORRELATION_KEY varchar(255), + NAME varchar(255), + SCOPE_ID int8, + primary key (CORRELATION_SET_ID) + ); -create index IDX_XMLDATA_IID on BPEL_XML_DATA (PIID) ; -create index IDX_XMLDATA_SID on BPEL_XML_DATA (SCOPE_ID) ; -create index IDX_XMLDATA_NAME on BPEL_XML_DATA (NAME) ; -create index IDX_XMLDATA_NAME_SID on BPEL_XML_DATA (NAME, SCOPE_ID) ; -create index IDX_EVENT_IID on BPEL_EVENT (IID) ; -create index IDX_EVENT_PID on BPEL_EVENT (PID) ; -create index IDX_CORR_SET_NAME on BPEL_CORRELATION_SET (CORR_SET_NAME) ; -create index IDX_CORR_SET_SCOPE_ID on BPEL_CORRELATION_SET (SCOPE_ID) ; -create index IDX_BPEL_INSTANCE_PROCESS_ID on BPEL_INSTANCE (PROCESS_ID) ; -create index IDX_BPEL_INSTANCE_STATE on BPEL_INSTANCE (STATE) ; -create index IDX_BPEL_PROCESS_TYPE_NAME on BPEL_PROCESS (type_name) ; -create index IDX_BPEL_PROCESS_TYPE_NS on BPEL_PROCESS (type_ns) ; -create index IDX_BPEL_CORRELATOR_PROCESS_ID on BPEL_CORRELATOR (PROCESS_ID) ; -create index IDX_UNMATCHED_CORRELATOR_CKEY on BPEL_UNMATCHED (CORRELATOR,CORRELATION_KEY) ; -create index IDX_PLINK_VAL_PROCESS_IDX on BPEL_PLINK_VAL (PROCESS) ; -create index IDX_PLINK_VAL_SCOPE on BPEL_PLINK_VAL (SCOPE) ; -create index IDX_PLINK_VAL_MODELID on BPEL_PLINK_VAL (MODELID) ; -create index IDX_SELECTOR_INSTANCE on BPEL_SELECTORS (PIID) ; -create index IDX_VARPROP_XMLDATA on VAR_PROPERTY (XML_DATA_ID) ; -create index IDX_VARPROP_NAME on VAR_PROPERTY (PROP_NAME) ; -create index IDX_VARPROP_VALUE on VAR_PROPERTY (PROP_VALUE) ; -create index IDX_UNMATCHED_MEX on BPEL_UNMATCHED (MEX) ; + create table ODE_CORRELATOR ( + CORRELATOR_ID int8 not null, + CORRELATOR_KEY varchar(255), + PROC_ID int8, + primary key (CORRELATOR_ID) + ); ---Indexes for instance deletion -create index IDX_MESSAGE_MEX on BPEL_MESSAGE(MEX) ; -create index IDX_MESSAGE_EXCHANGE_PIID on BPEL_MESSAGE_EXCHANGE(PIID) ; -create index IDX_SCOPE_PIID on BPEL_SCOPE(PIID) ; \ No newline at end of file + create table ODE_CORSET_PROP ( + ID int8 not null, + CORRSET_ID int8, + PROP_KEY varchar(255), + PROP_VALUE varchar(255), + primary key (ID) + ); + + create table ODE_EVENT ( + EVENT_ID int8 not null, + DETAIL varchar(255), + DATA oid, + SCOPE_ID int8, + TSTAMP timestamp, + TYPE varchar(255), + INSTANCE_ID int8, + PROCESS_ID int8, + primary key (EVENT_ID) + ); + + create table ODE_FAULT ( + FAULT_ID int8 not null, + ACTIVITY_ID int4, + DATA text, + MESSAGE varchar(4000), + LINE_NUMBER int4, + NAME varchar(255), + primary key (FAULT_ID) + ); + + create table ODE_MESSAGE ( + MESSAGE_ID int8 not null, + DATA text, + HEADER text, + TYPE varchar(255), + MESSAGE_EXCHANGE_ID varchar(255), + primary key (MESSAGE_ID) + ); + + create table ODE_MESSAGE_EXCHANGE ( + MESSAGE_EXCHANGE_ID varchar(255) not null, + CALLEE varchar(255), + CHANNEL varchar(255), + CORRELATION_ID varchar(255), + CORRELATION_KEYS varchar(255), + CORRELATION_STATUS varchar(255), + CREATE_TIME timestamp, + DIRECTION char(1), + EPR text, + FAULT varchar(255), + FAULT_EXPLANATION varchar(255), + OPERATION varchar(255), + PARTNER_LINK_MODEL_ID int4, + PATTERN varchar(255), + PIPED_ID varchar(255), + PORT_TYPE varchar(255), + PROPAGATE_TRANS bool, + STATUS varchar(255), + SUBSCRIBER_COUNT int4, + CORR_ID int8, + PARTNER_LINK_ID int8, + PROCESS_ID int8, + PROCESS_INSTANCE_ID int8, + REQUEST_MESSAGE_ID int8, + RESPONSE_MESSAGE_ID int8, + primary key (MESSAGE_EXCHANGE_ID) + ); + + create table ODE_MESSAGE_ROUTE ( + MESSAGE_ROUTE_ID int8 not null, + CORRELATION_KEY varchar(255), + GROUP_ID varchar(255), + ROUTE_INDEX int4, + PROCESS_INSTANCE_ID int8, + ROUTE_POLICY varchar(16), + CORR_ID int8, + primary key (MESSAGE_ROUTE_ID) + ); + + create table ODE_MEX_PROP ( + ID int8 not null, + MEX_ID varchar(255), + PROP_KEY varchar(255), + PROP_VALUE varchar(2000), + primary key (ID) + ); + + create table ODE_PARTNER_LINK ( + PARTNER_LINK_ID int8 not null, + MY_EPR text, + MY_ROLE_NAME varchar(255), + MY_ROLE_SERVICE_NAME varchar(255), + MY_SESSION_ID varchar(255), + PARTNER_EPR text, + PARTNER_LINK_MODEL_ID int4, + PARTNER_LINK_NAME varchar(255), + PARTNER_ROLE_NAME varchar(255), + PARTNER_SESSION_ID varchar(255), + SCOPE_ID int8, + primary key (PARTNER_LINK_ID) + ); + + create table ODE_PROCESS ( + ID int8 not null, + GUID varchar(255), + PROCESS_ID varchar(255), + PROCESS_TYPE varchar(255), + VERSION int8, + primary key (ID) + ); + + create table ODE_PROCESS_INSTANCE ( + ID int8 not null, + DATE_CREATED timestamp, + EXECUTION_STATE oid, + FAULT_ID int8, + LAST_ACTIVE_TIME timestamp, + LAST_RECOVERY_DATE timestamp, + PREVIOUS_STATE int2, + SEQUENCE int8, + INSTANCE_STATE int2, + INSTANTIATING_CORRELATOR_ID int8, + PROCESS_ID int8, + ROOT_SCOPE_ID int8, + primary key (ID) + ); + + create table ODE_SCOPE ( + SCOPE_ID int8 not null, + MODEL_ID int4, + SCOPE_NAME varchar(255), + SCOPE_STATE varchar(255), + PARENT_SCOPE_ID int8, + PROCESS_INSTANCE_ID int8, + primary key (SCOPE_ID) + ); + + create table ODE_XML_DATA ( + XML_DATA_ID int8 not null, + DATA text, + IS_SIMPLE_TYPE bool, + NAME varchar(255), + SCOPE_ID int8, + primary key (XML_DATA_ID) + ); + + create table ODE_XML_DATA_PROP ( + ID int8 not null, + XML_DATA_ID int8, + PROP_KEY varchar(255), + PROP_VALUE varchar(255), + primary key (ID) + ); + + create table STORE_DU ( + NAME varchar(255) not null, + DEPLOYDT timestamp, + DEPLOYER varchar(255), + DIR varchar(255), + primary key (NAME) + ); + + create table STORE_PROCESS ( + PID varchar(255) not null, + STATE varchar(255), + TYPE varchar(255), + VERSION int8, + DU varchar(255), + primary key (PID) + ); + + create table STORE_PROCESS_PROP ( + ID int8 not null, + PROP_KEY varchar(255), + PROP_VAL varchar(255), + primary key (ID) + ); + + create table STORE_PROC_TO_PROP ( + STORE_PROCESS_PID varchar(255) not null, + STORE_PROPERTY_ID int8 not null, + primary key (STORE_PROCESS_PID, STORE_PROPERTY_ID), + unique (STORE_PROPERTY_ID) + ); + + create table STORE_VERSIONS ( + ID int8 not null, + VERSION int8, + primary key (ID) + ); + + create sequence hibernate_sequence; \ No newline at end of file Modified: trunk/runtime/engine-assembly/src/main/resources/bpel.properties =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel.properties 2010-05-31 07:27:51 UTC (rev 683) +++ trunk/runtime/engine-assembly/src/main/resources/bpel.properties 2010-05-31 07:36:33 UTC (rev 684) @@ -53,7 +53,8 @@ ## DAO Connection Factory class. ## uncomment the following for hibernate. -bpel.dao.factory=org.apache.ode.daohib.bpel.BpelDAOConnectionFactoryImpl +bpel.dao.factory=org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl +bpel.dao.factory.store=org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl ## Transaction Factory ## default is org.apache.ode.il.EmbeddedGeronimoFactory @@ -86,6 +87,7 @@ #bpel.extension.bundles.validation = bpel.db.mode=EXTERNAL +db.emb.create=false bpel.db.ext.dataSource=java:BPELDB # if set to true will self-register BPEL endpoints upon deployment to a UDDI. # this uses the juddi-client-3.0.0 and the uddi client config can be set in the uddi.xml

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r683 - branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-05-31 03:27:51 -0400 (Mon, 31 May 2010) New Revision: 683 Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java Log: * update it to "true" by default for unit testing. Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java 2010-05-31 06:39:26 UTC (rev 682) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java 2010-05-31 07:27:51 UTC (rev 683) @@ -108,7 +108,7 @@ props.put(HibernateUtil.PROP_GUID, guid); } - if (Boolean.valueOf(odeConfig.getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_CREATE, "false"))) { + if (Boolean.valueOf(odeConfig.getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_CREATE, "true"))) { props.put(Environment.HBM2DDL_AUTO, "create-drop"); __log.debug("create-drop DDL by Hibernate automatically"); }

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r682 - in branches/ODE/ODE-1.x-jpa: dao-jpa-hibernate and 4 other directories.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2010-05-31 02:39:26 -0400 (Mon, 31 May 2010) New Revision: 682 Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/files/hibernate.cfg/postgres.properties branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-hsql.sql branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-mysql.sql branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-oracle.sql branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-postgres.sql branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java Log: * fix the JPA SQL's in the hibernate testing. * make the id as Long data type for its consistence. * update the ODE_JOB column name. Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -45,10 +45,10 @@ @Entity @Table(name = "ODE_MESSAGE") -@NamedQueries( { @NamedQuery(name = MessageDAOImpl.DELETE_MESSAGES_BY_PROCESS, query = "delete from MessageDAOImpl as m where m._messageExchange._process = :process") }) +@NamedQueries( { @NamedQuery(name = MessageDAOImpl.DELETE_MESSAGES_BY_MEXIDS, query = "delete from MessageDAOImpl as m where m._messageExchange._id in (:mexIds)") }) public class MessageDAOImpl implements MessageDAO { private static Log __log = LogFactory.getLog(MessageDAOImpl.class); - public final static String DELETE_MESSAGES_BY_PROCESS = "DELETE_MESSAGES_BY_PROCESS"; + public final static String DELETE_MESSAGES_BY_MEXIDS = "DELETE_MESSAGES_BY_MEXIDS"; @Id @Column(name = "MESSAGE_ID") @@ -64,6 +64,7 @@ @Lob @Column(name = "HEADER") private String _header; + @ManyToOne(fetch = FetchType.LAZY, cascade = { CascadeType.ALL }) @JoinColumn(name = "MESSAGE_EXCHANGE_ID") private MessageExchangeDAOImpl _messageExchange; Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -181,7 +181,7 @@ public String getMessageExchangeId() { //return _messageExchangeId; - return _id.toString(); + return _id; } public String getOperation() { @@ -308,10 +308,17 @@ public void setResponse(MessageDAO msg) { _response = (MessageDAOImpl)msg; + if (__log.isDebugEnabled()) { + __log.debug("-----> response data: " + DOMUtils.domToString(this._response.getData()) + ", id: " + this._id); + } + } public void setStatus(String status) { _status = status; + if (__log.isDebugEnabled()){ + __log.debug("-------> status " + _status + ", id :" + this._id); + } } public String getPipedMessageExchangeId() { Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -62,7 +62,7 @@ @SuppressWarnings("unused") @Basic @Column(name="PROCESS_INSTANCE_ID", insertable=false, updatable=false, nullable=true) - private int _instanceId; + private Long _instanceId; @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PROCESS_INSTANCE_ID") private ProcessInstanceDAOImpl _processInst; Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -133,10 +133,11 @@ // delete routes Collection instanceIds = getEM().createNamedQuery(ProcessInstanceDAOImpl.SELECT_INSTANCE_IDS_BY_PROCESS).setParameter("process", this).getResultList(); batchUpdateByIds(instanceIds.iterator(), getEM().createNamedQuery(MessageRouteDAOImpl.DELETE_MESSAGE_ROUTES_BY_INSTANCE_IDS), "instanceIds"); - getEM().createNamedQuery(CorrelatorDAOImpl.DELETE_CORRELATORS_BY_PROCESS).setParameter("process", this).executeUpdate(); deleteInstances(Integer.MAX_VALUE); + getEM().createNamedQuery(CorrelatorDAOImpl.DELETE_CORRELATORS_BY_PROCESS).setParameter("process", this).executeUpdate(); + // delete process dao getEM().remove(this); // This deletes CorrelatorDAO getEM().flush(); @@ -177,8 +178,8 @@ @SuppressWarnings("unchecked") private void deleteMessages() { - getEM().createNamedQuery(MessageDAOImpl.DELETE_MESSAGES_BY_PROCESS).setParameter("process", this).executeUpdate(); Collection mexIds = getEM().createNamedQuery(MessageExchangeDAOImpl.SELECT_MEX_IDS_BY_PROCESS).setParameter("process", this).getResultList(); + batchUpdateByIds(mexIds.iterator(), getEM().createNamedQuery(MessageDAOImpl.DELETE_MESSAGES_BY_MEXIDS), "mexIds"); batchUpdateByIds(mexIds.iterator(), getEM().createNamedQuery(MexProperty.DELETE_MEX_PROPERTIES_BY_MEX_IDS), "mexIds"); getEM().createNamedQuery(MessageExchangeDAOImpl.DELETE_MEXS_BY_PROCESS).setParameter("process", this).executeUpdate(); } Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -108,7 +108,7 @@ @SuppressWarnings("unused") @Basic @Column(name="FAULT_ID", insertable=false, updatable=false, nullable=true) - private long _faultId; + private Long _faultId; @OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) @JoinColumn(name="FAULT_ID") private FaultDAOImpl _fault; @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PROCESS_ID") Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml 2010-05-31 06:39:26 UTC (rev 682) @@ -32,20 +32,9 @@ <mkdir dir="target/db" /> <mkdir dir="${db.scripts.dir}" /> -  - <create-ddl db="hsql"/> - -  - <create-ddl db="mysql"/> - -  <create-ddl db="oracle"/> -  - <create-ddl db="postgres"/> - <create-ddl db="hsql"/> - </target> <!-- Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/files/hibernate.cfg/postgres.properties =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/files/hibernate.cfg/postgres.properties 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/files/hibernate.cfg/postgres.properties 2010-05-31 06:39:26 UTC (rev 682) @@ -1 +1 @@ -dialect=org.hibernate.dialect.PostgresDialect \ No newline at end of file +dialect=org.hibernate.dialect.PostgreSQLDialect \ No newline at end of file Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -19,6 +19,7 @@ package org.apache.ode.dao.jpa.hibernate; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import java.util.Properties; @@ -84,6 +85,8 @@ static Map buildConfig(String prefix, Properties odeConfig, TransactionManager txm, DataSource ds) { Map props = new HashMap(_defaultProperties); + + addEntries(prefix, odeConfig, props); String guid = new GUID().toString(); if (ds != null) { @@ -105,15 +108,24 @@ props.put(HibernateUtil.PROP_GUID, guid); } - if (Boolean.valueOf(odeConfig.getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_CREATE, "true"))) { + if (Boolean.valueOf(odeConfig.getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_CREATE, "false"))) { props.put(Environment.HBM2DDL_AUTO, "create-drop"); + __log.debug("create-drop DDL by Hibernate automatically"); } // Isolation levels override; when you use a ConnectionProvider, this has no effect //String level = System.getProperty("ode.connection.isolation", "2"); //props.put(Environment.ISOLATION, level); - addEntries(prefix, odeConfig, props); + + if (__log.isDebugEnabled()) { + __log.debug("========= Hibernate properties =============="); + for (Iterator it = props.keySet().iterator(); it.hasNext(); ) { + Object key = it.next(); + __log.debug("key : " + key + ", value : " + props.get(key)); + } + __log.debug("=============================================="); + } return props; } @@ -130,6 +142,8 @@ } else { props.put(jpaKey, me.getValue()); } + } else if (key.startsWith("hibernate")) { + props.put(key, me.getValue()); } } } Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-05-31 06:39:26 UTC (rev 682) @@ -45,7 +45,7 @@ <properties> <property name="hibernate.show_sql" value="false" /> - <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.OracleDialect" /> <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" /> Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-hsql.sql =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-hsql.sql 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-hsql.sql 2010-05-31 06:39:26 UTC (rev 682) @@ -4,7 +4,7 @@ -- -- -CREATE TABLE ode_job ( +CREATE TABLE ODE_JOB ( jobid CHAR(64) NOT NULL DEFAULT '', ts BIGINT NOT NULL DEFAULT 0, nodeid char(64), @@ -24,6 +24,6 @@ PRIMARY KEY(jobid)); -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-mysql.sql =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-mysql.sql 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-mysql.sql 2010-05-31 06:39:26 UTC (rev 682) @@ -18,7 +18,7 @@ type varchar(255), channel varchar(255), correlatorId varchar(255), - correlationKey varchar(255), + correlationKeySet varchar(255), retryCount int, inMem int, detailsExt blob(4096), Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-oracle.sql =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-oracle.sql 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-oracle.sql 2010-05-31 06:39:26 UTC (rev 682) @@ -4,9 +4,9 @@ -- -- -DROP TABLE ode_job; +DROP TABLE ODE_JOB; -CREATE TABLE ode_job ( +CREATE TABLE ODE_JOB ( jobid VARCHAR(64) NOT NULL, ts number(37) NOT NULL, nodeid varchar(64), @@ -19,14 +19,14 @@ type varchar(255), channel varchar(255), correlatorId varchar(255), - correlationKey varchar(255), + correlationKeySet varchar(255), retryCount int, inMem int, detailsExt blob, PRIMARY KEY(jobid)); -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-postgres.sql =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-postgres.sql 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-postgres.sql 2010-05-31 06:39:26 UTC (rev 682) @@ -4,7 +4,7 @@ -- -- -CREATE TABLE ode_job ( +CREATE TABLE ODE_JOB ( jobid CHAR(64) NOT NULL DEFAULT '', ts BIGINT NOT NULL DEFAULT 0, nodeid char(64), @@ -17,14 +17,14 @@ type varchar(255), channel varchar(255), correlatorId varchar(255), - correlationKey varchar(255), + correlationKeySet varchar(255), retryCount int, inMem int, detailsExt bytea, PRIMARY KEY(jobid)); -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid);

14 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

riftsaw-commits May 2010