From 1c0265ac640c73a6d9d0d8d8079b302fa873990c Mon Sep 17 00:00:00 2001 From: dion Date: Fri, 12 Sep 2003 04:42:17 +0000 Subject: [PATCH] Applied MAVEN-756: cvs-usage.xml breaks on non-cvs scm URL git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114002 13f79535-47bb-0310-9956-ffa450edef68 --- xdoc/src/plugin-resources/templates/cvs-usage.xml | 7 +++++++ xdoc/xdocs/changes.xml | 3 +++ 2 files changed, 10 insertions(+) diff --git a/xdoc/src/plugin-resources/templates/cvs-usage.xml b/xdoc/src/plugin-resources/templates/cvs-usage.xml index 3a225145..49cdfee6 100644 --- a/xdoc/src/plugin-resources/templates/cvs-usage.xml +++ b/xdoc/src/plugin-resources/templates/cvs-usage.xml @@ -28,6 +28,8 @@ #end #if ($repository.connection && $repository.connection != '') + #set ($connscm = $repository.getScmType($repository.connection)) + #if ($connscm == 'cvs') #set ($conn = $repository.getCvsRoot($repository.connection, '')) #set ($module = $repository.getCvsModule($repository.connection))
@@ -47,9 +49,13 @@ Updates from within the module's directory do not need the -d parameter.

+ #end #end #if ($repository.developerConnection && $repository.developerConnection != '') + #set ($connscm = $repository.getScmType($repository.developerConnection)) + #if ($connscm == 'cvs') + #set ($conn = $repository.getCvsRoot($repository.developerConnection, 'username')) #set ($module = $repository.getCvsModule($repository.developerConnection)) #set ($server = $repository.getCvsServer($repository.developerConnection)) @@ -73,6 +79,7 @@

+ #end #end #if ($repository.url && $repository.url != '') diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index dfbb139c..d75007a2 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -7,6 +7,9 @@ + + Applied Maven-756. cvs-usage.xml breaks on non-cvs scm URL + Move xdoc faqs over from the wiki update to commons-jelly-20030902.160215