Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPDASHBOARD-34

Browse Source 
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
This commit is contained in:
aheritier 2005-12-01 23:33:35 +00:00
parent a3c8cd1f80
commit 241b65b1d4
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dashboard/src/plugin-resources/aggregators/coberturalipc.jelly
View File

@ -27,9 +27,14 @@
<u:file var="artifactAsFile" <u:file var="artifactAsFile"
name="${maven.dashboard.aggregator.coberturalipc.artifact}"/> name="${maven.dashboard.aggregator.coberturalipc.artifact}"/>
<j:choose> <j:choose>
<j:when test="${artifactAsFile.exists()}"> <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)"/> <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:when>
@ -37,4 +42,4 @@
<j:expr value="-"/> <j:expr value="-"/>
</j:otherwise> </j:otherwise>
</j:choose> </j:choose>
</j:jelly> </j:jelly>

10
dashboard/src/plugin-resources/aggregators/coberturaloc.jelly
View File

@ -24,16 +24,20 @@
======================================================================== ========================================================================
--> -->
<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util"> <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:u="jelly:util">
<u:file var="artifactAsFile" <u:file var="artifactAsFile"
name="${maven.dashboard.aggregator.coberturaloc.artifact}"/> name="${maven.dashboard.aggregator.coberturaloc.artifact}"/>
<j:choose> <j:choose>
<j:when test="${artifactAsFile.exists()}"> <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])"/> <x:expr select="count($doc/coverage/packages/package/classes/class/lines/line[@number>0])"/>
</j:when> </j:when>
<j:otherwise> <j:otherwise>
<j:expr value="-"/> <j:expr value="-"/>
</j:otherwise> </j:otherwise>
</j:choose> </j:choose>
</j:jelly> </j:jelly>

4
dashboard/xdocs/aggregators.xml
View File

@ -148,14 +148,14 @@
<td>coberturaloc</td> <td>coberturaloc</td>
<td>Cobertura</td> <td>Cobertura</td>
<td> <td>
Total number of code lines. Total number of code lines. WORKS ONLY WITH MAVEN 1.1.
</td> </td>
</tr> </tr>
<tr> <tr>
<td>jcoveragelipc</td> <td>jcoveragelipc</td>
<td>JCoverage</td> <td>JCoverage</td>
<td> <td>
Total percentage of lines covered. Total percentage of lines covered. WORKS ONLY WITH MAVEN 1.1.
</td> </td>
</tr> </tr>
<tr> <tr>

1
dashboard/xdocs/changes.xml
View File

@ -25,6 +25,7 @@
</properties> </properties>
<body> <body>
<release version="1.9-SNAPSHOT" date="in svn"> <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="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="carlos" type="add" issue="MPDASHBOARD-31">Added Cobertura aggregator.</action>
<action dev="vmassol" type="fix" issue="MPDASHBOARD-27"> <action dev="vmassol" type="fix" issue="MPDASHBOARD-27">