From 4d3200f9ae183b9d882b17c4dd2c2d38f47333ef Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 20 Sep 2004 10:04:46 +0000
Subject: [PATCH] Added new <code>jcoverageloc</code> aggregator that computes
 JCoverage total lines of code. MPDASHBOARD-12

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116049 13f79535-47bb-0310-9956-ffa450edef68
---
 dashboard/plugin.properties                   |  7 ++++
 .../aggregators/jcoverageloc.jelly            | 39 +++++++++++++++++++
 dashboard/src/plugin-test/project.properties  |  2 +-
 dashboard/xdocs/aggregators.xml               |  7 ++++
 dashboard/xdocs/changes.xml                   |  4 ++
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 dashboard/src/plugin-resources/aggregators/jcoverageloc.jelly

diff --git a/dashboard/plugin.properties b/dashboard/plugin.properties
index e2fc37d9..f8dd8201 100644
--- a/dashboard/plugin.properties
+++ b/dashboard/plugin.properties
@@ -182,3 +182,10 @@ maven.dashboard.aggregator.jcoveragelipc.artifact = ${maven.build.dir}/jcoverage
 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
+
+# Properties for the JCoverage total lines aggregator 
+maven.dashboard.aggregator.jcoverageloc.script = ${maven.dashboard.aggregators.dir}/jcoverageloc.jelly
+maven.dashboard.aggregator.jcoverageloc.artifact = ${maven.build.dir}/jcoverage/coverage.xml
+maven.dashboard.aggregator.jcoverageloc.label = JCoverage LOC
+maven.dashboard.aggregator.jcoverageloc.goal = maven-jcoverage-plugin:report
+maven.dashboard.aggregator.jcoverageloc.description = JCoverage total lines of code
diff --git a/dashboard/src/plugin-resources/aggregators/jcoverageloc.jelly b/dashboard/src/plugin-resources/aggregators/jcoverageloc.jelly
new file mode 100644
index 00000000..dce046e5
--- /dev/null
+++ b/dashboard/src/plugin-resources/aggregators/jcoverageloc.jelly
@@ -0,0 +1,39 @@
+<?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 total code lines.
+   ========================================================================
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
+
+  <u:file var="artifactAsFile" 
+      name="${maven.dashboard.aggregator.jcoverageloc.artifact}"/>
+  <j:choose>
+    <j:when test="${artifactAsFile.exists()}">
+      <x:parse var="doc" xml="${artifactAsFile}"/>
+	  <x:expr select="count($doc/coverage/class/line[@number>0])"/>
+    </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 9f8749de..5f55d91b 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,jcoveragelipc
+maven.dashboard.aggregators = csall,cserrors,cswarnings,csfiles,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl,pmdfiles,pmdviolations,jcoveragelipc,jcoverageloc
 
 # Make sure that an XML report is generated whenever Clover is run. Also
 # inherited by the subprojects.
diff --git a/dashboard/xdocs/aggregators.xml b/dashboard/xdocs/aggregators.xml
index 73796839..bf14e699 100644
--- a/dashboard/xdocs/aggregators.xml
+++ b/dashboard/xdocs/aggregators.xml
@@ -144,6 +144,13 @@
             Total percentage of lines covered.
           </td>
         </tr>
+        <tr>
+          <td>jcoverageloc</td>
+          <td>JCoverage</td>
+          <td>
+            Total number of code lines.
+          </td>
+        </tr>        
       </table>
     </section>
  </body>
diff --git a/dashboard/xdocs/changes.xml b/dashboard/xdocs/changes.xml
index 3cbc89db..faa9b610 100644
--- a/dashboard/xdocs/changes.xml
+++ b/dashboard/xdocs/changes.xml
@@ -25,6 +25,10 @@
   </properties>
   <body>
     <release version="1.5-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="add" issue="MPDASHBOARD-12" due-to="Thomas Recloux">
+        Added new <code>jcoverageloc</code> aggregator that computes JCoverage total
+        lines of code.
+      </action>
       <action dev="vmassol" type="add" issue="MPDASHBOARD-11" due-to="Thomas Recloux">
         Added new <code>jcoveragelipc</code> aggregator that computes JCoverage
         lines percentage.