vmassol 2003/11/14 15:33:20
Modified: dashboard/xdocs changes.xml
dashboard/sample project.properties
dashboard plugin.jelly
Log:
Ensure that the Clover plugin will generate the XML report (and only the XML report)
when the Dashboard plugin is run. The Clover XML report is required by the Clover
aggregators as they extract information from it.
Revision Changes Path
1.5 +6 -0 maven-plugins/dashboard/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dashboard/xdocs/changes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.xml 14 Nov 2003 22:34:09 -0000 1.4
+++ changes.xml 14 Nov 2003 23:33:20 -0000 1.5
@@ -8,6 +8,12 @@
<body>
<release version="1.1" date="in CVS">
+ <action dev="vmassol" type="update">
+ Ensure that the Clover plugin will generate the XML report (and only
+ the XML report) when the Dashboard plugin is run. The Clover XML
+ report is required by the Clover aggregators as they extract
+ information from it.
+ </action>
<action dev="vmassol" type="fix">
Do not exclude <code>project.xml</code> in the default
<code>maven.dashboard.excludes</code> list as it is already excluded
1.3 +0 -3 maven-plugins/dashboard/sample/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-plugins/dashboard/sample/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 5 Nov 2003 19:26:59 -0000 1.2
+++ project.properties 14 Nov 2003 23:33:20 -0000 1.3
@@ -5,7 +5,4 @@
maven.xdoc.version=${pom.currentVersion}
maven.checkstyle.header.file = ${basedir}/../../LICENSE.txt
-# Required to generate XML clover report
-maven.clover.report.xml = true
-
maven.dashboard.aggregators =
csall,cserrors,cswarnings,clovertpc,cloverloc,cloverncloc
1.5 +22 -0 maven-plugins/dashboard/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/dashboard/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 10 Nov 2003 13:21:17 -0000 1.4
+++ plugin.jelly 14 Nov 2003 23:33:20 -0000 1.5
@@ -156,6 +156,20 @@
-->
<goal name="dashboard:run-goals">
+ <!-- Make sure that the Clover plugin generates only the XML report (as
+ this is report used by the Clover aggregators to extract information
+ from). The reason we disable the other reports is to win some response
+ time. -->
+ <j:set var="cloverReportXml"
+ value="${pom.getVariable('maven.clover.report.xml')}"/>
+ <j:set var="maven.clover.report.xml" value="true" scope="parent"/>
+ <j:set var="cloverReportHtml"
+ value="${pom.getVariable('maven.clover.report.html')}"/>
+ <j:set var="maven.clover.report.html" value="false" scope="parent"/>
+ <j:set var="cloverReportSwing"
+ value="${pom.getVariable('maven.clover.report.swing')}"/>
+ <j:set var="maven.clover.report.swing" value="false" scope="parent"/>
+
<u:tokenize var="aggregatorNames"
delim=",">${maven.dashboard.aggregators}</u:tokenize>
<!-- Property used to remember what goals have already been called -->
@@ -200,6 +214,14 @@
</j:forEach>
</j:if>
+ <!-- Restore Clover plugin properties -->
+ <j:set var="maven.clover.report.xml" value="${cloverReportXml}"
+ scope="parent"/>
+ <j:set var="maven.clover.report.html" value="${cloverReportHtml}"
+ scope="parent"/>
+ <j:set var="maven.clover.report.swing" value="${cloverReportSwing}"
+ scope="parent"/>
+
</goal>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
