[jbossws-commits] JBossWS SVN: r2058 - in branches/jbossws-1.2.0/build: ant-import and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Jan 24 05:31:56 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-01-24 05:31:56 -0500 (Wed, 24 Jan 2007)
New Revision: 2058
Added:
branches/jbossws-1.2.0/build/ant-import/build-hudson.xml
Modified:
branches/jbossws-1.2.0/build/ant-import/build-setup.xml
branches/jbossws-1.2.0/build/ant.properties.example
branches/jbossws-1.2.0/build/build.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml
Log:
Use svn.basename
Added: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-hudson.xml (rev 0)
+++ branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-24 10:31:56 UTC (rev 2058)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="../build" name="JBossWS-Hudson">
+
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
+ <import file="${basedir}/ant-import/build-setup.xml"/>
+
+ <target name="init-hudson" depends="prepare">
+
+ <property name="hudson.root" value="${jbossws.hudson.root}/jbossws-hudson-${version.id}"/>
+ <property name="hudson.tomcat" value="${hudson.root}/apache-tomcat"/>
+ <property name="hudson.home" value="${hudson.root}/hudson-home"/>
+ <echo/>
+ <echo message="hudson.root = ${hudson.root}"/>
+ <echo/>
+
+ <available file="${hudson.tomcat}" property="hudson.tomcat.available"/>
+ </target>
+
+ <!--
+ Setup the Hudson Tomcat instance
+ -->
+ <target name="hudson-init-tomcat" depends="init-hudson" unless="hudson.tomcat.available">
+
+ <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/>
+
+ <mkdir dir="${hudson.root}"/>
+ <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/>
+ <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/>
+ <chmod file="${hudson.tomcat}/bin/catalina.sh" perm="+x"/>
+ <chmod file="${hudson.tomcat}/bin/setclasspath.sh" perm="+x"/>
+
+ <!-- Configure Tomcat -->
+ <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/>
+ <copy todir="${hudson.tomcat}">
+ <fileset dir="${build.dir}/hudson/apache-tomcat">
+ <include name="**/*.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="hudson.home" value="${hudson.home}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!--
+ Setup the Hudson QA environment
+ -->
+ <target name="hudson-setup" depends="init-hudson,hudson-init-tomcat"
+ description="Setup the Hudson QA environment">
+
+ <exec executable="basename" outputproperty="svn.basename">
+ <arg value="${svn.url}"/>
+ </exec>
+
+ <!-- Configure Hudson -->
+ <copy todir="${hudson.home}" overwrite="true">
+ <fileset dir="${build.dir}/hudson/hudson-home">
+ <include name="**/*.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="version.id" value="${version.id}"/>
+ <filter token="hudson.home" value="${hudson.home}"/>
+ <filter token="hudson.mail" value="${hudson.mail}"/>
+ <filter token="svn.basename" value="${svn.basename}"/>
+ <filter token="svn.url" value="${svn.url}"/>
+ </filterset>
+ </copy>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson setup sucessfuly *"/>
+ <echo message="* ant hudson-start *"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+ <target name="hudson-stop" depends="init-hudson" description="Stops the Hudson QA environment">
+
+ <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true">
+ <arg line="stop"/>
+ </exec>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson stoped sucessfuly *"/>
+ <echo message="* ant hudson-start *"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+ <target name="hudson-start" depends="init-hudson" description="Start the Hudson QA environment">
+
+ <mkdir dir="${build.output.dir}"/>
+ <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${build.output.dir}/hudson.log">
+ <arg line="start"/>
+ </exec>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson started sucessfuly *"/>
+ <echo message="* http://localhost:8180/hudson *"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+</project>
Property changes on: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-01-24 00:56:26 UTC (rev 2057)
+++ branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-01-24 10:31:56 UTC (rev 2058)
@@ -60,10 +60,6 @@
<property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
<property name="tomcat.common.dir" value="${tomcat.home}/common"/>
- <property name="hudson.root" value="${jbossws.hudson.root}/jbossws-hudson-${version.id}"/>
- <property name="hudson.tomcat" value="${hudson.root}/apache-tomcat"/>
- <property name="hudson.home" value="${hudson.root}/hudson-home"/>
-
<available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/>
<available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/>
<available property="jboss40.available" file="${jboss40.client}/jboss-client.jar"/>
@@ -86,7 +82,7 @@
<arg line="--xml"/>
</exec>
<xmlproperty file="${build.output.dir}/svn-info.xml"/>
- <property name="jbossws.svn.url" value="${info.entry.url}"/>
+ <property name="svn.url" value="${info.entry.url}"/>
<echo message="jboss50.home = ${jboss50.home}"/>
<echo message="jboss42.home = ${jboss42.home}"/>
Modified: branches/jbossws-1.2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-1.2.0/build/ant.properties.example 2007-01-24 00:56:26 UTC (rev 2057)
+++ branches/jbossws-1.2.0/build/ant.properties.example 2007-01-24 10:31:56 UTC (rev 2058)
@@ -4,8 +4,8 @@
# $Id$
# JBossWS Hudson Root
-#jbossws.hudson.root=/home/tdiesler/workspace
-jbossws.hudson.mail=jbossws-dev at lists.jboss.com
+#hudson.root=/home/tdiesler/workspace
+hudson.mail=jbossws-dev at lists.jboss.com
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
@@ -19,7 +19,7 @@
jboss.server.instance=default
# Optional Tomcat Home
-tomcat.home=/usr/java/tomcat
+#tomcat.home=/usr/java/tomcat
tomcat.manager.username=manager
tomcat.manager.password=manager
Modified: branches/jbossws-1.2.0/build/build.xml
===================================================================
--- branches/jbossws-1.2.0/build/build.xml 2007-01-24 00:56:26 UTC (rev 2057)
+++ branches/jbossws-1.2.0/build/build.xml 2007-01-24 10:31:56 UTC (rev 2058)
@@ -17,6 +17,7 @@
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
<import file="${basedir}/ant-import/build-samples.xml"/>
+ <import file="${basedir}/ant-import/build-hudson.xml"/>
<import file="${basedir}/../integration-jboss40/build.xml"/>
<import file="${basedir}/../integration-jboss42/build.xml"/>
<import file="${basedir}/../integration-jboss50/build.xml"/>
@@ -60,83 +61,5 @@
<target name="all" description="Create a distribution zip file" depends="build-bin-dist,build-src-dist">
</target>
-
- <target name="hudson-setup" depends="init" description="Setup the Hudson QA environment">
- <echo/>
- <echo message="hudson.root = ${hudson.root}"/>
- <echo/>
-
- <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/>
-
- <mkdir dir="${hudson.root}"/>
- <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/>
- <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/>
- <chmod file="${hudson.tomcat}/bin/catalina.sh" perm="+x"/>
- <chmod file="${hudson.tomcat}/bin/setclasspath.sh" perm="+x"/>
-
- <!-- Configure Tomcat -->
- <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/>
- <copy todir="${hudson.tomcat}">
- <fileset dir="${build.dir}/hudson/apache-tomcat">
- <include name="**/*.xml"/>
- </fileset>
- <filterset>
- <filter token="hudson.home" value="${hudson.home}"/>
- </filterset>
- </copy>
-
- <!-- Configure Hudson -->
- <copy todir="${hudson.home}" overwrite="true">
- <fileset dir="${build.dir}/hudson/hudson-home">
- <include name="**/*.xml"/>
- </fileset>
- <filterset>
- <filter token="version.id" value="${version.id}"/>
- <filter token="hudson.home" value="${hudson.home}"/>
- <filter token="jbossws.hudson.mail" value="${jbossws.hudson.mail}"/>
- <filter token="jbossws.svn.url" value="${jbossws.svn.url}"/>
- </filterset>
- </copy>
-
- <echo/>
- <echo message="*************************************"/>
- <echo message="* Hudson setup sucessfuly *"/>
- <echo message="* ant hudson-start *"/>
- <echo message="*************************************"/>
- <echo/>
-
- </target>
- <target name="hudson-stop" depends="init" description="Stops the Hudson QA environment">
-
- <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true">
- <arg line="stop"/>
- </exec>
-
- <echo/>
- <echo message="*************************************"/>
- <echo message="* Hudson stoped sucessfuly *"/>
- <echo message="* ant hudson-start *"/>
- <echo message="*************************************"/>
- <echo/>
-
- </target>
-
- <target name="hudson-start" depends="init" description="Start the Hudson QA environment">
-
- <mkdir dir="${build.output.dir}"/>
- <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${build.output.dir}/hudson.log">
- <arg line="start"/>
- </exec>
-
- <echo/>
- <echo message="*************************************"/>
- <echo message="* Hudson started sucessfuly *"/>
- <echo message="* http://localhost:8180/hudson *"/>
- <echo message="*************************************"/>
- <echo/>
-
- </target>
-
</project>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/config.xml 2007-01-24 10:31:56 UTC (rev 2058)
@@ -11,7 +11,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.Mailer>
- <recipients>@jbossws.hudson.mail@</recipients>
+ <recipients>@hudson.mail@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml 2007-01-24 00:56:26 UTC (rev 2057)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/config.xml 2007-01-24 10:31:56 UTC (rev 2058)
@@ -11,7 +11,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.Mailer>
- <recipients>@jbossws.hudson.mail@</recipients>
+ <recipients>@hudson.mail@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-5.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-5.0/config.xml 2007-01-24 10:31:56 UTC (rev 2058)
@@ -11,7 +11,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.Mailer>
- <recipients>@jbossws.hudson.mail@</recipients>
+ <recipients>@hudson.mail@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/config.xml 2007-01-24 10:31:56 UTC (rev 2058)
@@ -9,25 +9,23 @@
#
# Module settings
#
-HUDSON_HOME=@hudson.home@
MODULE=JBossWS-AS-4.0
-WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace
-JBOSS42_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3
+SVNBASENAME=@svn.basename@
+HUDSON_HOME=@hudson.home@
+SVNBASEDIR=$HUDSON_HOME/jobs/$MODULE/workspace/$SVNBASENAME
JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
-ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS_INSTANCE"
+ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
-# Assign the SVNDIR
-cd $WORKSPACE
-cd `ls`
-export SVNDIR=`pwd`
-
-cd $SVNDIR/build
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh
+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
@@ -45,17 +43,10 @@
#
# execute tests
#
-cd $SVNDIR/jbossws-tests
-ant $ENVIRONMENT tests | grep FIXME | sort -u
+cd $SVNBASEDIR/jbossws-tests
+ant $ENVIRONMENT tests
#
-# copy test reports
-#
-rm -rf $WORKSPACE/test-reports
-mkdir $WORKSPACE/test-reports
-cp $SVNDIR/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports
-
-#
# stop jbossas
#
$JBOSS_INSTANCE/bin/jboss.sh stop
@@ -64,17 +55,17 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>test-reports/*.xml</testResults>
+ <testResults>@svn.basename@/jbossws-tests/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
- <recipients>@jbossws.hudson.mail@</recipients>
+ <recipients>@hudson.mail@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
<buildWrappers class="vector"/>
<scm class="hudson.scm.SubversionSCM">
- <modules>@jbossws.svn.url@</modules>
+ <modules>@svn.url@</modules>
<useUpdate>true</useUpdate>
</scm>
<canRoam>true</canRoam>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-24 00:56:26 UTC (rev 2057)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/config.xml 2007-01-24 10:31:56 UTC (rev 2058)
@@ -9,18 +9,17 @@
#
# Module settings
#
-HUDSON_HOME=@hudson.home@
MODULE=JBossWS-AS-4.2
-WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace
+SVNBASENAME=@svn.basename@
+HUDSON_HOME=@hudson.home@
+SVNBASEDIR=$HUDSON_HOME/jobs/$MODULE/workspace/$SVNBASENAME
JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3
ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
-# Assign the SVNDIR
-cd $WORKSPACE
-cd `ls`
-export SVNDIR=`pwd`
-
-cd $SVNDIR/build
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
cp ant.properties.example ant.properties
#
@@ -45,16 +44,9 @@
# execute tests
#
cd $SVNDIR/jbossws-tests
-ant $ENVIRONMENT tests | grep FIXME | sort -u
+ant $ENVIRONMENT tests
#
-# copy test reports
-#
-rm -rf $WORKSPACE/test-reports
-mkdir $WORKSPACE/test-reports
-cp $SVNDIR/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports
-
-#
# stop jbossas
#
$JBOSS_INSTANCE/bin/jboss.sh stop
@@ -63,17 +55,17 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>test-reports/*.xml</testResults>
+ <testResults>@svn.basename@/jbossws-tests/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
- <recipients>@jbossws.hudson.mail@</recipients>
+ <recipients>@hudson.mail@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
<buildWrappers class="vector"/>
<scm class="hudson.scm.SubversionSCM">
- <modules>@jbossws.svn.url@</modules>
+ <modules>@svn.url@</modules>
<useUpdate>true</useUpdate>
</scm>
<canRoam>true</canRoam>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml 2007-01-24 00:56:26 UTC (rev 2057)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/config.xml 2007-01-24 10:31:56 UTC (rev 2058)
@@ -9,24 +9,23 @@
#
# Module settings
#
-HUDSON_HOME=@hudson.home@
MODULE=JBossWS-AS-5.0
-WORKSPACE=$HUDSON_HOME/jobs/$MODULE/workspace
+SVNBASENAME=@svn.basename@
+HUDSON_HOME=@hudson.home@
+SVNBASEDIR=$HUDSON_HOME/jobs/$MODULE/workspace/$SVNBASENAME
JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-5.0/workspace/trunk/build/output/jboss-5.0.0.Beta2
ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
-# Assign the SVNDIR
-cd $WORKSPACE
-cd `ls`
-export SVNDIR=`pwd`
-
-cd $SVNDIR/build
+#
+# copy ant.properties
+#
+cd $SVNBASEDIR/build
cp ant.properties.example ant.properties
#
# stop jbossas
#
-cp $SVNDIR/build/hudson/jboss/jboss.sh $JBOSS_INSTANCE/bin/jboss.sh
+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
@@ -44,17 +43,10 @@
#
# execute tests
#
-cd $SVNDIR/jbossws-tests
-ant $ENVIRONMENT tests | grep FIXME | sort -u
+cd $SVNBASEDIR/jbossws-tests
+ant $ENVIRONMENT tests
#
-# copy test reports
-#
-rm -rf $WORKSPACE/test-reports
-mkdir $WORKSPACE/test-reports
-cp $SVNDIR/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports
-
-#
# stop jbossas
#
$JBOSS_INSTANCE/bin/jboss.sh stop
@@ -63,17 +55,17 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>test-reports/*.xml</testResults>
+ <testResults>@svn.basename@/jbossws-tests/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
- <recipients>@jbossws.hudson.mail@</recipients>
+ <recipients>@hudson.mail@</recipients>
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
<sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
<buildWrappers class="vector"/>
<scm class="hudson.scm.SubversionSCM">
- <modules>@jbossws.svn.url@</modules>
+ <modules>@svn.url@</modules>
<useUpdate>true</useUpdate>
</scm>
<canRoam>true</canRoam>
More information about the jbossws-commits
mailing list