Author: jeff.yuchang Date: 2009-11-06 01:55:26 -0500 (Fri, 06 Nov 2009) New Revision: 242 Added: trunk/distribution/src/main/release/db/sql/oracle.drop.sql trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql Modified: trunk/distribution/pom.xml trunk/distribution/src/main/release/db/jdbc/oracle.properties trunk/distribution/src/main/release/db/jdbc/sqlserver.properties trunk/distribution/src/main/release/install/build.xml trunk/integration-tests/build.xml trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql Log: * RIFTSAW-103, fix the oralce, sqlserver sql script. * Make them installed correctly in the installation script. Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2009-11-06 03:58:46 UTC (rev 241) +++ trunk/distribution/pom.xml 2009-11-06 06:55:26 UTC (rev 242) @@ -36,10 +36,12 @@ <properties> <maven.test.skip>true</maven.test.skip> <bpel.version>${project.version}</bpel.version> + <mysql.connector.version>5.0.8</mysql.connector.version> <postgresql.version>8.3-603.jdbc3</postgresql.version> <jtds.version>1.2.2</jtds.version> <derby.version>10.4.1.3</derby.version> + <oracle.version>10.2.0.4</oracle.version> </properties> <dependencies> @@ -167,6 +169,32 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>get.oracle.driver</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <version>${oracle.version}</version> + <destFileName>ojdbc14.jar</destFileName> + </artifactItem> + </artifactItems> + <outputDirectory>target/libs</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> @@ -212,8 +240,11 @@ <url>http://repo1.maven.org/maven2</url> </repository> + <repository> + <id>qa.jboss.com</id> + <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url> + </repository> - <!-- Not all dependencies are resolved when using this repository. Complains about not finding appropriate version of org.eclipse.equinox.app plugin. --> Modified: trunk/distribution/src/main/release/db/jdbc/oracle.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/oracle.properties 2009-11-06 03:58:46 UTC (rev 241) +++ trunk/distribution/src/main/release/db/jdbc/oracle.properties 2009-11-06 06:55:26 UTC (rev 242) @@ -1,5 +1,5 @@ -connection.url=jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa +connection.url=jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10 driver=oracle.jdbc.driver.OracleDriver username=riftsaw -password=riftsaw +password=rsqapwd dialect=org.hibernate.dialect.Oracle9Dialect \ No newline at end of file Modified: trunk/distribution/src/main/release/db/jdbc/sqlserver.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/sqlserver.properties 2009-11-06 03:58:46 UTC (rev 241) +++ trunk/distribution/src/main/release/db/jdbc/sqlserver.properties 2009-11-06 06:55:26 UTC (rev 242) @@ -1,5 +1,5 @@ -connection.url=jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/riftsaw +connection.url=jdbc:jtds:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433/riftsaw driver=net.sourceforge.jtds.jdbc.Driver username=riftsaw -password=riftsaw +password=rsqapwd dialect=org.hibernate.dialect.SQLServerDialect \ No newline at end of file Added: trunk/distribution/src/main/release/db/sql/oracle.drop.sql =================================================================== --- trunk/distribution/src/main/release/db/sql/oracle.drop.sql (rev 0) +++ trunk/distribution/src/main/release/db/sql/oracle.drop.sql 2009-11-06 06:55:26 UTC (rev 242) @@ -0,0 +1,29 @@ +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_MESSAGE_EXCHANGE; +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 LARGE_DATA; +drop table VAR_PROPERTY; +drop table STORE_DU; +drop table STORE_PROCESS; +drop table STORE_PROCESS_PROP; +drop table STORE_VERSIONS; +drop sequence hibernate_sequence; + + + Added: trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql =================================================================== --- trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql (rev 0) +++ trunk/distribution/src/main/release/db/sql/sqlserver.drop.sql 2009-11-06 06:55:26 UTC (rev 242) @@ -0,0 +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_MESSAGE_EXCHANGE; +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 LARGE_DATA; +drop table VAR_PROPERTY; +drop table STORE_DU; +drop table STORE_PROCESS; +drop table STORE_PROCESS_PROP; +drop table STORE_VERSIONS; + + + Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2009-11-06 03:58:46 UTC (rev 241) +++ trunk/distribution/src/main/release/install/build.xml 2009-11-06 06:55:26 UTC (rev 242) @@ -69,6 +69,7 @@ <filterset> <filter token="database" value="${database}"/> </filterset> + </copy> <copy file="../db/bpel.properties" @@ -174,6 +175,13 @@ </copy> </target> + <target name="internal.install.riftsaw.into.jboss.db.oracle"> + <available file="../db/drivers/ojdbc14.jar" property="oracle.driver.jar.available" /> + <fail message="please download the oracle driver jar ojdbc14.jar from oracle and put it in the db/drivers directory" unless="oracle.driver.jar.available" /> + <copy file="../db/drivers/ojdbc14.jar" + todir="${deploy.dir}/${bpel-runtime}/lib" /> + </target> + <!-- uninstall database specific driver --> <target name="internal.uninstall.riftsaw.into.jboss.db.hsql" /> Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2009-11-06 03:58:46 UTC (rev 241) +++ trunk/integration-tests/build.xml 2009-11-06 06:55:26 UTC (rev 242) @@ -11,6 +11,8 @@ <!--copy file="${riftsaw.test.deployment.properties}" tofile="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install/deployment.properties" /--> + <copy file="${basedir}/../distribution/target/libs/ojdbc14.jar" + todir="${basedir}/../distribution/dist/riftsaw-${riftsaw.engine.version}/db/drivers"/> </target> <target name="deploy-riftsaw" > Modified: trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql =================================================================== --- trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql 2009-11-06 03:58:46 UTC (rev 241) +++ trunk/runtime/engine-assembly/resources/bpel-sql/oracle.sql 2009-11-06 06:55:26 UTC (rev 242) @@ -7,13 +7,14 @@ -- CREATE TABLE ode_job ( - jobid CHAR(64) NOT NULL DEFAULT '', - ts BIGINT NOT NULL DEFAULT 0, + jobid CHAR(64) DEFAULT '' NOT NULL, + ts INTEGER DEFAULT 0 NOT NULL, nodeid char(64), - scheduled int NOT NULL DEFAULT 0, - transacted int NOT NULL DEFAULT 0, - details blob(4096), - PRIMARY KEY(jobid)); + scheduled int DEFAULT 0 NOT NULL, + transacted int DEFAULT 0 NOT NULL, + details blob, + PRIMARY KEY(jobid) +); CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); @@ -36,10 +37,10 @@ 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, LDATA_ID number(19,0), 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 LARGE_DATA (ID number(19,0) not null, BIN_DATA blob(2G), INSERT_TIME timestamp, MLOCK number(10,0) not null, primary key (ID)); +create table LARGE_DATA (ID number(19,0) not null, BIN_DATA blob, 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_BPEL_CORRELATOR_MSG_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); Modified: trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql =================================================================== --- trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql 2009-11-06 03:58:46 UTC (rev 241) +++ trunk/runtime/engine-assembly/resources/bpel-sql/sqlserver.sql 2009-11-06 06:55:26 UTC (rev 242) @@ -12,7 +12,7 @@ nodeid char(64), scheduled int NOT NULL DEFAULT 0, transacted int NOT NULL DEFAULT 0, - details blob(4096), + details image null, PRIMARY KEY(jobid)); CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); @@ -36,7 +36,7 @@ create table BPEL_SELECTORS (ID numeric(19,0) identity not null, PIID numeric(19,0) not null, SELGRPID varchar(255) not null, IDX int not null, CORRELATION_KEY varchar(255) not null, PROC_TYPE varchar(255) not null, ROUTE_POLICY varchar(255) null, CORRELATOR numeric(19,0) not null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID), unique (CORRELATION_KEY, CORRELATOR)); create table BPEL_UNMATCHED (ID numeric(19,0) identity not null, MEX numeric(19,0) null, CORRELATION_KEY varchar(255) null, CORRELATOR numeric(19,0) not null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); create table BPEL_XML_DATA (ID numeric(19,0) identity not null, LDATA_ID numeric(19,0) null, NAME varchar(255) not null, SCOPE_ID numeric(19,0) null, PIID numeric(19,0) null, IS_SIMPLE_TYPE tinyint null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); -create table LARGE_DATA (ID numeric(19,0) identity not null, BIN_DATA blob(2G) null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); +create table LARGE_DATA (ID numeric(19,0) identity not null, BIN_DATA image null, INSERT_TIME datetime null, MLOCK int not null, primary key (ID)); create table VAR_PROPERTY (ID numeric(19,0) identity not null, XML_DATA_ID numeric(19,0) null, PROP_VALUE varchar(255) null, PROP_NAME varchar(255) not null, INSERT_TIME datetime null, MLOCK int 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);