? dashboard/src/target
? dashboard/src/plugin-resources/images
? dashboard/src/plugin-resources/aggregators/fbfiles.jelly
? dashboard/src/plugin-resources/aggregators/fbviolations.jelly
cvs server: Diffing .
cvs server: Diffing dashboard
Index: dashboard/plugin.properties
===================================================================
RCS file: /home/cvspublic/maven-plugins/dashboard/plugin.properties,v
retrieving revision 1.11
diff -u -r1.11 plugin.properties
--- dashboard/plugin.properties	20 Sep 2004 10:04:46 -0000	1.11
+++ dashboard/plugin.properties	24 Sep 2004 20:09:12 -0000
@@ -75,6 +75,17 @@
 # Decide whether to call goals associated with report types or not
 maven.dashboard.rungoals = true
 
+# images used when generating the progress bar for the dashboard
+# HTML color for left bar
+maven.dashboard.report.bar.left=green
+# HTML color for right bar
+maven.dashboard.report.bar.right=red
+# image to set cells with (should be transparent)
+maven.dashboard.report.bar.image=images/trans.gif
+maven.dashboard.report.bar.height=10
+maven.dashboard.report.bar.border=0
+maven.dashboard.report.bar.displayLabel=true
+
 # Default aggregators
 # -------------------
 
@@ -189,3 +200,18 @@
 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
+
+# Properties for the FindBugs 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
+maven.dashboard.aggregator.fbfiles.label = FindBugs Files with Violations
+maven.dashboard.aggregator.fbfiles.goal = maven-findbugs-plugin:report
+maven.dashboard.aggregator.fbfiles.description = Number of files with FindBugs violations
+
+# Properties for the FindBugs violations aggregator 
+maven.dashboard.aggregator.fbviolations.script = ${maven.dashboard.aggregators.dir}/fbviolations.jelly
+maven.dashboard.aggregator.fbviolations.artifact = ${maven.build.dir}/findbugs-raw-report.xml
+maven.dashboard.aggregator.fbviolations.label = FindBugs Violations
+maven.dashboard.aggregator.fbviolations.goal = maven-findbugs-plugin:report
+maven.dashboard.aggregator.fbviolations.description = Number of FindBugs violations
+
cvs server: Diffing dashboard/src
cvs server: Diffing dashboard/src/main
cvs server: Diffing dashboard/src/main/org
cvs server: Diffing dashboard/src/main/org/apache
cvs server: Diffing dashboard/src/main/org/apache/maven
cvs server: Diffing dashboard/src/main/org/apache/maven/dashboard
cvs server: Diffing dashboard/src/main/org/apache/maven/dashboard/aggregator
cvs server: Diffing dashboard/src/main/org/apache/maven/dashboard/aggregator/clover
cvs server: Diffing dashboard/src/plugin-resources
cvs server: Diffing dashboard/src/plugin-resources/aggregators
cvs server: Diffing dashboard/src/plugin-resources/templates
Index: dashboard/src/plugin-resources/templates/dashboard.jsl
===================================================================
RCS file: /home/cvspublic/maven-plugins/dashboard/src/plugin-resources/templates/dashboard.jsl,v
retrieving revision 1.6
diff -u -r1.6 dashboard.jsl
--- dashboard/src/plugin-resources/templates/dashboard.jsl	21 Apr 2004 00:55:43 -0000	1.6
+++ dashboard/src/plugin-resources/templates/dashboard.jsl	24 Sep 2004 20:09:12 -0000
@@ -25,6 +25,7 @@
   xmlns:j="jelly:core"
   xmlns:jsl="jelly:jsl"
   xmlns:x="jelly:xml"
+  xmlns:u="jelly:util"
   xmlns="dummy" trim="false">
 
   <jsl:template match="dashboard">
@@ -78,7 +79,81 @@
 
   <jsl:template match="aggregator">
     <td>
