Author: jeff.yuchang Date: 2010-10-13 00:42:02 -0400 (Wed, 13 Oct 2010) New Revision: 1038 Modified: trunk/qa/build.xml trunk/qa/hudson-riftsaw-local.sh Log: * fix the qa's db2 & oracle jdbc driver's copying in the integration build. Modified: trunk/qa/build.xml =================================================================== --- trunk/qa/build.xml 2010-10-13 01:44:27 UTC (rev 1037) +++ trunk/qa/build.xml 2010-10-13 04:42:02 UTC (rev 1038) @@ -103,7 +103,7 @@ <!-- ### INSTALL JBOSS ESB Server################################################## --> <target name="install.jbossesb" - depends="install.jbossas, get.jbossesb" + depends="install.jbossas, get.jbossesb, get.oracle.driver, get.db2.driver" description="Install JBoss ESB into JBoss AS server"> <unzip src="${jbossesb.distro.path}" dest="${jboss.parent.dir}" /> @@ -111,9 +111,8 @@ <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" /> + + <antcall target="copy.db.drivers" /> </target> Modified: trunk/qa/hudson-riftsaw-local.sh =================================================================== --- trunk/qa/hudson-riftsaw-local.sh 2010-10-13 01:44:27 UTC (rev 1037) +++ trunk/qa/hudson-riftsaw-local.sh 2010-10-13 04:42:02 UTC (rev 1038) @@ -5,6 +5,7 @@ MAVEN_OPTS="-Xms512M -Xmx1024M" RIFTSAW_PARENT_DIR="/Users/jeffyu/deploy/riftsaw" +DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" JBOSS_VERSION="5.1.0.GA" RIFTSAW_VERSION="2.2.0-SNAPSHOT" @@ -13,15 +14,15 @@ REPLACE_QA_JDBC="true" JBOSS_ESB_VERSION="4.9" JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION" -DATABASE="hsql" +DATABASE="postgres" -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 -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" 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