vmassol 2004/07/25 00:38:50
Modified: dashboard/xdocs changes.xml aggregators.xml properties.xml
dashboard project.xml plugin.properties
dashboard/src/plugin-test project.properties
Added: dashboard/src/plugin-resources/aggregators
pmdviolations.jelly csfiles.jelly pmdfiles.jelly
Log:
MPDASHBOARD-7. Added new Checkstyle File aggregator and PMD aggregators (count of
violations and count of files with violations). Thanks to Paul Spencer.
Revision Changes Path
1.21 +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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- changes.xml 16 May 2004 02:11:33 -0000 1.20
+++ changes.xml 25 Jul 2004 07:38:49 -0000 1.21
@@ -24,6 +24,12 @@
<author email="[EMAIL PROTECTED]">Vincent Massol</author>
</properties>
<body>
+ <release version="1.4-SNAPSHOT" date="in CVS">
+ <action dev="vmassol" type="add" issue="MPDASHBOARD-7" due-to="Paul Spencer">
+ Added new Checkstyle File aggregator and PMD aggregators (count of
+ violations and count of files with violations).
+ </action>
+ </release>
<release version="1.3" date="2004-05-15">
<action dev="vmassol" type="update">Better error reporting when a wrong
aggregator name is used.</action>
<action dev="vmassol" type="add">Added Simian Total Duplicate Lines
aggregator.</action>
1.8 +21 -0 maven-plugins/dashboard/xdocs/aggregators.xml
Index: aggregators.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dashboard/xdocs/aggregators.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aggregators.xml 30 Apr 2004 12:31:14 -0000 1.7
+++ aggregators.xml 25 Jul 2004 07:38:49 -0000 1.8
@@ -47,6 +47,13 @@
</td>
</tr>
<tr>
+ <td>csfiles</td>
+ <td>Checkstyle</td>
+ <td>
+ Computes total number of files checked by Checkstyle.
+ </td>
+ </tr>
+ <tr>
<td>cserrors</td>
<td>Checkstyle</td>
<td>
@@ -107,6 +114,20 @@
<td>JUnit</td>
<td>
Percentage of JUnit tests that have passed.
+ </td>
+ </tr>
+ <tr>
+ <td>pmdfiles</td>
+ <td>PMD</td>
+ <td>
+ Computes total number of files with PMD violations.
+ </td>
+ </tr>
+ <tr>
+ <td>pmdviolations</td>
+ <td>PMD</td>
+ <td>
+ Computes total number of PMD violations.
</td>
</tr>
<tr>
1.7 +22 -1 maven-plugins/dashboard/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dashboard/xdocs/properties.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- properties.xml 30 Apr 2004 12:31:14 -0000 1.6
+++ properties.xml 25 Jul 2004 07:38:49 -0000 1.7
@@ -83,6 +83,13 @@
# Default aggregators
# -------------------
+# Properties for the Checkstyle files aggregator
+maven.dashboard.aggregator.csfiles.script =
${maven.dashboard.aggregators.dir}/csfiles.jelly
+maven.dashboard.aggregator.csfiles.artifact =
${maven.build.dir}/checkstyle-raw-report.xml
+maven.dashboard.aggregator.csfiles.label = CS Files
+maven.dashboard.aggregator.csfiles.goal = checkstyle
+maven.dashboard.aggregator.csfiles.description = Number of files checked with
Checkstyle
+
# Properties for the Checkstyle error/warning aggregator (all errors/warnings)
maven.dashboard.aggregator.csall.script =
${maven.dashboard.aggregators.dir}/csall.jelly
maven.dashboard.aggregator.csall.artifact =
${maven.build.dir}/checkstyle-raw-report.xml
@@ -153,6 +160,20 @@
maven.dashboard.aggregator.junitpassrate.goal = junit-report:report
maven.dashboard.aggregator.junitpassrate.description = Percentage of JUnit tests
that have passed vs tests in error or failed
+# Properties for the PMD violations aggregator
+maven.dashboard.aggregator.pmdfiles.script =
${maven.dashboard.aggregators.dir}/pmdfiles.jelly
+maven.dashboard.aggregator.pmdfiles.artifact = ${maven.build.dir}/pmd-raw-report.xml
+maven.dashboard.aggregator.pmdfiles.label = PMD Files with Violations
+maven.dashboard.aggregator.pmdfiles.goal = pmd:report
+maven.dashboard.aggregator.pmdfiles.description = Number of files with PMD
violations
+
+# Properties for the PMD violations aggregator
+maven.dashboard.aggregator.pmdviolations.script =
${maven.dashboard.aggregators.dir}/pmdviolations.jelly
+maven.dashboard.aggregator.pmdviolations.artifact =
${maven.build.dir}/pmd-raw-report.xml
+maven.dashboard.aggregator.pmdviolations.label = PMD Violations
+maven.dashboard.aggregator.pmdviolations.goal = pmd:report
+maven.dashboard.aggregator.pmdviolations.description = Number of PMD violations
+
# Properties for the Simian duplicate lines aggregator
maven.dashboard.aggregator.simiantdl.script =
${maven.dashboard.aggregators.dir}/simiantdl.jelly
maven.dashboard.aggregator.simiantdl.artifact =
${maven.build.dir}/generated-xdocs/simian-report.xml
@@ -162,4 +183,4 @@
]]></source>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
1.1
maven-plugins/dashboard/src/plugin-resources/aggregators/pmdviolations.jelly
Index: pmdviolations.jelly
===================================================================
<?xml version="1.0"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<!--
========================================================================
PMD aggregator. Extracts violation count from PMD raw XML
file.
========================================================================
-->
<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
<u:file var="artifactAsFile"
name="${maven.dashboard.aggregator.pmdviolations.artifact}"/>
<j:choose>
<j:when test="${artifactAsFile.exists()}">
<x:parse var="doc" xml="${artifactAsFile}"/>
<x:expr select="count($doc//violation)"/>
</j:when>
<j:otherwise>
<j:expr value="-"/>
</j:otherwise>
</j:choose>
</j:jelly>
1.1
maven-plugins/dashboard/src/plugin-resources/aggregators/csfiles.jelly
Index: csfiles.jelly
===================================================================
<?xml version="1.0"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<!--
========================================================================
Checkstyle aggregator. Extracts count of files checked with Checkstyle
raw XML file.
========================================================================
-->
<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
<u:file var="artifactAsFile"
name="${maven.dashboard.aggregator.csfiles.artifact}"/>
<j:choose>
<j:when test="${artifactAsFile.exists()}">
<x:parse var="doc" xml="${artifactAsFile}"/>
<x:expr select="count($doc//file)"/>
</j:when>
<j:otherwise>
<j:expr value="-"/>
</j:otherwise>
</j:choose>
</j:jelly>
1.1
maven-plugins/dashboard/src/plugin-resources/aggregators/pmdfiles.jelly
Index: pmdfiles.jelly
===================================================================
<?xml version="1.0"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<!--
========================================================================
PMD aggregator. Extracts count of files with violations from PMD raw
XML file.
========================================================================
-->
<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
<u:file var="artifactAsFile"
name="${maven.dashboard.aggregator.pmdfiles.artifact}"/>
<j:choose>
<j:when test="${artifactAsFile.exists()}">
<x:parse var="doc" xml="${artifactAsFile}"/>
<x:expr select="count($doc//file)"/>
</j:when>
<j:otherwise>
<j:expr value="-"/>
</j:otherwise>
</j:choose>
</j:jelly>
1.22 +5 -1 maven-plugins/dashboard/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dashboard/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.xml 25 Jun 2004 15:24:28 -0000 1.21
+++ project.xml 25 Jul 2004 07:38:50 -0000 1.22
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-dashboard-plugin</id>
<name>Maven Dashboard Plugin</name>
- <currentVersion>1.3</currentVersion>
+ <currentVersion>1.4-SNAPSHOT</currentVersion>
<description>Generate a dashboard containing global statistics about other maven
reports</description>
<shortDescription>Generate a statistic dashboard</shortDescription>
<url>http://maven.apache.org/reference/plugins/dashboard/</url>
@@ -74,6 +74,10 @@
<contributor>
<name>John D Taylor</name>
<email>[EMAIL PROTECTED]</email>
+ </contributor>
+ <contributor>
+ <name>Paul Spencer</name>
+ <email>[EMAIL PROTECTED]</email>
</contributor>
</contributors>
<dependencies/>
1.9 +21 -0 maven-plugins/dashboard/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/dashboard/plugin.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.properties 30 Apr 2004 12:31:14 -0000 1.8
+++ plugin.properties 25 Jul 2004 07:38:50 -0000 1.9
@@ -78,6 +78,13 @@
# Default aggregators
# -------------------
+# Properties for the Checkstyle files aggregator
+maven.dashboard.aggregator.csfiles.script =
${maven.dashboard.aggregators.dir}/csfiles.jelly
+maven.dashboard.aggregator.csfiles.artifact =
${maven.build.dir}/checkstyle-raw-report.xml
+maven.dashboard.aggregator.csfiles.label = CS Files
+maven.dashboard.aggregator.csfiles.goal = checkstyle
+maven.dashboard.aggregator.csfiles.description = Number of files checked with
Checkstyle
+
# Properties for the Checkstyle error/warning aggregator (all errors/warnings)
maven.dashboard.aggregator.csall.script =
${maven.dashboard.aggregators.dir}/csall.jelly
maven.dashboard.aggregator.csall.artifact =
${maven.build.dir}/checkstyle-raw-report.xml
@@ -147,6 +154,20 @@
maven.dashboard.aggregator.junitpassrate.label = JUnit Pass Rate
maven.dashboard.aggregator.junitpassrate.goal = junit-report:report
maven.dashboard.aggregator.junitpassrate.description = Percentage of JUnit tests
that have passed vs tests in error or failed
+
+# Properties for the PMD violations aggregator
+maven.dashboard.aggregator.pmdfiles.script =
${maven.dashboard.aggregators.dir}/pmdfiles.jelly
+maven.dashboard.aggregator.pmdfiles.artifact = ${maven.build.dir}/pmd-raw-report.xml
+maven.dashboard.aggregator.pmdfiles.label = PMD Files with Violations
+maven.dashboard.aggregator.pmdfiles.goal = pmd:report
+maven.dashboard.aggregator.pmdfiles.description = Number of files with PMD
violations
+
+# Properties for the PMD violations aggregator
+maven.dashboard.aggregator.pmdviolations.script =
${maven.dashboard.aggregators.dir}/pmdviolations.jelly
+maven.dashboard.aggregator.pmdviolations.artifact =
${maven.build.dir}/pmd-raw-report.xml
+maven.dashboard.aggregator.pmdviolations.label = PMD Violations
+maven.dashboard.aggregator.pmdviolations.goal = pmd:report
+maven.dashboard.aggregator.pmdviolations.description = Number of PMD violations
# Properties for the Simian duplicate lines aggregator
maven.dashboard.aggregator.simiantdl.script =
${maven.dashboard.aggregators.dir}/simiantdl.jelly
1.14 +1 -1 maven-plugins/dashboard/src/plugin-test/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-plugins/dashboard/src/plugin-test/project.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.properties 25 May 2004 07:05:46 -0000 1.13
+++ project.properties 25 Jul 2004 07:38:50 -0000 1.14
@@ -36,7 +36,7 @@
# Define what dashboard aggregators will be run. This property is inherited
# by the subprojects and thus they don't need to define it again.
-maven.dashboard.aggregators =
csall,cserrors,cswarnings,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl
+maven.dashboard.aggregators =
csall,cserrors,cswarnings,csfiles,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl,pmdfiles,pmdviolations
# Make sure that an XML report is generated whenever Clover is run. Also
# inherited by the subprojects.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
