Author: jeff.yuchang Date: 2012-05-08 02:25:48 -0400 (Tue, 08 May 2012) New Revision: 1558 Modified: branches/RiftSaw-2.3.x/qa/hudson-riftsaw-db.sh branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss-as6.sh branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss-no-esb.sh branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss.sh branches/RiftSaw-2.3.x/qa/hudson-riftsaw-local-as6.sh branches/RiftSaw-2.3.x/qa/hudson-riftsaw-local.sh branches/RiftSaw-2.3.x/qa/hudson-riftsaw-soa-p.sh branches/RiftSaw-2.3.x/qa/hudson-riftsaw-ws.sh Log: Added the as.versioin variable in the qa scripts. Modified: branches/RiftSaw-2.3.x/qa/hudson-riftsaw-db.sh =================================================================== --- branches/RiftSaw-2.3.x/qa/hudson-riftsaw-db.sh 2012-05-01 02:03:42 UTC (rev 1557) +++ branches/RiftSaw-2.3.x/qa/hudson-riftsaw-db.sh 2012-05-08 06:25:48 UTC (rev 1558) @@ -12,6 +12,7 @@ AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" REPLACE_QA_JDBC="true" +AS_VERSION="5" JBOSS_ESB_VERSION="4.10" JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" @@ -23,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 -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" +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 -Das.version=$AS_VERSION" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit tests Modified: branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss-as6.sh =================================================================== --- branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss-as6.sh 2012-05-01 02:03:42 UTC (rev 1557) +++ branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss-as6.sh 2012-05-08 06:25:48 UTC (rev 1558) @@ -14,6 +14,7 @@ REPLACE_QA_JDBC="true" JBOSS_ESB_VERSION="4.10" JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" +AS_VERSION="6" STARTUP_TIME="6" TEST_DELAY="40000" @@ -24,7 +25,7 @@ WS_VERSION="3.1.2.GA" # so we don't overwrite the cxf 3.4.1 installed with as6 WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Djboss.filename=jboss-as-distribution-${JBOSS_VERSION}.zip -Das.version=6 -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djboss.version=$JBOSS_VERSION -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 -Dtestesb=false" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Djboss.filename=jboss-as-distribution-${JBOSS_VERSION}.zip -Das.version=6 -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djboss.version=$JBOSS_VERSION -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 -Dtestesb=false -Das.version=$AS_VERSION" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss-no-esb.sh =================================================================== --- branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss-no-esb.sh 2012-05-01 02:03:42 UTC (rev 1557) +++ branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss-no-esb.sh 2012-05-08 06:25:48 UTC (rev 1558) @@ -12,6 +12,7 @@ AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" REPLACE_QA_JDBC="true" +AS_VERSION="5" STARTUP_TIME="6" TEST_DELAY="40000" @@ -20,7 +21,7 @@ WS_VERSION="3.4.0.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 -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY -Dtestesb=false" +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.version=$WS_VERSION -Dws.stack.dir=$WS_STACK_DIR -Dstartup.time=$STARTUP_TIME -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY -Dtestesb=false -Das.version=$AS_VERSION" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss.sh =================================================================== --- branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss.sh 2012-05-01 02:03:42 UTC (rev 1557) +++ branches/RiftSaw-2.3.x/qa/hudson-riftsaw-jboss.sh 2012-05-08 06:25:48 UTC (rev 1558) @@ -13,6 +13,7 @@ REPLACE_QA_JDBC="true" JBOSS_ESB_VERSION="4.10" JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" +AS_VERSION="5" STARTUP_TIME="6" TEST_DELAY="40000" @@ -21,7 +22,7 @@ WS_VERSION="3.1.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 -Ddownload.dir=$DOWNLOAD_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 -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 -Das.version=$AS_VERSION" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: branches/RiftSaw-2.3.x/qa/hudson-riftsaw-local-as6.sh =================================================================== --- branches/RiftSaw-2.3.x/qa/hudson-riftsaw-local-as6.sh 2012-05-01 02:03:42 UTC (rev 1557) +++ branches/RiftSaw-2.3.x/qa/hudson-riftsaw-local-as6.sh 2012-05-08 06:25:48 UTC (rev 1558) @@ -14,6 +14,7 @@ REPLACE_QA_JDBC="true" JBOSS_ESB_VERSION="4.10" JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" +AS_VERSION="6" STARTUP_TIME="3" @@ -23,7 +24,7 @@ WS_VERSION="3.1.2.GA" # so we don't overwrite the cxf 3.4.1 installed with as6 WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" -ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Djboss.filename=jboss-as-distribution-${JBOSS_VERSION}.zip -Das.version=6 -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djboss.version=$JBOSS_VERSION -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 -Dtestesb=false" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Djboss.filename=jboss-as-distribution-${JBOSS_VERSION}.zip -Das.version=6 -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME -Dorg.jboss.as.config=$AS_CONFIG -Djboss.version=$JBOSS_VERSION -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 -Dtestesb=false -Das.version=$AS_VERSION" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: branches/RiftSaw-2.3.x/qa/hudson-riftsaw-local.sh =================================================================== --- branches/RiftSaw-2.3.x/qa/hudson-riftsaw-local.sh 2012-05-01 02:03:42 UTC (rev 1557) +++ branches/RiftSaw-2.3.x/qa/hudson-riftsaw-local.sh 2012-05-08 06:25:48 UTC (rev 1558) @@ -15,6 +15,7 @@ JBOSS_ESB_VERSION="4.10" JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" DATABASE="hsql" +AS_VERSION="5" STARTUP_TIME="3" @@ -22,7 +23,7 @@ WS_VERSION="3.1.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 -Ddownload.dir=$DOWNLOAD_DIR -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 -Ddownload.dir=$DOWNLOAD_DIR" +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Ddownload.dir=$DOWNLOAD_DIR -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 -Ddownload.dir=$DOWNLOAD_DIR -Das.version=$AS_VERSION" echo ANT_PROPERTIES=${ANT_PROPERTIES} # build RiftSaw and running unit test Modified: branches/RiftSaw-2.3.x/qa/hudson-riftsaw-soa-p.sh =================================================================== --- branches/RiftSaw-2.3.x/qa/hudson-riftsaw-soa-p.sh 2012-05-01 02:03:42 UTC (rev 1557) +++ branches/RiftSaw-2.3.x/qa/hudson-riftsaw-soa-p.sh 2012-05-08 06:25:48 UTC (rev 1558) @@ -14,6 +14,7 @@ AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-soa-p.5.0.0/jboss-as" AS_CONFIG="default" REPLACE_QA_JDBC="true" +AS_VERSION="5" JBOSS_ESB_VERSION="4.10" JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" @@ -25,7 +26,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 -Ddownload.dir=$DOWNLOAD_DIR -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 -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY -Das.version=$AS_VERSION" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit tests Modified: branches/RiftSaw-2.3.x/qa/hudson-riftsaw-ws.sh =================================================================== --- branches/RiftSaw-2.3.x/qa/hudson-riftsaw-ws.sh 2012-05-01 02:03:42 UTC (rev 1557) +++ branches/RiftSaw-2.3.x/qa/hudson-riftsaw-ws.sh 2012-05-08 06:25:48 UTC (rev 1558) @@ -14,6 +14,7 @@ AS_CONFIG="default" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" REPLACE_QA_JDBC="true" +AS_VERSION="5" JBOSS_ESB_VERSION="4.10" JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" @@ -23,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 -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 -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY -Dtestesb=false" +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 -Ddownload.dir=$DOWNLOAD_DIR -Dtest.delay=$TEST_DELAY -Dtestesb=false -Das.version=$AS_VERSION" echo ANT_PROPERTIES=${ANT_PROPERTIES} #build RiftSaw and running unit test