[riftsaw-commits] riftsaw SVN: r206 - in trunk: qa and 1 other directory.
Author: jeff.yuchang
Date: 2009-10-28 04:33:40 -0400 (Wed, 28 Oct 2009)
New Revision: 206
Modified:
trunk/integration-tests/build.xml
trunk/integration-tests/pom.xml
trunk/qa/hudson-riftsaw-jboss.sh
Log:
* update the ESB version from 4.6.GA to 4.6
* update the hudson job script.
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2009-10-27 19:19:52 UTC (rev 205)
+++ trunk/integration-tests/build.xml 2009-10-28 08:33:40 UTC (rev 206)
@@ -4,7 +4,7 @@
<property name="riftsaw.engine.version" value="2.0-SNAPSHOT"
/>
<property file="${riftsaw.test.deployment.properties}" />
-
+
<target name="unpack-distribution">
<mkdir dir="${basedir}/../distribution/target/dist"/>
<unzip dest="${basedir}/../distribution/target/dist"
src="${basedir}/../distribution/target/riftsaw-${riftsaw.engine.version}.zip"/>
@@ -67,7 +67,7 @@
<target name="stop-server" >
<echo>Stopping the server</echo>
- <echo>Server is at ${riftsaw.jboss.home}</echo>
+ <echo>Server is at ${org.jboss.esb.server.home}</echo>
<java classname="org.jboss.Shutdown" fork="true"
failonerror="false" resultproperty="shutdown.rc">
<arg line="-s jnp://localhost:1099 --shutdown"/>
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2009-10-27 19:19:52 UTC (rev 205)
+++ trunk/integration-tests/pom.xml 2009-10-28 08:33:40 UTC (rev 206)
@@ -49,13 +49,13 @@
<dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossesb-rosetta</artifactId>
- <version>4.6.GA</version>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossts-common</artifactId>
- <version>4.6.GA</version>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -118,11 +118,11 @@
</ant>
<!-- Cleanup test environment in case of previous failure -->
- <!--
- -->
+ <!--
<ant antfile="${basedir}/build.xml">
<target name="undeploy-riftsaw" />
</ant>
+ -->
<ant antfile="${basedir}/build.xml">
<target name="deploy-riftsaw" />
</ant>
Modified: trunk/qa/hudson-riftsaw-jboss.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jboss.sh 2009-10-27 19:19:52 UTC (rev 205)
+++ trunk/qa/hudson-riftsaw-jboss.sh 2009-10-28 08:33:40 UTC (rev 206)
@@ -9,11 +9,17 @@
ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
+# firstly build the Riftsaw and run unit tests
+echo build RiftSaw and running unit test
+cd ..
+mvn clean install
+
+# run integration test
echo cleanup the RiftSaw HOME
+cd qa
ant $ANT_PROPERTIES clean
ant $ANT_PROPERTIES install.jbossesb
-
DATABASE="hsql"
RIFTSAW_VERSION="2.0-SNAPSHOT"
ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
@@ -22,5 +28,5 @@
echo build the RiftSaw and run integration tests
echo ESB_HOME=$ESB_HOME, ESB_CONIFG=$ESB_CONFIG
-cd ..
-mvn -Dorg.jboss.esb.server.home=$ESB_HOME -Dorg.jboss.esb.server.config=$ESB_CONFIG
-Ddatabase=$DATABASE clean install -P integration
+cd ../integration-tests
+mvn -Dorg.jboss.esb.server.home=$ESB_HOME -Dorg.jboss.esb.server.config=$ESB_CONFIG
-Ddatabase=$DATABASE clean install