From b3fa3b0428ccd83c7701102a50ba0dcfa6287e12 Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 26 Jan 2006 22:35:18 +0000
Subject: [PATCH] Use commons-lang StringUtils for string replacement to fix
 maven 1.0 compatibility issues.

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

diff --git a/dashboard/plugin.jelly b/dashboard/plugin.jelly
index cadc06d1..4fd7afcb 100644
--- a/dashboard/plugin.jelly
+++ b/dashboard/plugin.jelly
@@ -58,7 +58,7 @@
 
     <m:get var="mIgnoreFailures" property="maven.multiproject.ignoreFailures" plugin="maven-multiproject-plugin"/>
     <m:property var="dIgnoreFailures" name="maven.dashboard.ignoreFailures" defaultValue="${mIgnoreFailures}"/>
-        
+
   </goal>
   
   <!--
@@ -125,6 +125,7 @@
         <j:forEach var="reactorProject" items="${reactorProjects}">
           <u:available 
               file="${reactorProject.context.getVariable('maven.build.dir')}/dashboard-single.xml">
+              <!-- FIXME: this should be maven.dashboard.report.single -->
 
             <x:element name="project">
               <x:attribute name="name">${reactorProject.name}</x:attribute>          
@@ -187,6 +188,8 @@
   -->
   <goal name="dashboard:report-single">
 
+    <j:useBean var="stringUtils" class="org.apache.commons.lang.StringUtils"/>
+
     <a:dirname property="singleReportDir" file="${maven.dashboard.report.single}"/>
     <a:mkdir dir="${singleReportDir}"/>
 
@@ -240,6 +243,7 @@
            this is report used by the Clover aggregators to extract information 
            from). The reason we disable the other reports is to win some response
            time. -->
+      <!-- FIXME: pom.getVariable?  -->
       <j:set var="cloverReportXml"
           value="${pom.getVariable('maven.clover.report.xml')}"/>
       <j:set var="maven.clover.report.xml" value="true" scope="parent"/>
diff --git a/dashboard/project.xml b/dashboard/project.xml
index c1fd2755..c11eaa77 100644
--- a/dashboard/project.xml
+++ b/dashboard/project.xml
@@ -129,5 +129,15 @@
       <organization>IT20one GmbH</organization>
     </contributor>
   </contributors>
-  <dependencies/>
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.0</version>
+      <url>http://jakarta.apache.org/commons/lang/</url>
+      <properties>
+        <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
+      </properties>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/dashboard/src/plugin-resources/aggregators/coberturalipc.jelly b/dashboard/src/plugin-resources/aggregators/coberturalipc.jelly
index e185e57e..1f524b4d 100644
--- a/dashboard/src/plugin-resources/aggregators/coberturalipc.jelly
+++ b/dashboard/src/plugin-resources/aggregators/coberturalipc.jelly
@@ -30,13 +30,10 @@
 
   <j:choose>
     <j:when test="${artifactAsFile.exists()}">
-	  <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}"/>
-
+      <u:loadText file="${maven.dashboard.aggregator.coberturalipc.artifact}" var="artifactAsText" />
+      <j:set var="fileWithoutDTD" value="${stringUtils.replace(artifactAsText, '&lt;!DOCTYPE coverage SYSTEM &#0034;http://cobertura.sourceforge.net/xml/coverage-02.dtd&#0034;>', '')}"/>
       <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)"/>
-      %
+      <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="-"/>
diff --git a/dashboard/src/plugin-resources/aggregators/coberturaloc.jelly b/dashboard/src/plugin-resources/aggregators/coberturaloc.jelly
index 52806f3c..87c991d7 100644
--- a/dashboard/src/plugin-resources/aggregators/coberturaloc.jelly
+++ b/dashboard/src/plugin-resources/aggregators/coberturaloc.jelly
@@ -30,11 +30,10 @@
   
   <j:choose>
     <j:when test="${artifactAsFile.exists()}">
-	  <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}"/>
+      <u:loadText file="${maven.dashboard.aggregator.coberturaloc.artifact}" var="artifactAsText" />
+      <j:set var="fileWithoutDTD" value="${stringUtils.replace(artifactAsText, '&lt;!DOCTYPE coverage SYSTEM &#0034;http://cobertura.sourceforge.net/xml/coverage-02.dtd&#0034;>', '')}"/>
       <x:parse var="doc" text="${fileWithoutDTD}"/>
-	  <x:expr select="count($doc/coverage/packages/package/classes/class/lines/line[@number>0])"/>
+      <x:expr select="count($doc/coverage/packages/package/classes/class/lines/line[@number>0])"/>
     </j:when>
     <j:otherwise>
       <j:expr value="-"/>