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,59 +17,75 @@
       </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))
   
-    <section name="Web Access">
+      #if ($repository.url)
-      <p>
+      <section name="Web Access">
-        <a href="$url">$url</a>
+        <p>
-      </p>
+          <a href="$url">$url</a>
-    </section>
+        </p>
+      </section>
+      #end
     
-    <section name="Anonymous CVS Access">
+      #if ($repository.connection)
-      <p>
+      <section name="Anonymous CVS Access">
-        This project's CVS repository can be checked out through anonymous (pserver)
+        <p>
-        CVS with the following instruction set.
+          This project's CVS repository can be checked out through anonymous (pserver)
-        When prompted for a password for anonymous, simply press the Enter key.
+          CVS with the following instruction set.
-      </p>
+          When prompted for a password for anonymous, simply press the Enter key.
+        </p>
       
-      <p>
+        <p>
-        cvs -d $conn login
+          cvs -d $conn login
-        <br/>
+          <br/>
-        cvs -z3 -d $conn co $module
+          cvs -z3 -d $conn co $module
-      </p>
+        </p>
 
-      <p>
+        <p>
-        Updates from within the module's directory do not need the -d parameter.
+          Updates from within the module's directory do not need the -d parameter.
-      </p>
+        </p>
-    </section>
+      </section>
+      #end
 
-    <section name="Developer CVS Access via SSH">
+      #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">
 
-      <p>
+        <p>
-        Only project developers can access the CVS tree via this method.
+          Only project developers can access the CVS tree via this method.
-        SSH1 must be installed on your client machine. Substitute   
+          SSH1 must be installed on your client machine. Substitute   
-        <b>name</b> with the proper value. Enter your site password when prompted.
+          <b>name</b> with the proper value. Enter your site password when prompted.
-      </p>
+        </p>
 
-      <p>
+        <p>
-        export CVS_RSH=ssh
+          export CVS_RSH=ssh
-        <br/>
+          <br/>
-        cvs -z3 -d $conn co $module
+          cvs -z3 -d $conn co $module
-      </p>
+        </p>
+      
+        <p>
+          Remember to replace 'username' with your actual username on $server.
+        </p>
 
-    </section>
+      </section>
+      #end
 
-    <section name="CVS Access behind a firewall">
+      #if ($repository.url)
+      <section name="CVS Access behind a firewall">
+ 
+        <p>
+          For those developers who are stuck behind a corporate
+          firewall, <a href="http://cvsgrab.sourceforge.net/">CVSGrab</a>
+          can use the viewcvs web interface to checkout the source code.
+        </p>
 
-      <p>
+      </section>
-        For those developers who are stuck behind a corporate
+      #end
-        firewall, <a href="http://cvsgrab.sourceforge.net/">CVSGrab</a>
-        can use the viewcvs web interface to checkout the source code.
-      </p>
-
-    </section>
 
     #end
   </body>