riftsaw SVN: r1026 - branches/RiftSaw-2.1.x/qa.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-10-07 03:58:23 -0400 (Thu, 07 Oct 2010)
New Revision: 1026
Removed:
branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jdk5.sh
Log:
* remove un-needed jdk5 shell script.
Deleted: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jdk5.sh
===================================================================
--- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jdk5.sh 2010-10-07 07:42:10 UTC (rev 1025)
+++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jdk5.sh 2010-10-07 07:58:23 UTC (rev 1026)
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# Run Riftsaw Integration tests.
-
-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"
-REPLACE_QA_JDBC="true"
-RIFTSAW_VERSION="2.1.0.CR2"
-AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
-AS_CONFIG="default"
-WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
-
-JBOSS_ESB_VERSION="4.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 -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
-cd ..
-mvn clean install
-
-# run integration test
-cd qa
-ant $ANT_PROPERTIES stop-server
-ant $ANT_PROPERTIES clean
-ant $ANT_PROPERTIES install.jbossesb
-
-#build the RiftSaw and run integration tests
-cd ../integration-tests
-mvn $ANT_PROPERTIES clean install
15 years
riftsaw SVN: r1025 - in trunk: distribution/src/main/release/install and 3 other directories.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-10-07 03:42:10 -0400 (Thu, 07 Oct 2010)
New Revision: 1025
Removed:
trunk/qa/hudson-riftsaw-jdk5.sh
Modified:
trunk/distribution/src/main/release/db/build.xml
trunk/distribution/src/main/release/install/build.xml
trunk/integration-tests/build.xml
trunk/qa/build.xml
trunk/qa/hudson-riftsaw-db.sh
trunk/qa/hudson-riftsaw-jboss.sh
trunk/qa/hudson-riftsaw-soa-p.sh
trunk/qa/hudson-riftsaw-ws.sh
trunk/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.
* Removed un-needed jdk5 shell script.
Modified: trunk/distribution/src/main/release/db/build.xml
===================================================================
--- trunk/distribution/src/main/release/db/build.xml 2010-10-07 05:51:29 UTC (rev 1024)
+++ trunk/distribution/src/main/release/db/build.xml 2010-10-07 07:42:10 UTC (rev 1025)
@@ -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: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2010-10-07 05:51:29 UTC (rev 1024)
+++ trunk/distribution/src/main/release/install/build.xml 2010-10-07 07:42:10 UTC (rev 1025)
@@ -145,14 +145,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">
@@ -194,11 +186,6 @@
<!-- uninstall database specific driver -->
<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: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2010-10-07 05:51:29 UTC (rev 1024)
+++ trunk/integration-tests/build.xml 2010-10-07 07:42:10 UTC (rev 1025)
@@ -4,33 +4,44 @@
<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/ojdbc14/10.0.2.0/o..."/>
+ <property name="db2driver.url" value = "http://www.qa.jboss.com/jdbc-drivers/maven2/com/ibm/db2jcc/3.58.82/db2jcc..." />
<condition property="is.cxf.ws.stack">
<equals arg1="${ws.stack}" arg2="cxf"/>
</condition>
+
+ <condition property="is.db2.driver.available">
+ <available file="${db2.driver.path}" />
+ </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.replace.qa.jdbc">
+ <equals arg1="true" arg2="${replace.qa.jdbc}" />
+ </condition>
- <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 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.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 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.rosetta.aop">
@@ -47,12 +58,20 @@
</copy>
</target>
- <target name="unpack-distribution">
+ <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="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: trunk/qa/build.xml
===================================================================
--- trunk/qa/build.xml 2010-10-07 05:51:29 UTC (rev 1024)
+++ trunk/qa/build.xml 2010-10-07 07:42:10 UTC (rev 1025)
@@ -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/${jbossesb...." />
<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,15 +62,15 @@
<condition property="is.soa-p.distro.available">
<available file="${soa.p.distro.path}" />
</condition>
-
- <condition property="is.oracle">
- <equals arg1="oracle" arg2="${database}"/>
- </condition>
- <condition property="is.db2">
- <equals arg1="db2" arg2="${database}" />
- </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.replace.qa.jdbc">
<equals arg1="true" arg2="${replace.qa.jdbc}" />
</condition>
@@ -124,7 +126,7 @@
<!-- ### 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" />
@@ -133,8 +135,7 @@
<!-- 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" />
@@ -156,18 +157,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="${db2driver.url}"/>
+ <mkdir dir="${download.dir}"/>
+ <get dest="${db2.driver.path}" src="${db2driver.url}"/>
</target>
<target name="get.soa-p"
@@ -180,6 +181,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>
@@ -213,6 +215,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="stop-server" >
<echo>Stopping the server</echo>
Modified: trunk/qa/hudson-riftsaw-db.sh
===================================================================
--- trunk/qa/hudson-riftsaw-db.sh 2010-10-07 05:51:29 UTC (rev 1024)
+++ trunk/qa/hudson-riftsaw-db.sh 2010-10-07 07:42:10 UTC (rev 1025)
@@ -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.2.0-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: trunk/qa/hudson-riftsaw-jboss.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jboss.sh 2010-10-07 05:51:29 UTC (rev 1024)
+++ trunk/qa/hudson-riftsaw-jboss.sh 2010-10-07 07:42:10 UTC (rev 1025)
@@ -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.2.0-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 -Dstartup.time=$STARTUP_TIME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
# build RiftSaw and running unit test
Deleted: trunk/qa/hudson-riftsaw-jdk5.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jdk5.sh 2010-10-07 05:51:29 UTC (rev 1024)
+++ trunk/qa/hudson-riftsaw-jdk5.sh 2010-10-07 07:42:10 UTC (rev 1025)
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# Run Riftsaw Integration tests.
-
-MAVEN_OPTS="-Xms512M -Xmx1024M"
-
-RIFTSAW_PARENT_DIR="$WORKSPACE"
-JBOSS_VERSION="5.1.0.GA"
-DATABASE="hsql"
-JBOSS_FILENAME="jboss-$JBOSS_VERSION.zip"
-REPLACE_QA_JDBC="true"
-RIFTSAW_VERSION="2.2.0-SNAPSHOT"
-AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
-AS_CONFIG="default"
-WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
-
-JBOSS_ESB_VERSION="4.9"
-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"
-echo ANT_PROPERTIES=${ANT_PROPERTIES}
-
-# build RiftSaw and running unit test
-cd ..
-mvn clean install
-
-# run integration test
-cd qa
-ant $ANT_PROPERTIES stop-server
-ant $ANT_PROPERTIES clean
-ant $ANT_PROPERTIES install.jbossesb
-
-#build the RiftSaw and run integration tests
-cd ../integration-tests
-mvn $ANT_PROPERTIES clean install
Modified: trunk/qa/hudson-riftsaw-soa-p.sh
===================================================================
--- trunk/qa/hudson-riftsaw-soa-p.sh 2010-10-07 05:51:29 UTC (rev 1024)
+++ trunk/qa/hudson-riftsaw-soa-p.sh 2010-10-07 07:42:10 UTC (rev 1025)
@@ -5,6 +5,9 @@
MAVEN_OPTS="-Xms512M -Xmx1024M"
RIFTSAW_PARENT_DIR="$WORKSPACE"
+DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads"
+
+
DATABASE="hsql"
RIFTSAW_VERSION="2.2.0-SNAPSHOT"
@@ -22,7 +25,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 -Dstartup.time=$STARTUP_TIME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
#build RiftSaw and running unit tests
Modified: trunk/qa/hudson-riftsaw-ws.sh
===================================================================
--- trunk/qa/hudson-riftsaw-ws.sh 2010-10-07 05:51:29 UTC (rev 1024)
+++ trunk/qa/hudson-riftsaw-ws.sh 2010-10-07 07:42:10 UTC (rev 1025)
@@ -4,6 +4,9 @@
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.2.0-SNAPSHOT"
@@ -20,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 -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 -Dstartup.time=$STARTUP_TIME -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
#build RiftSaw and running unit test
Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql
===================================================================
--- trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql 2010-10-07 05:51:29 UTC (rev 1024)
+++ trunk/runtime/engine-assembly/src/main/resources/bpel-sql/db2.sql 2010-10-07 07:42:10 UTC (rev 1025)
@@ -31,7 +31,7 @@
ACTIVITY_ID bigint,
CHANNEL varchar(255),
DATE_TIME timestamp,
- DETAILS clob(1M),
+ 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(1M),
+ 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(1M),
- HEADER clob(1M),
+ 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(1M),
+ 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(1M),
+ MY_EPR clob(4000),
MY_ROLE_NAME varchar(255),
MY_ROLE_SERVICE_NAME varchar(255),
MY_SESSION_ID varchar(255),
- PARTNER_EPR clob(1M),
+ 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(1M),
+ DATA clob(4000),
IS_SIMPLE_TYPE smallint,
NAME varchar(255),
SCOPE_ID bigint,
15 years
Build failed in Hudson: RiftSaw-db2-2.1.x #1
by jboss-qa-internal@redhat.com
See <http://hudson.qa.jboss.com/hudson/job/RiftSaw-db2-2.1.x/1/>
------------------------------------------
[...truncated 2568 lines...]
[INFO] RiftSaw::Runtime::UDDI ................................ SUCCESS [5.442s]
[INFO] RiftSaw::Runtime::Engine-Assembly ..................... SUCCESS [18.355s]
[INFO] RiftSaw::Runtime::JBossESB-BPEL ....................... SUCCESS [6.216s]
[INFO] RiftSaw::Runtime::JBossESB-BPEL-Assembly .............. SUCCESS [3.583s]
[INFO] RiftSaw::Console ...................................... SUCCESS [0.066s]
[INFO] RiftSaw::Console::Integration ......................... SUCCESS [4.388s]
[INFO] RiftSaw::Console::Identity ............................ SUCCESS [0.263s]
[INFO] RiftSaw::Docs ......................................... SUCCESS [0.077s]
[INFO] RiftSaw::Docs::gettingstartedguide .................... SUCCESS [56.582s]
[INFO] RiftSaw::Docs::userguide .............................. SUCCESS [52.764s]
[INFO] RiftSaw::Distribution ................................. SUCCESS [2:01.840s]
[INFO] ------------------------------------------------------------------------
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESSFUL
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 5 minutes 27 seconds
[INFO] Finished at: Tue Sep 28 09:25:18 EDT 2010
[INFO] Final Memory: 190M/712M
[INFO] ------------------------------------------------------------------------
Buildfile: build.xml
BUILD FAILED
/qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/qa/build.xml:70: Element type "equals" must be followed by either attribute specifications, ">" or "/>".
Total time: 0 seconds
Buildfile: build.xml
BUILD FAILED
/qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/qa/build.xml:70: Element type "equals" must be followed by either attribute specifications, ">" or "/>".
Total time: 0 seconds
Buildfile: build.xml
BUILD FAILED
/qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/qa/build.xml:70: Element type "equals" must be followed by either attribute specifications, ">" or "/>".
Total time: 0 seconds
Buildfile: build.xml
BUILD FAILED
/qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/qa/build.xml:70: Element type "equals" must be followed by either attribute specifications, ">" or "/>".
Total time: 0 seconds
[INFO] Scanning for projects...
[INFO] ------------------------------------------------------------------------
[INFO] Building RiftSaw::Integration-Tests
[INFO] task-segment: [clean, install]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean]
[INFO] [site:attach-descriptor]
Downloading: https://repository.jboss.org/nexus/content/repositories/deprecated//woods...
Downloading: https://repository.jboss.org/nexus/content/groups/developer//woodstox/wst...
Downloading: http://repo1.maven.org/maven2/woodstox/wstx-asl/3.2.6/wstx-asl-3.2.6.pom
Downloading: https://repository.jboss.org/nexus/content/repositories/deprecated//woods...
Downloading: https://repository.jboss.org/nexus/content/groups/developer//woodstox/wst...
4/508K
7/508K
11/508K
15/508K
15/508K
19/508K
23/508K
27/508K
31/508K
35/508K
38/508K
42/508K
46/508K
50/508K
54/508K
58/508K
62/508K
66/508K
70/508K
74/508K
78/508K
82/508K
85/508K
89/508K
93/508K
97/508K
101/508K
105/508K
109/508K
113/508K
117/508K
121/508K
124/508K
128/508K
132/508K
136/508K
140/508K
144/508K
148/508K
152/508K
156/508K
160/508K
163/508K
167/508K
171/508K
175/508K
179/508K
183/508K
187/508K
191/508K
195/508K
199/508K
203/508K
207/508K
210/508K
214/508K
218/508K
222/508K
226/508K
230/508K
234/508K
238/508K
242/508K
246/508K
249/508K
253/508K
257/508K
261/508K
265/508K
269/508K
273/508K
277/508K
281/508K
285/508K
288/508K
292/508K
296/508K
300/508K
304/508K
308/508K
312/508K
316/508K
320/508K
324/508K
328/508K
332/508K
335/508K
339/508K
343/508K
347/508K
351/508K
355/508K
359/508K
363/508K
367/508K
371/508K
374/508K
378/508K
382/508K
386/508K
390/508K
394/508K
398/508K
402/508K
406/508K
410/508K
413/508K
417/508K
421/508K
425/508K
429/508K
433/508K
437/508K
441/508K
445/508K
449/508K
453/508K
457/508K
460/508K
464/508K
468/508K
472/508K
476/508K
480/508K
484/508K
488/508K
492/508K
496/508K
499/508K
503/508K
507/508K
508/508K
508K downloaded
[INFO] [antrun:run {execution: deploy-riftsaw}]
[INFO] Executing tasks
unpack-distribution:
[mkdir] Created dir: /qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/distribution/target/dist
[unzip] Expanding: /qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/distribution/target/riftsaw-2.1.2-SNAPSHOT.zip into /qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/distribution/target/dist
copy.ojdbc:
copy.db2driver:
deploy-riftsaw:
replace.jdbc.files:
[echo] Replacing the QA's Lab jdbc files
[copy] Copying 7 files to /qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/distribution/target/dist/riftsaw-2.1.2-SNAPSHOT/db/jdbc
deploy:
internal.install.riftsaw.ws.stack:
[echo] Replacing the Web Service Stack to native-3.2.2.GA
get.ws.stack:
[mkdir] Created dir: <http://hudson.qa.jboss.com/hudson/job/RiftSaw-db2-2.1.x/ws/downloads>
[get] Getting: http://jboss.org/file-access/default/members/jbossws/downloads/jbossws-na...
[get] To: <http://hudson.qa.jboss.com/hudson/job/RiftSaw-db2-2.1.x/ws/downloads/jbos...>
[unzip] Expanding: <http://hudson.qa.jboss.com/hudson/job/RiftSaw-db2-2.1.x/ws/downloads/jbos...> into /qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/distribution/target/dist/riftsaw-2.1.2-SNAPSHOT/install/ws-stack/dist
[copy] Copying 1 file to /qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/distribution/target/dist/riftsaw-2.1.2-SNAPSHOT/install/ws-stack/dist/jbossws-native-bin-dist
target-jboss510:
prepare:
init:
[echo] integration.target=jboss510
undeploy-jboss510:
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] An Ant BuildException has occured: The following error occurred while executing this line:
/qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/integration-tests/build.xml:62: The following error occurred while executing this line:
/qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/distribution/target/dist/riftsaw-2.1.2-SNAPSHOT/install/build.xml:56: The following error occurred while executing this line:
/qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/distribution/target/dist/riftsaw-2.1.2-SNAPSHOT/install/build.xml:212: The following error occurred while executing this line:
/qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/distribution/target/dist/riftsaw-2.1.2-SNAPSHOT/install/ws-stack/dist/jbossws-native-bin-dist/build/build-deploy.xml:108: Not available: <http://hudson.qa.jboss.com/hudson/job/RiftSaw-db2-2.1.x/ws/riftsaw-2.1.2-...>
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 2 minutes 9 seconds
[INFO] Finished at: Tue Sep 28 09:27:32 EDT 2010
[INFO] Final Memory: 96M/648M
[INFO] ------------------------------------------------------------------------
Buildfile: build.xml
BUILD FAILED
/qa/services/hudson/hudson_workspace/workspace/RiftSaw-db2-2.1.x/riftsaw-db2/qa/build.xml:70: Element type "equals" must be followed by either attribute specifications, ">" or "/>".
Total time: 0 seconds
Recording test results
Archiving artifacts
15 years
riftsaw SVN: r1024 - in branches/RiftSaw-2.1.x: distribution/src/main/release/install and 3 other directories.
by riftsaw-commits@lists.jboss.org
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/ojdbc14/10.0.2.0/o..."/>
+ <property name="db2driver.url" value = "http://www.qa.jboss.com/jdbc-drivers/maven2/com/ibm/db2jcc/3.58.82/db2jcc..." />
<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/${jbossesb...." />
<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,
15 years