From 241b65b1d477a10e359f1ff8034614f3dcd91fc3 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 1 Dec 2005 23:33:35 +0000
Subject: [PATCH] PR: MPDASHBOARD-34 Submitted by: Philippe Kernevez Reviewed
 by: aheritier Cobertura aggregator don't support offline mode. The workaround
 for the jelly bug makes this aggregator only compatible with maven 1.1+.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@351521 13f79535-47bb-0310-9956-ffa450edef68
---
 .../plugin-resources/aggregators/coberturalipc.jelly   |  9 +++++++--
 .../plugin-resources/aggregators/coberturaloc.jelly    | 10 +++++++---
 dashboard/xdocs/aggregators.xml                        |  4 ++--
 dashboard/xdocs/changes.xml                            |  1 +
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dashboard/src/plugin-resources/aggregators/coberturalipc.jelly b/dashboard/src/plugin-resources/aggregators/coberturalipc.jelly
index 12b0bb5e..e185e57e 100644
--- a/dashboard/src/plugin-resources/aggregators/coberturalipc.jelly
+++ b/dashboard/src/plugin-resources/aggregators/coberturalipc.jelly
@@ -27,9 +27,14 @@
 
   <u:file var="artifactAsFile" 
       name="${maven.dashboard.aggregator.coberturalipc.artifact}"/>
+
   <j:choose>
     <j:when test="${artifactAsFile.exists()}">
-      <x:parse var="doc" xml="${artifactAsFile}"/>
+	  <u:loadText encoding="UTF-8" file="${maven.dashboard.aggregator.coberturalipc.artifact}" var="artifactAsText" />
+  	  <u:replace new="" old="&lt;!DOCTYPE coverage SYSTEM &#0034;http://cobertura.sourceforge.net/xml/coverage-02.dtd&#0034;>" 
+  		var="fileWithoutDTD" value="${artifactAsText}"/>
+
+      <x:parse var="doc" text="${fileWithoutDTD}"/>
 	  <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>
@@ -37,4 +42,4 @@
       <j:expr value="-"/>
     </j:otherwise>
   </j:choose>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/dashboard/src/plugin-resources/aggregators/coberturaloc.jelly b/dashboard/src/plugin-resources/aggregators/coberturaloc.jelly
index 336ecd9d..52806f3c 100644
--- a/dashboard/src/plugin-resources/aggregators/coberturaloc.jelly
+++ b/dashboard/src/plugin-resources/aggregators/coberturaloc.jelly
@@ -24,16 +24,20 @@
    ========================================================================
 -->
 <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}"/>
+	  <u:loadText encoding="UTF-8" file="${maven.dashboard.aggregator.coberturaloc.artifact}" var="artifactAsText" />
+  	  <u:replace new="" old="&lt;!DOCTYPE coverage SYSTEM &#0034;http://cobertura.sourceforge.net/xml/coverage-02.dtd&#0034;>" 
+  	    var="fileWithoutDTD" value="${artifactAsText}"/>
+      <x:parse var="doc" text="${fileWithoutDTD}"/>
 	  <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
+</j:jelly>
diff --git a/dashboard/xdocs/aggregators.xml b/dashboard/xdocs/aggregators.xml
index 9ad7d0a5..e8062d05 100644
--- a/dashboard/xdocs/aggregators.xml
+++ b/dashboard/xdocs/aggregators.xml
@@ -148,14 +148,14 @@
           <td>coberturaloc</td>
           <td>Cobertura</td>
           <td>
-            Total number of code lines.
+            Total number of code lines. WORKS ONLY WITH MAVEN 1.1.
           </td>
         </tr>        
         <tr>
           <td>jcoveragelipc</td>
           <td>JCoverage</td>
           <td>
-            Total percentage of lines covered.
+            Total percentage of lines covered. WORKS ONLY WITH MAVEN 1.1.
           </td>
         </tr>
         <tr>
diff --git a/dashboard/xdocs/changes.xml b/dashboard/xdocs/changes.xml
index 60005ae5..cf978a8a 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="aheritier" type="fix" issue="MPDASHBOARD-34" due-to="Philippe Kernevez">Cobertura aggregator don't support offline mode. From now the Cobertura aggregator works only with MAVEN 1.1.</action>
       <action dev="aheritier" type="update" issue="MPDASHBOARD-33" due-to="carlos@apache.org">Update the default checkstyle report location to make it compatible with Checkstyle plugin 3.0+ (MPCHECKSTYLE-40).</action>
       <action dev="carlos" type="add" issue="MPDASHBOARD-31">Added Cobertura aggregator.</action>
       <action dev="vmassol" type="fix" issue="MPDASHBOARD-27">