epugh 2004/07/23 01:37:37
Modified: cruisecontrol/src/plugin-test/cvs-scm maven.xml
cruisecontrol/src/plugin-resources cruisecontrol.jsl
cruisecontrol/xdocs properties.xml
cruisecontrol plugin.properties
Log:
Allow builds to trigger by other project builds. MPCRUISECONTROL-7
Revision Changes Path
1.3 +2 -0 maven-plugins/cruisecontrol/src/plugin-test/cvs-scm/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/src/plugin-test/cvs-scm/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 8 Jul 2004 13:08:38 -0000 1.2
+++ maven.xml 23 Jul 2004 08:37:37 -0000 1.3
@@ -60,6 +60,8 @@
<x:set var="count"
select="count($cruisecontrolDoc/cruisecontrol/project/log/merge)"/>
<assert:assertEquals expected="1" value="${count.intValue().toString()}"/>
+ <x:set var="count"
select="count($cruisecontrolDoc/cruisecontrol/project/modificationset/buildstatus)"/>
+ <assert:assertEquals expected="1" value="${count.intValue().toString()}"/>
</goal>
1.10 +10 -0
maven-plugins/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
Index: cruisecontrol.jsl
===================================================================
RCS file:
/home/cvs/maven-plugins/cruisecontrol/src/plugin-resources/cruisecontrol.jsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cruisecontrol.jsl 8 Jul 2004 13:16:46 -0000 1.9
+++ cruisecontrol.jsl 23 Jul 2004 08:37:37 -0000 1.10
@@ -25,6 +25,7 @@
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
xmlns:x="jelly:xml"
+ xmlns:u="jelly:util"
xmlns="dummy" trim="false">
<jsl:template match="cruisecontrol" trim="false">
<jsl:copy>
@@ -46,11 +47,20 @@
<maven:pluginVar var="module" plugin='maven-scm-plugin'
property='maven.scm.cvs.module' />
<cvs cvsroot="${root}"
localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${module}" />
</j:if>
+
<j:if test="${method == 'svn'}">
<maven:pluginVar var="root" plugin='maven-scm-plugin'
property='maven.scm.svn.root' />
<maven:pluginVar var="module" plugin='maven-scm-plugin'
property='maven.scm.svn.module' />
<svn repositoryLocation="${root}"
localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${module}" />
</j:if>
+
+ <!-- Add the list of additional directories for the classpath from
${maven.eclipse.classpath.include}-->
+ <u:tokenize var="maven.cruisecontrol.trigger.projects.split"
delim=",">${maven.cruisecontrol.trigger.projects}</u:tokenize>
+ <!-- add extra directories to be included in the classpath -->
+ <j:forEach var="triggerProject"
items="${maven.cruisecontrol.trigger.projects.split}">
+ <buildstatus
logdir="${maven.cruisecontrol.logs.dir}/${triggerProject}"/>
+ </j:forEach>
+
</modificationset>
<schedule interval="${maven.cruisecontrol.schedule.interval}">
<maven mavenscript="${maven.home}/bin/maven"
goal="${maven.cruisecontrol.goals}"
projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
1.6 +12 -1 maven-plugins/cruisecontrol/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/xdocs/properties.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- properties.xml 31 May 2004 13:18:46 -0000 1.5
+++ properties.xml 23 Jul 2004 08:37:37 -0000 1.6
@@ -107,7 +107,18 @@
<td>
<p>Template file to use in generating the cruisecontrol.xml file.</p>
</td>
- </tr>
+ </tr>
+ <tr>
+ <td>maven.cruisecontrol.trigger.projects</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ List of projects that should trigger this project to
build when
+ they are built. Allows you to build a project whose
dependencies
+ have changed.
+ </p>
+ </td>
+ </tr>
</table>
</section>
</body>
1.8 +1 -0 maven-plugins/cruisecontrol/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/plugin.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.properties 3 Jul 2004 02:06:58 -0000 1.7
+++ plugin.properties 23 Jul 2004 08:37:37 -0000 1.8
@@ -24,3 +24,4 @@
maven.cruisecontrol.mail.subjectprefix=[BUILD]
maven.cruisecontrol.template=${plugin.resources}/cruisecontrol.jsl
maven.cruisecontrol.buildresults.url=http://localhost:8080/cruisecontrol
+maven.cruisecontrol.trigger.projects=
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
