Fixes for MAVEN-595

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113803 13f79535-47bb-0310-9956-ffa450edef68

changelog/plugin.jelly

@@ -46,6 +46,9 @@
     <j:choose>
       <j:when test="${maven.mode.online}">
         <j:set var="_connection">${pom.repository.connection}</j:set>
+        <j:if test="${empty(_connection)}">
+          <j:set var="_connection">${pom.repository.developerConnection}</j:set>
+        </j:if>
         <j:if test="${!empty(_connection)}">
           <ant:echo>Generating the changelog report</ant:echo>
 
@@ -56,7 +59,7 @@
             output="${maven.build.dir}/changelog.xml"
             outputEncoding="${maven.docs.outputencoding}"
             range="${maven.changelog.range}"
-            repositoryConnection="${pom.repository.connection}"
+            repositoryConnection="${_connection}"
             dateFormat="${maven.changelog.dateformat}"
             />
 

developer-activity/plugin.jelly

@@ -41,6 +41,9 @@
     <j:choose>
       <j:when test="${maven.mode.online}">
         <j:set var="_connection">${pom.repository.connection}</j:set>
+        <j:if test="${empty(_connection)}">
+          <j:set var="_connection">${pom.repository.developerConnection}</j:set>
+        </j:if>
         <j:if test="${!empty(_connection)}">
           <ant:echo>Generating the developer activity report</ant:echo>
           
@@ -63,7 +66,7 @@
               output="${maven.build.dir}/changelog.xml"
               outputEncoding="${maven.docs.outputencoding}"
               range="${maven.activitylog.range}"
-              repositoryConnection="${pom.repository.connection}"
+              repositoryConnection="${_connection}"
               dateFormat="${maven.changelog.dateformat}"
             />
           </j:if>

file-activity/plugin.jelly

@@ -50,6 +50,9 @@
     <j:choose>
       <j:when test="${maven.mode.online}">
         <j:set var="_connection">${pom.repository.connection}</j:set>
+        <j:if test="${empty(_connection)}">
+          <j:set var="_connection">${pom.repository.developerConnection}</j:set>
+        </j:if>
         <j:if test="${!empty(_connection)}">
           <echo>Generating the file activity report</echo>
           
@@ -72,7 +75,7 @@
               output="${maven.build.dir}/changelog.xml"
               outputEncoding="${maven.docs.outputencoding}"
               range="${maven.activitylog.range}"
-              repositoryConnection="${pom.repository.connection}"
+              repositoryConnection="${_connection}"
               dateFormat="${maven.changelog.dateformat}"
             />
           </j:if>

xdoc/src/plugin-resources/templates/cvs-usage.xml

@@ -17,16 +17,19 @@
       </section>
     #else
     
-    #set ($conn = $repository.cvsRoot)
+      #set ($conn = $repository.getCvsRoot($repository.connection, ''))
-    #set ($module = $repository.cvsModule)
+      #set ($module = $repository.getCvsModule($repository.connection))
-    #set ($url = $escape.getText($project.repository.url))
+      #set ($url = $escape.getText($repository.url))
   
+      #if ($repository.url)
       <section name="Web Access">
         <p>
           <a href="$url">$url</a>
         </p>
       </section>
+      #end
     
+      #if ($repository.connection)
       <section name="Anonymous CVS Access">
         <p>
           This project's CVS repository can be checked out through anonymous (pserver)
@@ -44,6 +47,12 @@
           Updates from within the module's directory do not need the -d parameter.
         </p>
       </section>
+      #end
+
+      #if ($repository.developerConnection)
+        #set ($conn = $repository.getCvsRoot($repository.developerConnection, 'username'))
+        #set ($module = $repository.getCvsModule($repository.developerConnection))
+        #set ($server = $repository.getCvsServer($repository.developerConnection))
   
       <section name="Developer CVS Access via SSH">
 
@@ -59,8 +68,14 @@
           cvs -z3 -d $conn co $module
         </p>
       
-    </section>
+        <p>
+          Remember to replace 'username' with your actual username on $server.
+        </p>
 
+      </section>
+      #end
+
+      #if ($repository.url)
       <section name="CVS Access behind a firewall">
  
         <p>
@@ -70,6 +85,7 @@
         </p>
 
       </section>
+      #end
 
     #end
   </body>