MPCRUISECONTROL-8. More flexible external link to CruiseControl report.

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

cruisecontrol/plugin.jelly

@@ -94,7 +94,7 @@
     <doc:registerReport 
       name="CC Build Results"
       pluginName="maven-cruisecontrol-plugin"
-      externalLink="${maven.cruisecontrol.buildresults.url}/${pom.artifactId}"
+      externalLink="${maven.cruisecontrol.buildresults.url}"
       description="See the cruise control build results page for this project." />
   </goal>
   

cruisecontrol/plugin.properties

@@ -25,3 +25,5 @@ maven.cruisecontrol.mail.subjectprefix=[BUILD]
 maven.cruisecontrol.template=${plugin.resources}/cruisecontrol.jsl
 maven.cruisecontrol.buildresults.url=http://localhost:8080/cruisecontrol
 maven.cruisecontrol.trigger.projects=
+maven.cruisecontrol.buildresults.site=${pom.url}/cruisecontrol
+maven.cruisecontrol.buildresults.url=${maven.cruisecontrol.buildresults.site}/buildresults/${pom.artifactId} 

cruisecontrol/src/plugin-test/cvs-scm/maven.xml

@@ -22,7 +22,7 @@
          xmlns:maven="jelly:maven"
          xmlns:ant="jelly:ant">
 
-  <goal name="testPlugin" prereqs="test-init,test-cruisecontrol-configure,test-cruisecontrol-validate,test-cruisecontrol-jsl-file">
+  <goal name="testPlugin" prereqs="test-init,test-cruisecontrol-configure,test-cruisecontrol-validate,test-cruisecontrol-jsl-file,test-report-link-to-cruisecontrol">
     <attainGoal name="clean"/>
   </goal>
   
@@ -63,6 +63,12 @@
     <x:set var="count" select="count($cruisecontrolDoc/cruisecontrol/project/modificationset/buildstatus)"/>
     <assert:assertEquals expected="1" value="${count.intValue().toString()}"/> 
   </goal>  
+  
+  <goal name="test-report-link-to-cruisecontrol">
+  	<attainGoal name="maven-cruisecontrol-plugin:report"/>
+  	<j:set var="cruiseControlURL" value="${context.getVariable('maven.cruisecontrol.buildresults.url')}"/>
+  	<assert:assertEquals expected="http://maven.apache.org/reference/plugins/cruisecontrol//cruisecontrol/buildresults/test-maven-cruisecontrol-cvs-plugin" value="${cruiseControlURL.trim()}"/>  
+  </goal>
 
 
 

cruisecontrol/src/plugin-test/cvs-scm/project.xml

@@ -25,4 +25,8 @@
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/cruisecontrol/src/plugin-test/cvs-scm</connection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/cruisecontrol/src/plugin-test/cvs-scm</url>
   </repository>
+  
+  <reports>
+    <report>maven-cruisecontrol-plugin</report>
+  </reports> 
 </project>

cruisecontrol/src/plugin-test/svn-scm/maven.xml

@@ -22,7 +22,7 @@
          xmlns:maven="jelly:maven"
          xmlns:ant="jelly:ant">
 
-  <goal name="testPlugin" prereqs="test-init,test-cruisecontrol-configure,test-cruisecontrol-validate,test-cruisecontrol-jsl-file">
+  <goal name="testPlugin" prereqs="test-init,test-cruisecontrol-configure,test-cruisecontrol-validate,test-cruisecontrol-jsl-file,test-report-link-to-cruisecontrol">
     <attainGoal name="clean"/>
   </goal>
   
@@ -59,9 +59,9 @@
     
   </goal>  
 
-
-
-
-
-
+  <goal name="test-report-link-to-cruisecontrol">
+  	<attainGoal name="maven-cruisecontrol-plugin:report"/>
+  	<j:set var="cruiseControlURL" value="${context.getVariable('maven.cruisecontrol.buildresults.url')}"/>
+  	<assert:assertEquals expected="http://sometest.server.com:8080/buildresults/test-maven-cruisecontrol-svn-plugin" value="${cruiseControlURL.trim()}"/>  
+  </goal>
 </project>

cruisecontrol/src/plugin-test/svn-scm/project.properties

@@ -18,5 +18,6 @@
 # MUST specify these, even though they are the defaults, so we can run inside reactor where they were already set
 maven.cruisecontrol.config=${maven.build.dest}
 maven.cruisecontrol.home=${maven.build.dest}
+maven.cruisecontrol.buildresults.site=http://sometest.server.com:8080
 
 

cruisecontrol/xdocs/properties.xml

@@ -118,6 +118,17 @@
 				have changed.
 			</p>
           </td>
+        </tr> 		
+        <tr>
+          <td>maven.cruisecontrol.buildresults.site</td>
+          <td>Yes</td>
+          <td>
+            <p>
+				The root of the cruisecontrol site used in generating the link to
+				CruiseControl.  By default this is <code>pom.url</code>.  While not required,
+				typically you will need to set this.
+			</p>
+          </td>
         </tr> 		   
       </table>
     </section>