Author: jeff.yuchang Date: 2011-01-15 08:11:36 -0500 (Sat, 15 Jan 2011) New Revision: 1233 Modified: branches/RiftSaw-2.2.x/qa/build.xml branches/RiftSaw-2.2.x/qa/hudson-riftsaw-local.sh Log: * update the build script, only to get the db2 or oracle driver if it needs it. Modified: branches/RiftSaw-2.2.x/qa/build.xml =================================================================== --- branches/RiftSaw-2.2.x/qa/build.xml 2011-01-13 11:32:56 UTC (rev 1232) +++ branches/RiftSaw-2.2.x/qa/build.xml 2011-01-15 13:11:36 UTC (rev 1233) @@ -8,7 +8,7 @@ <fail message="property riftsaw.parent.dir must be specified" unless="riftsaw.parent.dir" /> <!-- CONFIGURABLE PROPERTIES --> - <property name="database" value="hsqldb" /> + <property name="database" value="hsql" /> <property name="riftsaw.version" value="2.2.0-SNAPSHOT" /> <property name="riftsaw.home" value="${riftsaw.parent.dir}/riftsaw-${riftsaw.version}" /> <!-- riftsaw.home should not be configured. change riftsaw.parent.dir instead --> @@ -64,11 +64,21 @@ </condition> <condition property="is.oracle.driver.available"> - <available file="${oracle.driver.path}" /> + <or> + <available file="${oracle.driver.path}" /> + <not> + <equals arg1="oracle" arg2="${database}" /> + </not> + </or> </condition> <condition property="is.db2.driver.available"> - <available file="${db2.driver.path}" /> + <or> + <available file="${db2.driver.path}" /> + <not> + <equals arg1="db2" arg2="${database}" /> + </not> + </or> </condition> <condition property="is.replace.qa.jdbc"> Modified: branches/RiftSaw-2.2.x/qa/hudson-riftsaw-local.sh =================================================================== --- branches/RiftSaw-2.2.x/qa/hudson-riftsaw-local.sh 2011-01-13 11:32:56 UTC (rev 1232) +++ branches/RiftSaw-2.2.x/qa/hudson-riftsaw-local.sh 2011-01-15 13:11:36 UTC (rev 1233) @@ -4,7 +4,7 @@ MAVEN_OPTS="-Xms512M -Xmx1024M" -RIFTSAW_PARENT_DIR="/Users/jeffyu/deploy/riftsaw" +RIFTSAW_PARENT_DIR="/home/jeff/deploy/riftsaw" DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" JBOSS_VERSION="5.1.0.GA" @@ -14,7 +14,7 @@ REPLACE_QA_JDBC="true" JBOSS_ESB_VERSION="4.9" JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" -DATABASE="postgres" +DATABASE="hsql" STARTUP_TIME="3" @@ -36,7 +36,7 @@ ant $ANT_PROPERTIES install.jbossesb # clean up the database -ant $ANT_PROPERTIES drop.riftsaw.schema +#ant $ANT_PROPERTIES drop.riftsaw.schema # build the RiftSaw and run integration tests @@ -45,4 +45,4 @@ # clean up the database cd ../qa -ant $ANT_PROPERTIES drop.riftsaw.schema +#ant $ANT_PROPERTIES drop.riftsaw.schema