-      <x:expr select="text()"/>
+    <x:set var="str" select="string()"/>
+    <!-- if aggregator output is a not percentage value, just print the value -->
+    <!-- could print a different background color based on a configurable -->
+    <!-- range, see MPDASHBOARD-2 in Jira issues for this plugin -->
+    <j:if test="${str.trim().endsWith('%') == 'false'}">
+      <x:expr select="text()"/> 
+    </j:if>
+
+    <!-- if aggregator output is a percentage value, print a progress bar -->
+    <j:if test="${str.trim().endsWith('%') == 'true'}">
+
+      <!-- convert percentage string to two complementary numbers -->
+      <u:replace var="percentStr" value="${str}" oldChar="%" newChar=" " trim="true"/>
+      <j:set var="percent"  value="${0 + percentStr.trim()}"/>
+      <j:set var="cpercent" value="${100 - percent}"/>
+
+      <j:whitespace trim="true">
+        <table>
+          <j:if test="${context.getVariable('maven.dashboard.report.bar.displayLabel') == 'true'}">
+            <tr>
+              <x:element name="td">
+                <x:attribute name="colspan">2</x:attribute>
+                <j:expr value="${percent}%"/>
+              </x:element>
+            </tr>
+          </j:if>
+          <tr>
+            <j:if test="${percent != '0'}">
+              <x:element name="td">
+                <x:attribute name="bgcolor">
+                  <j:expr value="${maven.dashboard.report.bar.left}"/>
+                </x:attribute>
+                <x:element name="img">
+                  <x:attribute name="hspace">0</x:attribute>
+                  <x:attribute name="vspace">0</x:attribute>
+                  <x:attribute name="src">
+                    <j:expr value="${maven.dashboard.report.bar.image}"/>
+                  </x:attribute>
+                  <x:attribute name="height">
+                    <j:expr value="${maven.dashboard.report.bar.height}"/>
+                  </x:attribute>
+                  <x:attribute name="border">        
+                    <j:expr value="${maven.dashboard.report.bar.border}"/>
+                  </x:attribute>
+                  <x:attribute name="width">${percent}</x:attribute>
+                  <x:attribute name="alt">${percent}%</x:attribute>
+                </x:element>
+              </x:element>
+            </j:if>
+            <j:if test="${cpercent != '0'}">
+              <x:element name="td">
+                <x:attribute name="bgcolor">
+                  <j:expr value="${maven.dashboard.report.bar.right}"/>
+                </x:attribute>
+                <x:element name="img">
+                  <x:attribute name="hspace">0</x:attribute>
+                  <x:attribute name="vspace">0</x:attribute>
+                  <x:attribute name="src">
+                    <j:expr value="${maven.dashboard.report.bar.image}"/>
+                  </x:attribute>
+                  <x:attribute name="height">
+                    <j:expr value="${maven.dashboard.report.bar.height}"/>
+                  </x:attribute>
+                  <x:attribute name="border">        
+                    <j:expr value="${maven.dashboard.report.bar.border}"/>
+                  </x:attribute>
+                  <x:attribute name="width">${cpercent}</x:attribute>
+                  <x:attribute name="alt">${cpercent}%</x:attribute>
+                </x:element>
+              </x:element>
+            </j:if>
+          </tr>
+        </table>
+      </j:whitespace>
+    </j:if>
     </td>
   </jsl:template>
 
cvs server: Diffing dashboard/src/plugin-test
cvs server: Diffing dashboard/src/plugin-test/subproject1
cvs server: Diffing dashboard/src/plugin-test/subproject1/src
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/java
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/java/org
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/java/org/apache
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/java/org/apache/maven
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard/test
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard/test/subproject1
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/test
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/test/org
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/test/org/apache
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/test/org/apache/maven
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/test/org/apache/maven/dashboard
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/test/org/apache/maven/dashboard/test
cvs server: Diffing dashboard/src/plugin-test/subproject1/src/test/org/apache/maven/dashboard/test/subproject1
cvs server: Diffing dashboard/src/plugin-test/subproject2
cvs server: Diffing dashboard/src/plugin-test/subproject2/src
cvs server: Diffing dashboard/src/plugin-test/subproject2/src/java
cvs server: Diffing dashboard/src/plugin-test/subproject2/src/java/org
cvs server: Diffing dashboard/src/plugin-test/subproject2/src/java/org/apache
cvs server: Diffing dashboard/src/plugin-test/subproject2/src/java/org/apache/maven
cvs server: Diffing dashboard/src/plugin-test/subproject2/src/java/org/apache/maven/dashboard
cvs server: Diffing dashboard/src/plugin-test/subproject2/src/java/org/apache/maven/dashboard/test
cvs server: Diffing dashboard/src/plugin-test/subproject2/src/java/org/apache/maven/dashboard/test/subproject2
cvs server: Diffing dashboard/src/plugin-test/subproject3
cvs server: Diffing dashboard/xdocs
Index: dashboard/xdocs/changes.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/dashboard/xdocs/changes.xml,v
retrieving revision 1.25
diff -u -r1.25 changes.xml
--- dashboard/xdocs/changes.xml	20 Sep 2004 10:04:46 -0000	1.25
+++ dashboard/xdocs/changes.xml	24 Sep 2004 20:09:13 -0000
@@ -25,6 +25,17 @@
   </properties>
   <body>
     <release version="1.5-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="add" issue="MPDASHBOARD-13" due-to="Nascif Abousalh-Neto">
+        Added new <code>fbfiles</code> aggregator that computes FindBugs total number of files 
+        with violations.
+      </action>
+      <action dev="vmassol" type="add" issue="MPDASHBOARD-13" due-to="Nascif Abousalh-Neto">
+        Added new <code>fbviolations</code> aggregator that computes FindBugs total number 
+        of violations.
+      </action>
+      <action dev="vmassol" type="add" issue="MPDASHBOARD-3" due-to="Nascif Abousalh-Neto">
+        Added percentage bar graphs to the report.
+      </action>      
       <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.