From 2f5f396b718607ff2ae538e56eb3c067a895ad39 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 6 Sep 2004 16:56:50 +0000
Subject: [PATCH] Added new <code>jcoveragelipc</code> aggregator that computes
 JCoverage lines percentage.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116041 13f79535-47bb-0310-9956-ffa450edef68
---
 dashboard/plugin.properties                   |  7 ++++
 dashboard/project.xml                         |  2 +-
 .../aggregators/jcoveragelipc.jelly           | 40 +++++++++++++++++++
 dashboard/src/plugin-test/project.properties  |  2 +-
 .../src/plugin-test/subproject1/project.xml   |  1 +
 dashboard/xdocs/aggregators.xml               |  7 ++++
 dashboard/xdocs/changes.xml                   |  6 +++
 7 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 dashboard/src/plugin-resources/aggregators/jcoveragelipc.jelly

diff --git a/dashboard/plugin.properties b/dashboard/plugin.properties
index 4bd51e77..e2fc37d9 100644
--- a/dashboard/plugin.properties
+++ b/dashboard/plugin.properties
@@ -175,3 +175,10 @@ maven.dashboard.aggregator.simiantdl.artifact = ${maven.build.dir}/generated-xdo
 maven.dashboard.aggregator.simiantdl.label = Simian TDL
 maven.dashboard.aggregator.simiantdl.goal = maven-simian-plugin:report
 maven.dashboard.aggregator.simiantdl.description = Simian Total Duplicate Lines
+
+# Properties for the JCoverage covered lines percent aggregator 
+maven.dashboard.aggregator.jcoveragelipc.script = ${maven.dashboard.aggregators.dir}/jcoveragelipc.jelly
+maven.dashboard.aggregator.jcoveragelipc.artifact = ${maven.build.dir}/jcoverage/coverage.xml
+maven.dashboard.aggregator.jcoveragelipc.label = JCoverage %lines
+maven.dashboard.aggregator.jcoveragelipc.goal = maven-jcoverage-plugin:report
+maven.dashboard.aggregator.jcoveragelipc.description = JCoverage covered lines percentile
diff --git a/dashboard/project.xml b/dashboard/project.xml
index 5898a6f7..bbbd29a0 100644
--- a/dashboard/project.xml
+++ b/dashboard/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-dashboard-plugin</id>
   <name>Maven Dashboard Plugin</name>
-  <currentVersion>1.4</currentVersion>
+  <currentVersion>1.5-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>
diff --git a/dashboard/src/plugin-resources/aggregators/jcoveragelipc.jelly b/dashboard/src/plugin-resources/aggregators/jcoveragelipc.jelly
new file mode 100644
index 00000000..ac5a9e79
--- /dev/null
+++ b/dashboard/src/plugin-resources/aggregators/jcoveragelipc.jelly
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<!-- 
+/*
+ * Copyright 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.
+ */
+ -->
+
+<!--
+   ========================================================================
+     JCoverage aggregator. Extracts JCoverage %lines.
+   ========================================================================
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
+
+  <u:file var="artifactAsFile" 
+      name="${maven.dashboard.aggregator.jcoveragelipc.artifact}"/>
+  <j:choose>
+    <j:when test="${artifactAsFile.exists()}">
+      <x:parse var="doc" xml="${artifactAsFile}"/>
+	  <x:expr select="floor(100*count($doc/coverage/class/line[@hits>0]) div count($doc/coverage/class/line[@number>0])+0.5)"/>
+      %
+    </j:when>
+    <j:otherwise>
+      <j:expr value="-"/>
+    </j:otherwise>
+  </j:choose>
+</j:jelly>
\ No newline at end of file
diff --git a/dashboard/src/plugin-test/project.properties b/dashboard/src/plugin-test/project.properties
index 45c733e7..9f8749de 100644
--- a/dashboard/src/plugin-test/project.properties
+++ b/dashboard/src/plugin-test/project.properties
@@ -36,7 +36,7 @@ maven.dashboard.runreactor = false
 
 # 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,csfiles,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl,pmdfiles,pmdviolations
+maven.dashboard.aggregators = csall,cserrors,cswarnings,csfiles,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl,pmdfiles,pmdviolations,jcoveragelipc
 
 # Make sure that an XML report is generated whenever Clover is run. Also
 # inherited by the subprojects.
diff --git a/dashboard/src/plugin-test/subproject1/project.xml b/dashboard/src/plugin-test/subproject1/project.xml
index ca22f33f..04cb997e 100644
--- a/dashboard/src/plugin-test/subproject1/project.xml
+++ b/dashboard/src/plugin-test/subproject1/project.xml
@@ -39,5 +39,6 @@
     <report>maven-clover-plugin</report>
     <report>maven-junit-report-plugin</report>
     <report>maven-simian-plugin</report>
+    <report>maven-jcoverage-plugin</report>    
   </reports>
 </project>
diff --git a/dashboard/xdocs/aggregators.xml b/dashboard/xdocs/aggregators.xml
index 67f14881..73796839 100644
--- a/dashboard/xdocs/aggregators.xml
+++ b/dashboard/xdocs/aggregators.xml
@@ -137,6 +137,13 @@
             Total number of duplicate lines found by Simian.
           </td>
         </tr>
+        <tr>
+          <td>jcoveragelipc</td>
+          <td>JCoverage</td>
+          <td>
+            Total percentage of lines covered.
+          </td>
+        </tr>
       </table>
     </section>
  </body>
diff --git a/dashboard/xdocs/changes.xml b/dashboard/xdocs/changes.xml
index fa42e353..3cbc89db 100644
--- a/dashboard/xdocs/changes.xml
+++ b/dashboard/xdocs/changes.xml
@@ -24,6 +24,12 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
+    <release version="1.5-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="add" issue="MPDASHBOARD-11" due-to="Thomas Recloux">
+        Added new <code>jcoveragelipc</code> aggregator that computes JCoverage
+        lines percentage.
+      </action>
+    </release>
     <release version="1.4" date="2004-08-15">
       <action dev="vmassol" type="fix" issue="MPDASHBOARD-8" due-to="Carlos Sanchez">Fixed documentation regarding the
         <code>maven.dashboard.rungoals</code>property.