epugh 2004/07/23 02:05:21
Modified: cruisecontrol/src/plugin-test/svn-scm project.properties
maven.xml
cruisecontrol/src/plugin-test/cvs-scm project.xml maven.xml
cruisecontrol plugin.jelly plugin.properties
cruisecontrol/xdocs properties.xml
Log:
MPCRUISECONTROL-8. More flexible external link to CruiseControl report.
Revision Changes Path
1.2 +1 -0
maven-plugins/cruisecontrol/src/plugin-test/svn-scm/project.properties
Index: project.properties
===================================================================
RCS file:
/home/cvs/maven-plugins/cruisecontrol/src/plugin-test/svn-scm/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 23 Jul 2004 08:37:04 -0000 1.1
+++ project.properties 23 Jul 2004 09:05:21 -0000 1.2
@@ -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
1.2 +6 -6 maven-plugins/cruisecontrol/src/plugin-test/svn-scm/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/src/plugin-test/svn-scm/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 8 Jul 2004 13:06:14 -0000 1.1
+++ maven.xml 23 Jul 2004 09:05:21 -0000 1.2
@@ -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>
1.2 +4 -0 maven-plugins/cruisecontrol/src/plugin-test/cvs-scm/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/src/plugin-test/cvs-scm/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 8 Jul 2004 13:06:14 -0000 1.1
+++ project.xml 23 Jul 2004 09:05:21 -0000 1.2
@@ -25,4 +25,8 @@
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/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>
1.4 +7 -1 maven-plugins/cruisecontrol/src/plugin-test/cvs-scm/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/src/plugin-test/cvs-scm/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 23 Jul 2004 08:37:37 -0000 1.3
+++ maven.xml 23 Jul 2004 09:05:21 -0000 1.4
@@ -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>
1.9 +1 -1 maven-plugins/cruisecontrol/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 8 Jul 2004 13:08:13 -0000 1.8
+++ plugin.jelly 23 Jul 2004 09:05:21 -0000 1.9
@@ -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>
1.9 +2 -0 maven-plugins/cruisecontrol/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/plugin.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.properties 23 Jul 2004 08:37:37 -0000 1.8
+++ plugin.properties 23 Jul 2004 09:05:21 -0000 1.9
@@ -25,3 +25,5 @@
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}
1.7 +11 -0 maven-plugins/cruisecontrol/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/xdocs/properties.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- properties.xml 23 Jul 2004 08:37:37 -0000 1.6
+++ properties.xml 23 Jul 2004 09:05:21 -0000 1.7
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
