Author: thomas.diesler(a)jboss.com Date: 2007-01-25 05:20:00 -0500 (Thu, 25 Jan 2007) New Revision: 2102 Added: branches/jbossws-1.2.0/build/etc/jboss.sh Removed: branches/jbossws-1.2.0/build/hudson/jboss/ Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0-jdk14/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml Log: enhance jboss.sh Copied: branches/jbossws-1.2.0/build/etc/jboss.sh (from rev 2101, branches/jbossws-1.2.0/build/hudson/jboss/jboss.sh) =================================================================== --- branches/jbossws-1.2.0/build/etc/jboss.sh (rev 0) +++ branches/jbossws-1.2.0/build/etc/jboss.sh 2007-01-25 10:20:00 UTC (rev 2102) @@ -0,0 +1,35 @@ +#!/bin/sh + +PROGNAME=`basename $0` +JBOSS_HOME="$1" +CMD="$2" + +# +# Helper to complain. +# +warn() { + echo "$PROGNAME: $*" +} + +if [ ! -f "$JBOSS_HOME/bin/run.sh" ]; then + warn "Cannot find: $JBOSS_HOME/bin/run.sh" + exit 1 +fi + +case "$CMD" in +start) + chmod +x $JBOSS_HOME/bin/run.sh + $JBOSS_HOME/bin/run.sh > /dev/null & + sleep 20 + ;; +stop) + chmod +x $JBOSS_HOME/bin/shutdown.sh + $JBOSS_HOME/bin/shutdown.sh -S > /dev/null & + ;; +restart) + $0 stop + $0 start + ;; +*) + echo "usage: $0 jboss_instance (start|stop|restart|help)" +esac \ No newline at end of file Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -22,9 +22,7 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -41,13 +39,13 @@ # # start jbossas # -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start # # execute tests # -./build.sh tests-webservice tests-report +./build.sh tests-webservice tests-report 2>&amp;1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # # copy the test reports @@ -58,7 +56,7 @@ # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -22,9 +22,7 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -48,7 +46,8 @@ # # execute tests # -./build.sh tests-webservice tests-report +./build.sh tests-webservice tests-report 2>&amp;1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # # copy the test reports @@ -59,7 +58,7 @@ # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -22,9 +22,7 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -41,13 +39,13 @@ # # start jbossas # -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start # # execute tests # -./build.sh tests-webservice tests-report +./build.sh tests-webservice tests-report 2>&amp;1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # # copy the test reports @@ -58,7 +56,7 @@ # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -22,9 +22,7 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -41,13 +39,13 @@ # # start jbossas # -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start # # execute tests # -./build.sh tests-webservice tests-report +./build.sh tests-webservice tests-report 2>&amp;1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # # copy the test reports @@ -58,7 +56,7 @@ # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -21,9 +21,7 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -33,8 +31,7 @@ # # start jbossas # -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -45,7 +42,7 @@ # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0-jdk14/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0-jdk14/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0-jdk14/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -21,9 +21,7 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -34,8 +32,7 @@ # start jbossas # export JAVA_HOME=(a)hudson.jdk14@ -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -46,7 +43,7 @@ # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -21,9 +21,7 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -33,8 +31,7 @@ # # start jbossas # -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -45,7 +42,7 @@ # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -21,9 +21,7 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -33,8 +31,7 @@ # # start jbossas # -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -45,7 +42,7 @@ # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -22,9 +22,7 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -34,20 +32,19 @@ # # start jbossas # -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start # # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests | tee $WORKSPACE/tests.out +ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -22,33 +22,31 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss # ant $ENVIRONMENT clean deploy-jboss40-jdk14 +export JAVA_HOME=(a)hudson.jdk14@ + # # start jbossas # -export JAVA_HOME=(a)hudson.jdk14@ -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start # # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests | tee $WORKSPACE/tests.out +ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -22,9 +22,7 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -34,20 +32,19 @@ # # start jbossas # -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 +export JAVA_HOME=(a)hudson.jdk14@ # # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests | tee $WORKSPACE/tests.out +ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -22,9 +22,7 @@ # # stop jbossas # -cp $SVNBASEDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh -chmod +x $JBOSS_INSTANCE/bin/jboss.sh -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -34,20 +32,19 @@ # # start jbossas # -$JBOSS_INSTANCE/bin/jboss.sh start -sleep 30 +export JAVA_HOME=(a)hudson.jdk14@ # # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests | tee $WORKSPACE/tests.out +ant $ENVIRONMENT clean tests 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # # stop jbossas # -$JBOSS_INSTANCE/bin/jboss.sh stop +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-25 07:25:19 UTC (rev 2101) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-25 10:20:00 UTC (rev 2102) @@ -39,7 +39,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests-samples | tee $WORKSPACE/tests.out +ant $ENVIRONMENT clean tests-samples 2>&amp;1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u #