Author: thomas.diesler(a)jboss.com
Date: 2007-05-12 17:46:32 -0400 (Sat, 12 May 2007)
New Revision: 3061
Modified:
trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
Log:
Fix jbws42 hudson
Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-12
21:35:09 UTC (rev 3060)
+++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-12
21:46:32 UTC (rev 3061)
@@ -10,37 +10,20 @@
WORKSPACE=`pwd`
JBWSDIR=$WORKSPACE/jbossws
-SPIDIR=$WORKSPACE/jbossws-spi
-INTDIR=$WORKSPACE/jbws-jboss42
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
ENVIRONMENT="-Djbossws.integration.target=jboss42
-Djboss42.home=$JBOSS_INSTANCE"
#
-# Build jbossws-spi
+# copy ant.properties
#
-cd $SPIDIR
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT thirdparty
-ant $ENVIRONMENT clean main
-
-#
-# Build jbossws
-#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant $ENVIRONMENT thirdparty
-cp $SPIDIR/output/lib/jbossws-spi.jar $JBWSDIR/build/thirdparty/jbossws-spi
-ant $ENVIRONMENT clean main
-
+
#
# Build jbws-jboss42
#
-cd $INTDIR
-cp ant.properties.example ant.properties
-ant $ENVIRONMENT thirdparty
-cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/thirdparty/jbossws-spi
-cp $JBWSDIR/jbossws-core/output/lib/*.jar $INTDIR/thirdparty/jbossws-core
-ant $ENVIRONMENT clean main
+cd $JBWSDIR/jbws-jboss42
+ant $ENVIRONMENT clean deploy
#
# stop jbossas
@@ -48,12 +31,6 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
#
-# deploy to jboss
-#
-cd $INTDIR
-ant $ENVIRONMENT deploy
-
-#
# start jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start
@@ -62,7 +39,6 @@
#
# execute tests
#
-cd $JBWSDIR/jbossws-tests
ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u