Author: jeff.yuchang Date: 2010-10-07 01:51:29 -0400 (Thu, 07 Oct 2010) New Revision: 1024 Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/db/build.xml branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml branches/RiftSaw-2.1.x/integration-tests/build.xml branches/RiftSaw-2.1.x/qa/build.xml branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jdk5.sh branches/RiftSaw-2.1.x/qa/hudson-riftsaw-local.sh branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql Log: * RIFTSAW-269: update blob and clob size for db2 schema. * refactored the downloading mechanism for db2 and oracle jdbc driver. Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/db/build.xml =================================================================== --- branches/RiftSaw-2.1.x/distribution/src/main/release/db/build.xml 2010-10-06 18:42:15 UTC (rev 1023) +++ branches/RiftSaw-2.1.x/distribution/src/main/release/db/build.xml 2010-10-07 05:51:29 UTC (rev 1024) @@ -6,15 +6,7 @@ <property name="database" value="postgres" /> <property file="jdbc/${database}.properties" /> - - <condition property="is.ojdbc.available"> - <available file="${basedir}/../../libs/ojdbc14.jar" /> - </condition> - <condition property="is.db2jdbc.available"> - <available file="${basedir}/../../libs/db2jcc.jar" /> - </condition> - <condition property="show.table.sql" value="show tables;"> <equals arg1="${database}" arg2="mysql" /> </condition> @@ -42,18 +34,10 @@ <echo message="connection url....... ${connection.url}" /> <echo message="username.. ${username}" /> </target> - - <target name="copy.ojdbc" if="is.ojdbc.available"> - <copy file="${basedir}/../../libs/ojdbc14.jar" todir="${basedir}/drivers"/> - </target> - <target name="copy.db2jdbc" if="is.db2jdbc.available"> - <copy file="${basedir}/../../libs/db2jcc.jar" todir="${basedir}/drivers"/> - </target> - <!-- ### CREATE RiftSaw SCHEMA ############################################# --> <target name="create.riftsaw.schema" - depends="log.properties, copy.ojdbc" + depends="log.properties" description="creates the riftsaw tables in the database"> <sql driver="${driver}" url="${connection.url}" @@ -71,7 +55,7 @@ <!-- ### DROP RiftSaw SCHEMA ############################################### --> <target name="drop.riftsaw.schema" - depends="log.properties, copy.ojdbc" + depends="log.properties" description="drops the riftsaw tables from the database"> <sql driver="${driver}" url="${connection.url}" @@ -89,7 +73,7 @@ <!-- ### Show tables in the database ############################### --> <target name="db.show.tables" - depends="log.properties, copy.ojdbc" + depends="log.properties" description="show tables in db"> <sql driver="${driver}" url="${connection.url}" Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml =================================================================== --- branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml 2010-10-06 18:42:15 UTC (rev 1023) +++ branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml 2010-10-07 05:51:29 UTC (rev 1024) @@ -140,14 +140,6 @@ </copy> </target> - <target name="internal.install.riftsaw.into.jboss.db.derby"> - <copy todir="${server.lib.dir}" overwrite="true"> - <fileset dir="../db/drivers"> - <include name="derby*.jar"/> - </fileset> - </copy> - </target> - <target name="internal.install.riftsaw.into.jboss.db.mysql"> <copy todir="${deploy.dir}/${bpel-runtime}/lib" overwrite="true"> <fileset dir="../db/drivers"> @@ -187,13 +179,8 @@ </target> <!-- uninstall database specific driver --> - <target name="internal.uninstall.riftsaw.into.jboss.db.hsql" /> + <target name="internal.uninstall.riftsaw.into.jboss.db.hsql" /> - <target name="internal.uninstall.riftsaw.into.jboss.db.derby"> - <delete file="${server.lib.dir}/derby-10.4.1.3.jar"/> - <delete file="${server.lib.dir}/derbytools-10.4.1.3.jar"/> - </target> - <target name="internal.uninstall.riftsaw.into.jboss.db.mysql" /> <target name="internal.uninstall.riftsaw.into.jboss.db.sqlserver" /> Modified: branches/RiftSaw-2.1.x/integration-tests/build.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-10-06 18:42:15 UTC (rev 1023) +++ branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-10-07 05:51:29 UTC (rev 1024) @@ -4,34 +4,54 @@ <property name="replace.qa.jdbc" value="true" /> <property name="startup.time" value="1" /> <property name="ws.stack" value="native" /> + <property name="download.dir" value="${basedir}/downloads" /> <property file="${riftsaw.test.deployment.properties}" /> + + <property name="oracle.driver.path" value="${download.dir}/ojdbc14.jar" /> + <property name="db2.driver.path" value="${download.dir}/db2jcc.jar" /> + + <property name="ojdbc.url" value="http://www.qa.jboss.com/jdbc-drivers/maven2/com/oracle/ojdbc1... + <property name="db2driver.url" value = "http://www.qa.jboss.com/jdbc-drivers/maven2/com/ibm/db2jcc/3.58.82/db2jcc-3.58.82.jar" /> <condition property="is.cxf.ws.stack"> <equals arg1="${ws.stack}" arg2="cxf"/> + </condition> + + <condition property="is.replace.qa.jdbc"> + <equals arg1="true" arg2="${replace.qa.jdbc}" /> + </condition> + + <condition property="is.oracle.driver.available"> + <available file="${oracle.driver.path}" /> </condition> - - <condition property="is.ojdbc.available"> - <available file="${basedir}/../distribution/target/libs/ojdbc14.jar" /> - </condition> - <condition property="is.db2driver.available"> - <available file="${basedir}/../distribution/target/libs/db2jcc.jar" /> - </condition> - - <condition property="is.replace.qa.jdbc"> - <equals arg1="true" arg2="${replace.qa.jdbc}" /> - </condition> + <condition property="is.db2.driver.available"> + <available file="${db2.driver.path}" /> + </condition> + + <target name="get.oracle.driver" + unless="is.oracle.driver.available" + description="Download oracle jdbc"> + <mkdir dir="${download.dir}" /> + <get dest="${oracle.driver.path}" src="${ojdbc.url}"/> + </target> - <target name="copy.ojdbc" if="is.ojdbc.available"> - <copy file="${basedir}/../distribution/target/libs/ojdbc14.jar" - todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/drivers"/> - </target> + <target name="get.db2.driver" + unless="is.db2.driver.available" + description="Download db2 jdbc driver"> + <mkdir dir="${download.dir}" /> + <get dest="${db2.driver.path}" src="${db2driver.url}"/> + </target> - <target name="copy.db2driver" if="is.db2driver.available"> - <copy file="${basedir}/../distribution/target/libs/db2jcc.jar" - todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/drivers"/> - </target> + <target name="copy.db.drivers"> + <echo>Copying oracle and db2 jdbc drivers</echo> + <copy todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/drivers"> + <fileset dir="${download.dir}"> + <include name="*.jar" /> + </fileset> + </copy> + </target> <target name="copy.rosetta.aop"> <copy file="${dependency.rosetta.aop}" @@ -47,12 +67,11 @@ </copy> </target> - <target name="unpack-distribution"> + <target name="unpack-distribution" depends="get.oracle.driver, get.db2.driver"> <mkdir dir="${basedir}/../distribution/target/dist"/> <unzip dest="${basedir}/../distribution/target/dist" src="${basedir}/../distribution/target/riftsaw-${riftsaw.engine.version}.zip"/> - <antcall target="copy.ojdbc" /> - <antcall target="copy.db2driver" /> + <antcall target="copy.db.drivers" /> </target> <target name="deploy-riftsaw" > Modified: branches/RiftSaw-2.1.x/qa/build.xml =================================================================== --- branches/RiftSaw-2.1.x/qa/build.xml 2010-10-06 18:42:15 UTC (rev 1023) +++ branches/RiftSaw-2.1.x/qa/build.xml 2010-10-07 05:51:29 UTC (rev 1024) @@ -27,6 +27,8 @@ <property name="jbossesb.filename" value="jbossesb-${jbossesb.version}.zip" /> <property name="jbossesb.distro.url" value="http://download.jboss.org/jbossesb/${jbossesb.version}/binary... /> <property name="jbossesb.distro.path" value="${download.dir}/${jbossesb.filename}" /> + <property name="oracle.driver.path" value="${download.dir}/ojdbc14.jar" /> + <property name="db2.driver.path" value="${download.dir}/db2jcc.jar" /> <property name="soa.p.version" value="5.0.0.GA"/> <property name="soa.p.filename" value="soa-${soa.p.version}.zip" /> @@ -60,7 +62,13 @@ <condition property="is.soa-p.distro.available"> <available file="${soa.p.distro.path}" /> </condition> - + <condition property="is.oracle.driver.available"> + <available file="${oracle.driver.path}" /> + </condition> + <condition property="is.db2.driver.available"> + <available file="${db2.driver.path}" /> + </condition> + <condition property="is.oracle"> <equals arg1="oracle" arg2="${database}"/> </condition> @@ -92,7 +100,7 @@ <!-- ### INSTALL JBOSS ESB Server################################################## --> <target name="install.jbossesb" - depends="get.jboss, get.jbossesb" + depends="get.jboss, get.jbossesb, get.oracle.driver, get.db2.driver" description="Install JBoss ESB into JBoss AS server"> <unzip src="${jboss.distro.path}" dest="${jboss.parent.dir}" /> <chmod perm="a+x" file="${jboss.home}/bin/run.sh" os="Linux, Mac OS X" /> @@ -104,9 +112,6 @@ <property name="org.jboss.esb.server.home" value="${jboss.home}" /> <property name="org.jboss.esb.server.config" value="${org.jboss.as.config}" /> </ant> - - <antcall target="get.ojdbc" /> - <antcall target="get.db2driver" /> </target> @@ -120,11 +125,14 @@ <property name="org.jboss.as.home" value="${jboss.home}" /> <property name="org.jboss.as.config" value="${org.jboss.as.config}" /> </ant> + + <antcall target="copy.db.drivers" /> + </target> <!-- ### INSTALL SOA-P ################################################## --> <target name="install.soa-p" - depends="get.soa-p, get.jbossesb" + depends="get.soa-p, get.jbossesb, get.oracle.driver, get.db2.driver" description="Install SOA-P"> <unzip src="${soa.p.distro.path}" dest="${riftsaw.home}" /> <chmod perm="a+x" file="${soa.p.home}/bin/run.sh" os="Linux, Mac OS X" /> @@ -132,10 +140,9 @@ <!-- unpack jbosses distro was because we need the jbossesb.home/lib for now--> <unzip src="${jbossesb.distro.path}" dest="${riftsaw.home}" /> - - <antcall target="get.ojdbc" /> - <antcall target="get.db2driver" /> + <antcall target="copy.db.drivers" /> + <antcall target="remove.security.constraints" /> </target> @@ -156,18 +163,18 @@ <get src="${jbossesb.distro.url}" dest="${jbossesb.distro.path}" /> </target> - <target name="get.ojdbc" - if="is.oracle" + <target name="get.oracle.driver" + unless="is.oracle.driver.available" description="Download oracle jdbc"> - <mkdir dir="../distribution/target/libs"/> - <get dest="../distribution/target/libs/ojdbc14.jar" src="${ojdbc.url}"/> + <mkdir dir="${download.dir}" /> + <get dest="${oracle.driver.path}" src="${ojdbc.url}"/> </target> - <target name="get.db2driver" - if="is.db2" + <target name="get.db2.driver" + unless="is.db2.driver.available" description="Download db2 jdbc driver"> - <mkdir dir="../distribution/target/libs"/> - <get dest="../distribution/target/libs/db2jcc.jar" src="${db2jdbc.url}"/> + <mkdir dir="${download.dir}" /> + <get dest="${db2.driver.path}" src="${db2driver.url}"/> </target> <target name="get.soa-p" @@ -180,6 +187,7 @@ <!-- ### Install and Cleanup DB ###################################################### --> <target name="unpack-riftsaw"> <unzip dest="../distribution/target" src="../distribution/target/riftsaw-${riftsaw.version}.zip"/> + <antcall target="copy.db.drivers" /> <antcall target="replace.jdbc.files" /> </target> @@ -204,6 +212,15 @@ </fileset> </copy> </target> + + <target name="copy.db.drivers"> + <echo>Copying oracle and db2 jdbc drivers</echo> + <copy todir="${basedir}/../distribution/target/riftsaw-${riftsaw.version}/db/drivers"> + <fileset dir="${download.dir}"> + <include name="*.jar" /> + </fileset> + </copy> + </target> <target name="replace.jdbc.files" if="is.replace.qa.jdbc"> <echo>Replacing the QA's Lab jdbc files</echo> Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh =================================================================== --- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh 2010-10-06 18:42:15 UTC (rev 1023) +++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh 2010-10-07 05:51:29 UTC (rev 1024) @@ -5,6 +5,7 @@ MAVEN_OPTS="-Xms512M -Xmx1024M" RIFTSAW_PARENT_DIR="$WORKSPACE" +DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" JBOSS_VERSION="5.1.0.GA" RIFTSAW_VERSION="2.1.2-SNAPSHOT" @@ -22,7 +23,7 @@ STARTUP_TIME="6" TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit tests Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh =================================================================== --- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh 2010-10-06 18:42:15 UTC (rev 1023) +++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh 2010-10-07 05:51:29 UTC (rev 1024) @@ -5,6 +5,7 @@ MAVEN_OPTS="-Xms512M -Xmx1024M" RIFTSAW_PARENT_DIR="$WORKSPACE" +DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" JBOSS_VERSION="5.1.0.GA" RIFTSAW_VERSION="2.1.2-SNAPSHOT" @@ -21,7 +22,7 @@ WS_VERSION="3.2.2.GA" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jdk5.sh =================================================================== --- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jdk5.sh 2010-10-06 18:42:15 UTC (rev 1023) +++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jdk5.sh 2010-10-07 05:51:29 UTC (rev 1024) @@ -5,6 +5,8 @@ MAVEN_OPTS="-Xms512M -Xmx1024M" RIFTSAW_PARENT_DIR="$WORKSPACE" +DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" + JBOSS_VERSION="5.1.0.GA" DATABASE="hsql" JBOSS_FILENAME="jboss-$JBOSS_VERSION.zip" @@ -18,7 +20,7 @@ JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Djboss.filename=$JBOSS_FILENAME -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Dws.stack.dir=$WS_STACK_DIR -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Djboss.filename=$JBOSS_FILENAME -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Dws.stack.dir=$WS_STACK_DIR -Ddownload.dir=$DOWNLOAD_DIR -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-local.sh =================================================================== --- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-local.sh 2010-10-06 18:42:15 UTC (rev 1023) +++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-local.sh 2010-10-07 05:51:29 UTC (rev 1024) @@ -4,7 +4,8 @@ MAVEN_OPTS="-Xms512M -Xmx1024M" -RIFTSAW_PARENT_DIR="/local/deploy/riftsaw" +RIFTSAW_PARENT_DIR="/Users/jeffyu/deploy/riftsaw" +DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" JBOSS_VERSION="5.1.0.GA" RIFTSAW_VERSION="2.1.2-SNAPSHOT" @@ -13,15 +14,15 @@ REPLACE_QA_JDBC="true" JBOSS_ESB_VERSION="4.8" JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" -DATABASE="hsql" +DATABASE="db2" -STARTUP_TIME="6" +STARTUP_TIME="3" WS_STACK="native" WS_VERSION="3.2.2.GA" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test @@ -34,7 +35,14 @@ ant $ANT_PROPERTIES clean ant $ANT_PROPERTIES install.jbossesb +# clean up the database +ant $ANT_PROPERTIES drop.riftsaw.schema + # build the RiftSaw and run integration tests cd ../integration-tests mvn $ANT_PROPERTIES clean install + +# clean up the database +cd ../qa +ant $ANT_PROPERTIES drop.riftsaw.schema Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh =================================================================== --- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh 2010-10-06 18:42:15 UTC (rev 1023) +++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh 2010-10-07 05:51:29 UTC (rev 1024) @@ -5,6 +5,8 @@ MAVEN_OPTS="-Xms512M -Xmx1024M" RIFTSAW_PARENT_DIR="$WORKSPACE" +DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" + DATABASE="hsql" RIFTSAW_VERSION="2.1.2-SNAPSHOT" @@ -22,7 +24,7 @@ STARTUP_TIME="6" TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit tests Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh =================================================================== --- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh 2010-10-06 18:42:15 UTC (rev 1023) +++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh 2010-10-07 05:51:29 UTC (rev 1024) @@ -4,6 +4,8 @@ MAVEN_OPTS="-Xms512M -Xmx1024M" RIFTSAW_PARENT_DIR="$WORKSPACE" +DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" + JBOSS_VERSION="5.1.0.GA" DATABASE="hsql" RIFTSAW_VERSION="2.1.2-SNAPSHOT" @@ -20,7 +22,7 @@ STARTUP_TIME="6" TEST_DELAY="40000" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR -Dws.version=$WS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR -Dws.version=$WS_VERSION -Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit test Modified: branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql =================================================================== --- branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql 2010-10-06 18:42:15 UTC (rev 1023) +++ branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql 2010-10-07 05:51:29 UTC (rev 1024) @@ -31,7 +31,7 @@ ACTIVITY_ID bigint, CHANNEL varchar(255), DATE_TIME timestamp, - DETAILS clob(255), + DETAILS clob(4000), INSTANCE_ID bigint, REASON varchar(255), RETRIES integer, @@ -64,7 +64,7 @@ create table BPEL_EVENT ( EVENT_ID bigint generated by default as identity, DETAIL varchar(255), - DATA blob(255), + DATA blob(4096), SCOPE_ID bigint, TSTAMP timestamp, TYPE varchar(255), @@ -76,7 +76,7 @@ create table BPEL_FAULT ( FAULT_ID bigint generated by default as identity, ACTIVITY_ID integer, - DATA clob(255), + DATA clob(4000), MESSAGE varchar(4000), LINE_NUMBER integer, NAME varchar(255), @@ -85,8 +85,8 @@ create table BPEL_MESSAGE ( MESSAGE_ID bigint generated by default as identity, - DATA clob(255), - HEADER clob(255), + DATA clob(4000), + HEADER clob(4000), TYPE varchar(255), MESSAGE_EXCHANGE_ID varchar(255), primary key (MESSAGE_ID) @@ -101,7 +101,7 @@ CORRELATION_STATUS varchar(255), CREATE_TIME timestamp, DIRECTION char(1), - EPR clob(255), + EPR clob(4000), FAULT varchar(255), FAULT_EXPLANATION varchar(255), OPERATION varchar(255), @@ -142,11 +142,11 @@ create table BPEL_PARTNER_LINK ( PARTNER_LINK_ID bigint generated by default as identity, - MY_EPR clob(255), + MY_EPR clob(4000), MY_ROLE_NAME varchar(255), MY_ROLE_SERVICE_NAME varchar(255), MY_SESSION_ID varchar(255), - PARTNER_EPR clob(255), + PARTNER_EPR clob(4000), PARTNER_LINK_MODEL_ID integer, PARTNER_LINK_NAME varchar(255), PARTNER_ROLE_NAME varchar(255), @@ -167,7 +167,7 @@ create table BPEL_PROCESS_INSTANCE ( ID bigint generated by default as identity, DATE_CREATED timestamp, - EXECUTION_STATE blob(255), + EXECUTION_STATE blob(4096), FAULT_ID bigint, LAST_ACTIVE_TIME timestamp, LAST_RECOVERY_DATE timestamp, @@ -192,7 +192,7 @@ create table BPEL_XML_DATA ( XML_DATA_ID bigint generated by default as identity, - DATA clob(255), + DATA clob(4000), IS_SIMPLE_TYPE smallint, NAME varchar(255), SCOPE_ID bigint,