Author: epugh
Date: Tue Mar 8 12:01:26 2005
New Revision: 156562
URL: http://svn.apache.org/viewcvs?view=rev&rev=156562
Log:
url property for CVS is used as CVSROOT and should not
have the module attached to it.
Modified:
maven/maven-1/plugins/trunk/cruisecontrol/plugin.jelly
Modified: maven/maven-1/plugins/trunk/cruisecontrol/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/plugin.jelly?view=diff&r1=156561&r2=156562
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/plugin.jelly Tue Mar 8 12:01:26
2005
@@ -54,12 +54,14 @@
<j:if test="${method == 'cvs'}">
<maven:pluginVar var="root" plugin="maven-scm-plugin"
property="maven.scm.cvs.root"/>
<maven:pluginVar var="module" plugin="maven-scm-plugin"
property="maven.scm.cvs.module"/>
+ <j:set var="url" value="${root}"/>
</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"/>
+ <j:set var="url" value="${root}/${module}"/>
</j:if>
- <j:set var="url" value="${root}/${module}"/>
+
<!-- Compute the merge directory automatically if not specified by the
user -->
<maven:makeRelativePath var="relativeMavenBuildDir" basedir="${basedir}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
