Author: jeff.yuchang Date: 2009-11-05 12:28:46 -0500 (Thu, 05 Nov 2009) New Revision: 230 Added: trunk/qa/hudson-riftsaw-ws.sh Modified: trunk/distribution/src/main/release/install/build.xml Log: * RIFTSAW-109, update jbossws-native-3.2.1 in the installer. Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2009-11-05 10:31:44 UTC (rev 229) +++ trunk/distribution/src/main/release/install/build.xml 2009-11-05 17:28:46 UTC (rev 230) @@ -18,6 +18,22 @@ <property name="bpel-esb-examples" value="esb" /> <property name="esb.examples.dir" value="${org.jboss.esb.home}/samples/quickstarts"/> + <!-- ws stack provider --> + <property name="ws.stack" value="default" /> + <property name="ws.version" value="3.2.1.GA" /> + + <property name="ws.stack.distro.url" value="http://www.jboss.org/downloading/?projectId=jbossws&amp;u... /> + <property name="ws.stack.dir" value="ws-stack"/> + + <condition property="keep.ws.stack"> + <equals arg1="${ws.stack}" arg2="default"/> + </condition> + + <condition property="is.ws.stack.distro.available"> + <available file="${ws.stack.dir}/jbossws-${ws.stack}-${ws.version}.zip" /> + </condition> + + <property name="modules" value="../modules" /> <property name="samples" value="../samples" /> @@ -34,6 +50,9 @@ </target> <target name="deploy" description="Deploys BPEL Runtime to the server"> + + <antcall target="internal.install.riftsaw.ws.stack"/> + <echo message="Deploy BPEL runtime to JBoss server" /> <copy todir="${deployers.dir}/${bpel-deployer}"> <fileset dir="${modules}/${bpel-deployer}" /> @@ -94,7 +113,7 @@ <delete dir="${deploy.dir}/${bpel-runtime}" /> <delete file="${deploy.dir}/${jbossesb-bpel}" /> - <!--install appropriate db driver--> + <!--uninstall appropriate db driver--> <antcall target="internal.uninstall.riftsaw.into.jboss.db.${database}" /> <!-- https://jira.jboss.org/jira/browse/RIFTSAW-24 --> @@ -169,4 +188,22 @@ <target name="internal.uninstall.riftsaw.into.jboss.db.postgres" /> + <target name="internal.install.riftsaw.ws.stack" unless="keep.ws.stack"> + <echo>Replacing the Web Service Stack to ${ws.stack}-${ws.version}</echo> + <antcall target="get.ws.stack" /> + <unzip src="${ws.stack.dir}/jbossws-${ws.stack}-${ws.version}.zip" dest="${basedir}/ws-stack/dist/" /> + <copy file="ws-stack/dist/jbossws-${ws.stack}-bin-dist/ant.properties.example" tofile="ws-stack/dist/jbossws-${ws.stack}-bin-dist/ant.properties" /> + <ant dir="${basedir}/ws-stack/dist/jbossws-${ws.stack}-bin-dist" target="deploy-jboss510"> + <property name="jboss510.home" value="${org.jboss.esb.server.home}" /> + <property name="jboss.server.instance" value="${org.jboss.esb.server.config}" /> + </ant> + <!-- JBoss WS install additional juddi, duplicated with JBossESB's juddi one --> + <delete dir="${org.jboss.esb.home}/server/${org.jboss.esb.server.config}/deploy/juddi-service.sar"/> + </target> + + <target name="get.ws.stack" description="download ws stack" unless="is.ws.stack.distro.available"> + <mkdir dir="${ws.stack.dir}" /> + <get src="${ws.stack.distro.url}" dest="${ws.stack.dir}/jbossws-${ws.stack}-${ws.version}.zip" /> + </target> + </project> Added: trunk/qa/hudson-riftsaw-ws.sh =================================================================== --- trunk/qa/hudson-riftsaw-ws.sh (rev 0) +++ trunk/qa/hudson-riftsaw-ws.sh 2009-11-05 17:28:46 UTC (rev 230) @@ -0,0 +1,38 @@ +#!/bin/sh +# +# Run Riftsaw Integration tests. + +MAVEN_OPTS="-Xms512M -Xmx1024M" +RIFTSAW_PARENT_DIR="$WORKSPACE" +JBOSS_VERSION="5.1.0.GA" +DATABASE="hsql" + +ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE" +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 + +# clean up the database +echo clean up the database + +#ant $ANT_PROPERTIES drop.riftsaw.schema + +RIFTSAW_VERSION="2.0-SNAPSHOT" +ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" +ESB_CONFIG="default" +WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" + +echo build the RiftSaw and run integration tests +echo ESB_HOME=$ESB_HOME, ESB_CONIFG=$ESB_CONFIG + +cd ../integration-tests +mvn -Dorg.jboss.esb.server.home=$ESB_HOME -Dorg.jboss.esb.server.config=$ESB_CONFIG -Ddatabase=$DATABASE -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR clean install Property changes on: trunk/qa/hudson-riftsaw-ws.sh ___________________________________________________________________ Name: svn:executable + *