From 428c6897e20b5c164f19590512d80538b6b35e06 Mon Sep 17 00:00:00 2001
From: carlos <carlos@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 11 Aug 2005 23:15:57 +0000
Subject: [PATCH] Added Cobertura aggregator

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@231535 13f79535-47bb-0310-9956-ffa450edef68
---
 dashboard/plugin.properties                   | 16 ++++++++
 .../aggregators/coberturalipc.jelly           | 40 +++++++++++++++++++
 .../aggregators/coberturaloc.jelly            | 39 ++++++++++++++++++
 dashboard/xdocs/changes.xml                   |  1 +
 4 files changed, 96 insertions(+)
 create mode 100644 dashboard/src/plugin-resources/aggregators/coberturalipc.jelly
 create mode 100644 dashboard/src/plugin-resources/aggregators/coberturaloc.jelly

diff --git a/dashboard/plugin.properties b/dashboard/plugin.properties
index 25fa30e5..3cec596a 100644
--- a/dashboard/plugin.properties
+++ b/dashboard/plugin.properties
@@ -222,6 +222,22 @@ maven.dashboard.aggregator.jcoverageloc.goal = maven-jcoverage-plugin:report
 maven.dashboard.aggregator.jcoverageloc.description = JCoverage total lines of code
 maven.dashboard.aggregator.jcoverageloc.report = jcoverage/index.html
 
+# Properties for the Cobertura covered lines percent aggregator 
+maven.dashboard.aggregator.coberturalipc.script = ${maven.dashboard.aggregators.dir}/coberturalipc.jelly
+maven.dashboard.aggregator.coberturalipc.artifact = ${maven.docs.dest}/cobertura/coverage.xml
+maven.dashboard.aggregator.coberturalipc.label = Cobertura %lines
+maven.dashboard.aggregator.coberturalipc.goal = maven-cobertura-plugin:report
+maven.dashboard.aggregator.coberturalipc.description = Cobertura covered lines percentile
+maven.dashboard.aggregator.coberturalipc.report = cobertura/index.html
+
+# Properties for the Cobertura total lines aggregator 
+maven.dashboard.aggregator.coberturaloc.script = ${maven.dashboard.aggregators.dir}/coberturaloc.jelly
+maven.dashboard.aggregator.coberturaloc.artifact = ${maven.docs.dest}/cobertura/coverage.xml
+maven.dashboard.aggregator.coberturaloc.label = Cobertura LOC
+maven.dashboard.aggregator.coberturaloc.goal = maven-cobertura-plugin:report
+maven.dashboard.aggregator.coberturaloc.description = Cobertura total lines of code
+maven.dashboard.aggregator.coberturaloc.report = cobertura/index.html
+
 # Properties for the FindBugs file violations aggregator 
 maven.dashboard.aggregator.fbfiles.script = ${maven.dashboard.aggregators.dir}/fbfiles.jelly
 maven.dashboard.aggregator.fbfiles.artifact = ${maven.build.dir}/findbugs-raw-report.xml
diff --git a/dashboard/src/plugin-resources/aggregators/coberturalipc.jelly b/dashboard/src/plugin-resources/aggregators/coberturalipc.jelly
new file mode 100644
index 00000000..12b0bb5e
--- /dev/null
+++ b/dashboard/src/plugin-resources/aggregators/coberturalipc.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.
+ */
+ -->
+
+<!--
+   ========================================================================
+     Cobertura aggregator. Extracts Cobertura %lines.
+   ========================================================================
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
+
+  <u:file var="artifactAsFile" 
+      name="${maven.dashboard.aggregator.coberturalipc.artifact}"/>
+  <j:choose>
+    <j:when test="${artifactAsFile.exists()}">
+      <x:parse var="doc" xml="${artifactAsFile}"/>
+	  <x:expr select="floor(100*count($doc/coverage/packages/package/classes/class/lines/line[@hits>0]) div count($doc/coverage/packages/package/classes/class/lines/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-resources/aggregators/coberturaloc.jelly b/dashboard/src/plugin-resources/aggregators/coberturaloc.jelly
new file mode 100644
index 00000000..336ecd9d
--- /dev/null
+++ b/dashboard/src/plugin-resources/aggregators/coberturaloc.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.
+ */
+ -->
+
+<!--
+   ========================================================================
+     Cobertura aggregator. Extracts Cobertura 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.coberturaloc.artifact}"/>
+  <j:choose>
+    <j:when test="${artifactAsFile.exists()}">
+      <x:parse var="doc" xml="${artifactAsFile}"/>
+	  <x:expr select="count($doc/coverage/packages/package/classes/class/lines/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/xdocs/changes.xml b/dashboard/xdocs/changes.xml
index 040ad289..1c16757c 100644
--- a/dashboard/xdocs/changes.xml
+++ b/dashboard/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.9-SNAPSHOT" date="in svn">
+      <action dev="carlos" type="add" issue="MPDASHBOARD-31">Added Cobertura aggregator.</action>
       <action dev="vmassol" type="fix" issue="MPDASHBOARD-27">
         Properties <code>maven.dashboard.basedir</code>,
         <code>maven.dashboard.includes</code>, <code>maven.dashboard.excludes</code>