dion 2003/11/09 17:56:14
Modified: cruisecontrol/src/plugin-resources cruisecontrol.jsl
Log:
Switch to using maven:pluginVar instead of pom.getPluginContext().getVariable()
Revision Changes Path
1.2 +9 -4
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cruisecontrol.jsl 31 Aug 2003 07:20:40 -0000 1.1
+++ cruisecontrol.jsl 10 Nov 2003 01:56:13 -0000 1.2
@@ -2,8 +2,9 @@
<jsl:stylesheet select="$doc"
xmlns:jsl="jelly:jsl"
- xmlns:x="jelly:xml"
xmlns:j="jelly:core"
+ xmlns:maven="jelly:maven"
+ xmlns:x="jelly:xml"
xmlns="dummy" trim="false">
<jsl:template match="cruisecontrol" trim="false">
<jsl:copy>
@@ -13,12 +14,16 @@
<currentbuildstatusbootstrapper
file="${maven.cruisecontrol.logs.dir}/currentbuildstatus.txt"/>
</bootstrappers>
<modificationset>
- <j:if
test="${pom.getPluginContext('maven-scm-plugin').getVariable('maven.scm.method') ==
'cvs'}">
- <cvs
cvsroot="${pom.getPluginContext('maven-scm-plugin').getVariable('maven.scm.cvs.root')}"
localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${pom.getPluginContext('maven-scm-plugin').getVariable('maven.scm.cvs.module')}"
/>
+ <!-- FIXME: Shouldn't this use the second element of
pom.repository.connection -->
+ <maven:pluginVar var="method" plugin='maven-scm-plugin'
property='maven.scm.method' />
+ <maven:pluginVar var="module" plugin='maven-scm-plugin'
property='maven.scm.cvs.module' />
+ <j:if test="${method == 'cvs'}">
+ <maven:pluginVar var="root" plugin='maven-scm-plugin'
property='maven.scm.cvs.root' />
+ <cvs cvsroot="${root}"
localWorkingCopy="${maven.cruisecontrol.checkout.dir}/${module}" />
</j:if>
</modificationset>
<schedule interval="${maven.cruisecontrol.schedule.interval}">
- <maven mavenscript="${maven.home}/bin/maven"
goal="${maven.cruisecontrol.goals}"
projectfile="${maven.cruisecontrol.checkout.dir}/${pom.getPluginContext('maven-scm-plugin').getVariable('maven.scm.cvs.module')}/project.xml"/>
+ <maven mavenscript="${maven.home}/bin/maven"
goal="${maven.cruisecontrol.goals}"
projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
</schedule>
<publishers>
<currentbuildstatuspublisher
file="${maven.cruisecontrol.logs.dir}/currentbuildstatus.txt"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
