Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/dashboard/plugin.jelly,v
retrieving revision 1.12
diff -u -r1.12 plugin.jelly
--- plugin.jelly	13 Oct 2004 09:45:10 -0000	1.12
+++ plugin.jelly	16 Jan 2005 16:35:13 -0000
@@ -97,7 +97,7 @@
 
             <x:element name="project">
               <x:attribute name="name">${reactorProject.name}</x:attribute>          
-
+              <x:attribute name="artifactId">${reactorProject.artifactId}</x:attribute>          
               <!-- Extract all reports from the single dashboards -->
   
               <!-- TODO: Find a way to not hardcode the dashboard data 
Index: plugin.properties
===================================================================
RCS file: /home/cvspublic/maven-plugins/dashboard/plugin.properties,v
retrieving revision 1.15
diff -u -r1.15 plugin.properties
--- plugin.properties	26 Nov 2004 08:33:03 -0000	1.15
+++ plugin.properties	16 Jan 2005 16:35:13 -0000
@@ -97,6 +97,7 @@
 maven.dashboard.aggregator.csfiles.label = CS Files
 maven.dashboard.aggregator.csfiles.goal = checkstyle
 maven.dashboard.aggregator.csfiles.description = Number of files checked with Checkstyle
+maven.dashboard.aggregator.csfiles.report = checkstyle-report.html
 
 # Properties for the Checkstyle error/warning aggregator (all errors/warnings)
 maven.dashboard.aggregator.csall.script = ${maven.dashboard.aggregators.dir}/csall.jelly
@@ -104,6 +105,7 @@
 maven.dashboard.aggregator.csall.label = CS err/warn
 maven.dashboard.aggregator.csall.goal = checkstyle
 maven.dashboard.aggregator.csall.description = Number of Checkstyle errors and warnings
+maven.dashboard.aggregator.csall.report = checkstyle-report.html
 
 # Properties for the Checkstyle error aggregator (only errors)
 maven.dashboard.aggregator.cserrors.script = ${maven.dashboard.aggregators.dir}/cserrors.jelly
@@ -111,6 +113,7 @@
 maven.dashboard.aggregator.cserrors.label = CS errors
 maven.dashboard.aggregator.cserrors.goal = checkstyle
 maven.dashboard.aggregator.cserrors.description = Number of Checkstyle errors
+maven.dashboard.aggregator.cserrors.report = checkstyle-report.html
 
 # Properties for the Checkstyle warning aggregator (only warnings)
 maven.dashboard.aggregator.cswarnings.script = ${maven.dashboard.aggregators.dir}/cswarnings.jelly
@@ -118,6 +121,7 @@
 maven.dashboard.aggregator.cswarnings.label = CS warnings
 maven.dashboard.aggregator.cswarnings.goal = checkstyle
 maven.dashboard.aggregator.cswarnings.description = Number of Checkstyle warnings
+maven.dashboard.aggregator.cswarnings.report = checkstyle-report.html
 
 # Properties for the Clover TPC aggregator (TPC = Total Percent Coverage)
 maven.dashboard.aggregator.clovertpc.script = ${maven.dashboard.aggregators.dir}/clovertpc.jelly
@@ -146,6 +150,7 @@
 maven.dashboard.aggregator.junittests.label = JUnit Tests
 maven.dashboard.aggregator.junittests.goal = junit-report:report
 maven.dashboard.aggregator.junittests.description = Number of JUnit tests
+maven.dashboard.aggregator.junittests.report = junit-report.html
 
 # Properties for the JUnit Failures aggregator 
 maven.dashboard.aggregator.junitfailures.script = ${maven.dashboard.aggregators.dir}/junitfailures.jelly
@@ -153,6 +158,7 @@
 maven.dashboard.aggregator.junitfailures.label = JUnit Failures
 maven.dashboard.aggregator.junitfailures.goal = junit-report:report
 maven.dashboard.aggregator.junitfailures.description = Number of JUnit test failures
+maven.dashboard.aggregator.junitfailures.report = junit-report.html
 
 # Properties for the JUnit Errors aggregator 
 maven.dashboard.aggregator.juniterrors.script = ${maven.dashboard.aggregators.dir}/juniterrors.jelly
@@ -160,6 +166,7 @@
 maven.dashboard.aggregator.juniterrors.label = JUnit Errors
 maven.dashboard.aggregator.juniterrors.goal = junit-report:report
 maven.dashboard.aggregator.juniterrors.description = Number of JUnit test errors
+maven.dashboard.aggregator.juniterrors.report = junit-report.html
 
 # Properties for the JUnit Pass Rate aggregator 
 maven.dashboard.aggregator.junitpassrate.script = ${maven.dashboard.aggregators.dir}/junitpassrate.jelly
@@ -167,6 +174,7 @@
 maven.dashboard.aggregator.junitpassrate.label = JUnit Pass Rate
 maven.dashboard.aggregator.junitpassrate.goal = junit-report:report
 maven.dashboard.aggregator.junitpassrate.description = Percentage of JUnit tests that have passed vs tests in error or failed
+maven.dashboard.aggregator.junitpassrate.report = junit-report.html
 
 # Properties for the PMD violations aggregator 
 maven.dashboard.aggregator.pmdfiles.script = ${maven.dashboard.aggregators.dir}/pmdfiles.jelly
@@ -174,6 +182,7 @@
 maven.dashboard.aggregator.pmdfiles.label = PMD Files with Violations
 maven.dashboard.aggregator.pmdfiles.goal = pmd:report
 maven.dashboard.aggregator.pmdfiles.description = Number of files with PMD violations
+maven.dashboard.aggregator.pmdfiles.report = pmd-report.html
 
 # Properties for the PMD violations aggregator 
 maven.dashboard.aggregator.pmdviolations.script = ${maven.dashboard.aggregators.dir}/pmdviolations.jelly
@@ -181,6 +190,7 @@
 maven.dashboard.aggregator.pmdviolations.label = PMD Violations
 maven.dashboard.aggregator.pmdviolations.goal = pmd:report
 maven.dashboard.aggregator.pmdviolations.description = Number of PMD violations
+maven.dashboard.aggregator.pmdviolations.report = pmd-report.html
 
 # Properties for the Simian duplicate lines aggregator 
 maven.dashboard.aggregator.simiantdl.script = ${maven.dashboard.aggregators.dir}/simiantdl.jelly
@@ -188,6 +198,7 @@
 maven.dashboard.aggregator.simiantdl.label = Simian TDL
 maven.dashboard.aggregator.simiantdl.goal = maven-simian-plugin:report
 maven.dashboard.aggregator.simiantdl.description = Simian Total Duplicate Lines
+maven.dashboard.aggregator.simiantdl.report = simian-report.html
 
 # Properties for the JCoverage covered lines percent aggregator 
 maven.dashboard.aggregator.jcoveragelipc.script = ${maven.dashboard.aggregators.dir}/jcoveragelipc.jelly
@@ -195,6 +206,7 @@
 maven.dashboard.aggregator.jcoveragelipc.label = JCoverage %lines
 maven.dashboard.aggregator.jcoveragelipc.goal = maven-jcoverage-plugin:report
 maven.dashboard.aggregator.jcoveragelipc.description = JCoverage covered lines percentile
+maven.dashboard.aggregator.jcoveragelipc.report = jcoverage/index.html
 
 # Properties for the JCoverage total lines aggregator 
 maven.dashboard.aggregator.jcoverageloc.script = ${maven.dashboard.aggregators.dir}/jcoverageloc.jelly
@@ -202,6 +214,7 @@
 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
+maven.dashboard.aggregator.jcoverageloc.report = jcoverage/index.html
 
 # Properties for the FindBugs file violations aggregator 
 maven.dashboard.aggregator.fbfiles.script = ${maven.dashboard.aggregators.dir}/fbfiles.jelly
@@ -209,6 +222,7 @@
 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
+maven.dashboard.aggregator.fbfiles.report = findbugs-report.html
 
 # Properties for the FindBugs violations aggregator 
 maven.dashboard.aggregator.fbviolations.script = ${maven.dashboard.aggregators.dir}/fbviolations.jelly
@@ -216,6 +230,7 @@
 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
+maven.dashboard.aggregator.fbviolations.report = findbugs-report.html
 
 # Classes Tasks aggregator
 maven.dashboard.aggregator.tasklistclass.script = ${maven.dashboard.aggregators.dir}/task-list-classes.jelly
@@ -223,6 +238,7 @@
 maven.dashboard.aggregator.tasklistclass.label = Classes Tasks 
 maven.dashboard.aggregator.tasklistclass.goal = maven-tasklist-plugin:report
 maven.dashboard.aggregator.tasklistclass.description = Total number of classes with task definition (@todo tag).
+maven.dashboard.aggregator.tasklistclass.report = task-list.html
 
 # Methods Tasks aggregator
 maven.dashboard.aggregator.tasklistmethod.script = ${maven.dashboard.aggregators.dir}/task-list-methods.jelly
@@ -230,6 +246,7 @@
 maven.dashboard.aggregator.tasklistmethod.label = Methods Tasks 
 maven.dashboard.aggregator.tasklistmethod.goal = maven-tasklist-plugin:report
 maven.dashboard.aggregator.tasklistmethod.description = Total number of methods with task definition (@todo tag).
+maven.dashboard.aggregator.tasklistmethod.report = task-list.html
 
 # All Tasks aggregator
 maven.dashboard.aggregator.tasklist.script = ${maven.dashboard.aggregators.dir}/task-list-all.jelly
@@ -237,6 +254,7 @@
 maven.dashboard.aggregator.tasklist.label = All Tasks 
 maven.dashboard.aggregator.tasklist.goal = maven-tasklist-plugin:report
 maven.dashboard.aggregator.tasklist.description = Total number of task definition (@todo tag).
+maven.dashboard.aggregator.tasklist.report = task-list.html
 
 # Changed log: total number of scm changed files aggregator
 maven.dashboard.aggregator.scmchangedfiles.script = ${maven.dashboard.aggregators.dir}/scmchangedfiles.jelly
@@ -244,6 +262,7 @@
 maven.dashboard.aggregator.scmchangedfiles.label = SCM Changed Files
 maven.dashboard.aggregator.scmchangedfiles.goal = maven-changelog-plugin:report
 maven.dashboard.aggregator.scmchangedfiles.description = Total number of changed files in scm.
+maven.dashboard.aggregator.scmchangedfiles.report = file-activity-report.html
 
 # Changed log: total number of scm commit aggregator
 maven.dashboard.aggregator.scmchangedcommit.script = ${maven.dashboard.aggregators.dir}/scmchangedcommit.jelly
@@ -251,4 +270,5 @@
 maven.dashboard.aggregator.scmchangedcommit.label = SCM commits
 maven.dashboard.aggregator.scmchangedcommit.goal = maven-changelog-plugin:report
 maven.dashboard.aggregator.scmchangedcommit.description = Total number of scm commit.
+maven.dashboard.aggregator.scmchangedcommit.report = changelog-report.html
 
Index: src/plugin-resources/templates/dashboard.jsl
===================================================================
RCS file: /home/cvspublic/maven-plugins/dashboard/src/plugin-resources/templates/dashboard.jsl,v
retrieving revision 1.7
diff -u -r1.7 dashboard.jsl
--- src/plugin-resources/templates/dashboard.jsl	28 Sep 2004 08:41:06 -0000	1.7
+++ src/plugin-resources/templates/dashboard.jsl	16 Jan 2005 16:35:13 -0000
@@ -26,6 +26,7 @@
   xmlns:jsl="jelly:jsl"
   xmlns:x="jelly:xml"
   xmlns:u="jelly:util"
+  xmlns:a="jelly:ant"  
   xmlns="dummy" trim="false">
 
   <jsl:template match="dashboard">
@@ -70,7 +71,9 @@
 
     <j:if test="${shallDisplay == 'true'}">
       <tr>
-        <td><x:expr select="@name"/></td>
+        <x:set var="projecturl1" select="string(@artifactId)"/>
+        <j:set var="projecturl" value="${maven.multiproject.aggregateDir}${projecturl1}/index.html"/>
+        <td><a href="${projecturl}"><x:expr select="@name"/></a></td>
         <jsl:applyTemplates select="aggregator"/>
       </tr>
     </j:if>
@@ -78,13 +81,31 @@
   </jsl:template>
 
   <jsl:template match="aggregator">
-    <td>
+    <x:set var="aggregatorName" select="string(@name)"/>
+    <j:set var="aggregatorKey" value="maven.dashboard.aggregator.${aggregatorName}.report"/>
+    <j:set var="aggregatorHasReport" value="false"/>
+    <j:set var="aggregatorReport" value="${context.getVariable(aggregatorKey)}"/>
+    <j:if test="${aggregatorReport != null}">
+      <u:available file="${maven.build.dir}/docs/${maven.multiproject.aggregateDir}${projecturl1}/${aggregatorReport}">
+        <j:set var="aggregatorHasReport" value="true"/>
+      </u:available>
+    </j:if>
+      <td>
       <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:choose>
+          <j:when test="${aggregatorHasReport == 'true'}">
+            <a href="${maven.multiproject.aggregateDir}${projecturl1}/${aggregatorReport}">
+              <x:expr select="text()"/> 
+            </a>
+          </j:when>
+          <j:otherwise>
+            <x:expr select="text()"/> 
+          </j:otherwise>
+        </j:choose>
       </j:if>
 
       <!-- if aggregator output is a percentage value, print a progress bar -->
@@ -101,7 +122,16 @@
               <tr>
                 <x:element name="td">
                   <x:attribute name="colspan">2</x:attribute>
-                  <j:expr value="${percent}%"/>
+                    <j:choose>
+                      <j:when test="${aggregatorHasReport == 'true'}">
+                        <a href="${maven.multiproject.aggregateDir}${projecturl1}/${aggregatorReport}">
+                          <j:expr value="${percent}%"/>
+                        </a>
+                      </j:when>
+                      <j:otherwise>
+                        <j:expr value="${percent}%"/>
+                      </j:otherwise>
+                    </j:choose>
                 </x:element>
               </tr>
             </j:if>
Index: src/plugin-test/maven.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/dashboard/src/plugin-test/maven.xml,v
retrieving revision 1.10
diff -u -r1.10 maven.xml
--- src/plugin-test/maven.xml	26 Nov 2004 08:33:03 -0000	1.10
+++ src/plugin-test/maven.xml	16 Jan 2005 16:35:13 -0000
@@ -55,41 +55,158 @@
     <x:set var="countTitleColumn" select="count($doc//body/section/table/tr[1]/th)"/>
     <x:set var="countContentColumn" select="count($doc//body/section/table/tr[2]/td)"/>
     <!-- One column for the project name and one for the 23 aggregators -->
+    <ant:echo>Check nb of columns in the report</ant:echo>
     <assert:assertEquals expected="24" value="${countTitleColumn.intValue().toString()}"/>
     <assert:assertEquals expected="24" value="${countContentColumn.intValue().toString()}"/>
 
     <!-- TasklistClass aggregator test -->
+    <ant:echo>Check tasklistclass aggregator</ant:echo>
     <x:set var="title" select="string($doc//body/section/table/tr[1]/th[20])"/>
     <assert:assertEquals expected="Classes Tasks" value="${title}"/>
-    <x:set var="taskCount" select="string($doc//body/section/table/tr[2]/td[20])"/>
+    <x:set var="taskCount" select="string($doc//body/section/table/tr[2]/td[20]/a)"/>
     <assert:assertEquals expected="1" value="${taskCount}"/>
         
     <!-- TasklistMethod aggregator test -->
+    <ant:echo>Check tasklistmethod aggregator</ant:echo>
     <x:set var="title" select="string($doc//body/section/table/tr[1]/th[21])"/>
     <assert:assertEquals expected="Methods Tasks" value="${title}"/>
-    <x:set var="taskCount" select="string($doc//body/section/table/tr[2]/td[21])"/>
+    <x:set var="taskCount" select="string($doc//body/section/table/tr[2]/td[21]/a)"/>
     <assert:assertEquals expected="2" value="${taskCount}"/>
         
     <!-- Tasklist aggregator test -->
+    <ant:echo>Check tasklist aggregator</ant:echo>
     <x:set var="title" select="string($doc//body/section/table/tr[1]/th[22])"/>
     <assert:assertEquals expected="All Tasks" value="${title}"/>
-    <x:set var="taskCount" select="string($doc/document/body/section/table/tr[2]/td[22])"/>
+    <x:set var="taskCount" select="string($doc/document/body/section/table/tr[2]/td[22]/a)"/>
     <assert:assertEquals expected="3" value="${taskCount}"/>
         
     <!-- SCM Changed Files aggregator test -->
+    <ant:echo>Check SCM changed file aggregator</ant:echo>
     <x:set var="title" select="string($doc/document/body/section/table/tr[1]/th[23])"/>
     <assert:assertEquals expected="SCM Changed Files" value="${title}"/>
-    <x:set var="taskCount" select="string($doc/document/body/section/table/tr[2]/td[23])"/>
+    <x:set var="taskCount" select="string($doc/document/body/section/table/tr[2]/td[23]/a)"/>
     <assert:assertEquals expected="8" value="${taskCount}"/>
         
     <!-- SCM Changed Commit aggregator test -->
+    <ant:echo>Check SCM commit aggregator</ant:echo>
     <x:set var="title" select="string($doc/document/body/section/table/tr[1]/th[24])"/>
     <assert:assertEquals expected="SCM commits" value="${title}"/>
-    <x:set var="taskCount" select="string($doc/document/body/section/table/tr[2]/td[24])"/>
+    <x:set var="taskCount" select="string($doc/document/body/section/table/tr[2]/td[24]/a)"/>
     <assert:assertEquals expected="4" value="${taskCount}"/>
         
-    
-    
+    <!-- Check generation of the URL on the index page of each project -->
+    <ant:echo>Check that all project has link to their index.html page</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[1]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/index.html" value="${URL}"/>
+    <x:set var="URLText" select="string($doc/document/body/section/table/tr[2]/td[1]/a)"/>
+    <assert:assertEquals expected="Maven Dashboard plugin test - Subproject1" value="${URLText}"/>
 
+    <!-- Check the link generation to the detail reports -->         
+    <!-- Project1 has report: we check that the link to the report exist -->
+    <ant:echo>Check that project1 has link to detailed report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[2]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/checkstyle-report.html" value="${URL}"/>
+    <!-- The project2 don't have any report we check that there isn't any link -->
+    <ant:echo>Check that project2 doesn't have link to detailed report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[2]/a/@href)"/>
+    <assert:assertEquals expected="" value="${URL}"/>
+
+    <!-- Now we check the link generation for all aggregators -->
+    <ant:echo>Check the link to the detailed report for each aggregator</ant:echo>
+    <!-- csall -->
+    <ant:echo>Check csallreport</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[2]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/checkstyle-report.html" value="${URL}"/>
+    <!-- cserrors -->
+    <ant:echo>Check cserrors report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[3]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/checkstyle-report.html" value="${URL}"/>
+    <!-- cswarnings -->
+    <ant:echo>Check cswarnings report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[4]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/checkstyle-report.html" value="${URL}"/>
+    <!-- csfiles -->
+    <ant:echo>Check csfiles report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[5]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/checkstyle-report.html" value="${URL}"/>
+<!-- TODO test for Clover because pkernevez was unable to generate clover report at this time...  -->
+    <!-- clovertpc -->
+<!--    <ant:echo>Check clovertpc report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[6]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/clover-report.html" value="${URL}"/>
+-->    <!-- cloverloc -->
+<!--    <ant:echo>Check cloverloc report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[7]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/checkstyle-report.html" value="${URL}"/>
+-->    <!-- cloverncloc -->
+<!--    <ant:echo>Check cloverncloc report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[8]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/checkstyle-report.html" value="${URL}"/>
+-->    
+    <!-- junittests -->
+    <ant:echo>Check junittests report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[9]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/junit-report.html" value="${URL}"/>
+    <!-- junitpassrate -->
+    <ant:echo>Check junitpassrate report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[10]/table/tr[1]/td[1]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/junit-report.html" value="${URL}"/>
+    <!-- junitfailures -->
+    <ant:echo>Check junitfailures report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[11]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/junit-report.html" value="${URL}"/>
+    <!-- juniterrors -->
+    <ant:echo>Check juniterrors report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[12]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/junit-report.html" value="${URL}"/>
+    <!-- simiantdl -->
+    <ant:echo>Check simiantdl report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[13]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/simian-report.html" value="${URL}"/>
+    <!-- pmdfiles -->
+    <ant:echo>Check pmdfiles report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[14]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/pmd-report.html" value="${URL}"/>
+    <!-- pmdviolations 15 -->
+    <ant:echo>Check pmdviolations report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[15]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/pmd-report.html" value="${URL}"/>
+    <!-- fbfiles -->
+    <ant:echo>Check fbfiles report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[16]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/findbugs-report.html" value="${URL}"/>
+    <!-- fbviolations -->
+    <ant:echo>Check fbviolations report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[17]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/findbugs-report.html" value="${URL}"/>
+    <!-- jcoveragelipc -->
+    <ant:echo>Check jcoveragelipc report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[18]/table/tr[1]/td[1]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/jcoverage/index.html" value="${URL}"/>
+    <!-- jcoverageloc -->
+    <ant:echo>Check jcoverageloc report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[19]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/jcoverage/index.html" value="${URL}"/>
+    <!-- tasklistclass -->
+    <ant:echo>Check tasklistclass report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[20]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/task-list.html" value="${URL}"/>
+    <!-- tasklistmethod -->
+    <ant:echo>Check tasklistmethod report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[21]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/task-list.html" value="${URL}"/>
+    <!-- tasklist -->
+    <ant:echo>Check tasklist report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[22]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/task-list.html" value="${URL}"/>
+    <!-- scmchangedfiles -->
+    <ant:echo>Check scmchangedfiles report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[23]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/file-activity-report.html" value="${URL}"/>
+    <!-- scmchangedcommit -->
+    <ant:echo>Check scmchangedcommit report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/td[24]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/changelog-report.html" value="${URL}"/>
+    
   </goal>
 </project>
Index: src/plugin-test/subproject1/maven.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/dashboard/src/plugin-test/subproject1/maven.xml,v
retrieving revision 1.1
diff -u -r1.1 maven.xml
--- src/plugin-test/subproject1/maven.xml	26 Nov 2004 08:33:01 -0000	1.1
+++ src/plugin-test/subproject1/maven.xml	16 Jan 2005 16:35:13 -0000
@@ -19,6 +19,8 @@
 
   <preGoal name="dashboard:report-single">
     <copy file="./conf/test/changelog.xml" todir="${maven.build.dir}"/>
+    <copy file="./conf/test/changelog-report.xml" todir="${maven.build.dir}"/>
+    <copy file="./conf/test/file-activity-report.xml" todir="${maven.build.dir}"/>
   </preGoal>
       
 </project>
Index: src/plugin-test/subproject1/project.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/dashboard/src/plugin-test/subproject1/project.xml,v
retrieving revision 1.7
diff -u -r1.7 project.xml
--- src/plugin-test/subproject1/project.xml	26 Nov 2004 08:33:01 -0000	1.7
+++ src/plugin-test/subproject1/project.xml	16 Jan 2005 16:35:13 -0000
@@ -37,6 +37,8 @@
   <reports>
     <report>maven-checkstyle-plugin</report>
     <report>maven-clover-plugin</report>
+    <report>maven-pmd-plugin</report>
+    <report>maven-findbugs-plugin</report>
     <report>maven-junit-report-plugin</report>
     <report>maven-simian-plugin</report>
     <report>maven-jcoverage-plugin</report>    
Index: xdocs/changes.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/dashboard/xdocs/changes.xml,v
retrieving revision 1.32
diff -u -r1.32 changes.xml
--- xdocs/changes.xml	26 Nov 2004 19:18:23 -0000	1.32
+++ xdocs/changes.xml	16 Jan 2005 16:35:14 -0000
@@ -24,6 +24,9 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
+    <release version="1.7" date="2005-01-15">
+      <action dev="pkernevez" type="add" issue="MPDASHBOARD-9">Added Link to detail result for all aggregator.</action>
+    </release>
     <release version="1.6" date="2004-11-26">
       <action dev="pkernevez" type="add" issue="MPDASHBOARD-16">Added Maven Change Log aggregators.</action>
       <action dev="pkernevez" type="add" issue="MPDASHBOARD-16">Added Maven Tasks List aggregators.</action>
Index: xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/dashboard/xdocs/properties.xml,v
retrieving revision 1.8
diff -u -r1.8 properties.xml
--- xdocs/properties.xml	26 Nov 2004 08:33:04 -0000	1.8
+++ xdocs/properties.xml	16 Jan 2005 16:35:14 -0000
@@ -89,6 +89,7 @@
 maven.dashboard.aggregator.csfiles.label = CS Files
 maven.dashboard.aggregator.csfiles.goal = checkstyle
 maven.dashboard.aggregator.csfiles.description = Number of files checked with Checkstyle
+maven.dashboard.aggregator.csfiles.report = checkstyle-report.html
 
 # Properties for the Checkstyle error/warning aggregator (all errors/warnings)
 maven.dashboard.aggregator.csall.script = ${maven.dashboard.aggregators.dir}/csall.jelly
@@ -96,6 +97,7 @@
 maven.dashboard.aggregator.csall.label = CS err/warn
 maven.dashboard.aggregator.csall.goal = checkstyle
 maven.dashboard.aggregator.csall.description = Number of Checkstyle errors and warnings
+maven.dashboard.aggregator.csall.report = checkstyle-report.html
 
 # Properties for the Checkstyle error aggregator (only errors)
 maven.dashboard.aggregator.cserrors.script = ${maven.dashboard.aggregators.dir}/cserrors.jelly
@@ -103,6 +105,7 @@
 maven.dashboard.aggregator.cserrors.label = CS errors
 maven.dashboard.aggregator.cserrors.goal = checkstyle
 maven.dashboard.aggregator.cserrors.description = Number of Checkstyle errors
+maven.dashboard.aggregator.cserrors.report = checkstyle-report.html
 
 # Properties for the Checkstyle warning aggregator (only warnings)
 maven.dashboard.aggregator.cswarnings.script = ${maven.dashboard.aggregators.dir}/cswarnings.jelly
@@ -110,6 +113,7 @@
 maven.dashboard.aggregator.cswarnings.label = CS warnings
 maven.dashboard.aggregator.cswarnings.goal = checkstyle
 maven.dashboard.aggregator.cswarnings.description = Number of Checkstyle warnings
+maven.dashboard.aggregator.cswarnings.report = checkstyle-report.html
 
 # Properties for the Clover TPC aggregator (TPC = Total Percent Coverage)
 maven.dashboard.aggregator.clovertpc.script = ${maven.dashboard.aggregators.dir}/clovertpc.jelly
@@ -138,6 +142,7 @@
 maven.dashboard.aggregator.junittests.label = JUnit Tests
 maven.dashboard.aggregator.junittests.goal = junit-report:report
 maven.dashboard.aggregator.junittests.description = Number of JUnit tests
+maven.dashboard.aggregator.junittests.report = junit-report.html
 
 # Properties for the JUnit Failures aggregator 
 maven.dashboard.aggregator.junitfailures.script = ${maven.dashboard.aggregators.dir}/junitfailures.jelly
@@ -145,6 +150,7 @@
 maven.dashboard.aggregator.junitfailures.label = JUnit Failures
 maven.dashboard.aggregator.junitfailures.goal = junit-report:report
 maven.dashboard.aggregator.junitfailures.description = Number of JUnit test failures
+maven.dashboard.aggregator.junitfailures.report = junit-report.html
 
 # Properties for the JUnit Errors aggregator 
 maven.dashboard.aggregator.juniterrors.script = ${maven.dashboard.aggregators.dir}/juniterrors.jelly
@@ -152,6 +158,7 @@
 maven.dashboard.aggregator.juniterrors.label = JUnit Errors
 maven.dashboard.aggregator.juniterrors.goal = junit-report:report
 maven.dashboard.aggregator.juniterrors.description = Number of JUnit test errors
+maven.dashboard.aggregator.juniterrors.report = junit-report.html
 
 # Properties for the JUnit Pass Rate aggregator 
 maven.dashboard.aggregator.junitpassrate.script = ${maven.dashboard.aggregators.dir}/junitpassrate.jelly
@@ -159,6 +166,7 @@
 maven.dashboard.aggregator.junitpassrate.label = JUnit Pass Rate
 maven.dashboard.aggregator.junitpassrate.goal = junit-report:report
 maven.dashboard.aggregator.junitpassrate.description = Percentage of JUnit tests that have passed vs tests in error or failed
+maven.dashboard.aggregator.junitpassrate.report = junit-report.html
 
 # Properties for the PMD violations aggregator 
 maven.dashboard.aggregator.pmdfiles.script = ${maven.dashboard.aggregators.dir}/pmdfiles.jelly
@@ -166,6 +174,7 @@
 maven.dashboard.aggregator.pmdfiles.label = PMD Files with Violations
 maven.dashboard.aggregator.pmdfiles.goal = pmd:report
 maven.dashboard.aggregator.pmdfiles.description = Number of files with PMD violations
+maven.dashboard.aggregator.pmdfiles.report = pmd-report.html
 
 # Properties for the PMD violations aggregator 
 maven.dashboard.aggregator.pmdviolations.script = ${maven.dashboard.aggregators.dir}/pmdviolations.jelly
@@ -173,6 +182,7 @@
 maven.dashboard.aggregator.pmdviolations.label = PMD Violations
 maven.dashboard.aggregator.pmdviolations.goal = pmd:report
 maven.dashboard.aggregator.pmdviolations.description = Number of PMD violations
+maven.dashboard.aggregator.pmdviolations.report = pmd-report.html
 
 # Properties for the Simian duplicate lines aggregator 
 maven.dashboard.aggregator.simiantdl.script = ${maven.dashboard.aggregators.dir}/simiantdl.jelly
@@ -180,6 +190,7 @@
 maven.dashboard.aggregator.simiantdl.label = Simian TDL
 maven.dashboard.aggregator.simiantdl.goal = maven-simian-plugin:report
 maven.dashboard.aggregator.simiantdl.description = Simian Total Duplicate Lines
+maven.dashboard.aggregator.simiantdl.report = simian-report.html
 
 # Properties for the JCoverage covered lines percent aggregator 
 maven.dashboard.aggregator.jcoveragelipc.script = ${maven.dashboard.aggregators.dir}/jcoveragelipc.jelly
@@ -187,6 +198,7 @@
 maven.dashboard.aggregator.jcoveragelipc.label = JCoverage %lines
 maven.dashboard.aggregator.jcoveragelipc.goal = maven-jcoverage-plugin:report
 maven.dashboard.aggregator.jcoveragelipc.description = JCoverage covered lines percentile
+maven.dashboard.aggregator.jcoveragelipc.report = jcoverage/index.html
 
 # Properties for the JCoverage total lines aggregator 
 maven.dashboard.aggregator.jcoverageloc.script = ${maven.dashboard.aggregators.dir}/jcoverageloc.jelly
@@ -194,43 +206,47 @@
 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
+maven.dashboard.aggregator.jcoverageloc.report = jcoverage/index.html
 
 # Classes Tasks aggregator
 maven.dashboard.aggregator.tasklistclass.script = ${maven.dashboard.aggregators.dir}/task-list-classes.jelly
 maven.dashboard.aggregator.tasklistclass.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml
 maven.dashboard.aggregator.tasklistclass.label = Classes Tasks 
 maven.dashboard.aggregator.tasklistclass.goal = maven-tasklist-plugin:report
-maven.dashboard.aggregator.tasklistclass.description = Number of classes with task definition (@todo tag).
+maven.dashboard.aggregator.tasklistclass.description = Total number of classes with task definition (@todo tag).
+maven.dashboard.aggregator.tasklistclass.report = task-list.html
 
 # Methods Tasks aggregator
 maven.dashboard.aggregator.tasklistmethod.script = ${maven.dashboard.aggregators.dir}/task-list-methods.jelly
 maven.dashboard.aggregator.tasklistmethod.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml
 maven.dashboard.aggregator.tasklistmethod.label = Methods Tasks 
 maven.dashboard.aggregator.tasklistmethod.goal = maven-tasklist-plugin:report
-maven.dashboard.aggregator.tasklistmethod.description = Number of methods with task definition (@todo tag).
+maven.dashboard.aggregator.tasklistmethod.description = Total number of methods with task definition (@todo tag).
+maven.dashboard.aggregator.tasklistmethod.report = task-list.html
 
 # All Tasks aggregator
 maven.dashboard.aggregator.tasklist.script = ${maven.dashboard.aggregators.dir}/task-list-all.jelly
 maven.dashboard.aggregator.tasklist.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml
 maven.dashboard.aggregator.tasklist.label = All Tasks 
 maven.dashboard.aggregator.tasklist.goal = maven-tasklist-plugin:report
-maven.dashboard.aggregator.tasklist.description = Number of task definition (@todo tag).
+maven.dashboard.aggregator.tasklist.description = Total number of task definition (@todo tag).
+maven.dashboard.aggregator.tasklist.report = task-list.html
 
 # Changed log: total number of scm changed files aggregator
-maven.dashboard.aggregator.scmchangedfiles.script = D:/Developpement/VMA/maven/dashboard/src/plugin-resources/aggregators/changelogfiles.jelly
+maven.dashboard.aggregator.scmchangedfiles.script = ${maven.dashboard.aggregators.dir}/scmchangedfiles.jelly
 maven.dashboard.aggregator.scmchangedfiles.artifact = ${maven.build.dir}/changelog.xml
 maven.dashboard.aggregator.scmchangedfiles.label = SCM Changed Files
 maven.dashboard.aggregator.scmchangedfiles.goal = maven-changelog-plugin:report
 maven.dashboard.aggregator.scmchangedfiles.description = Total number of changed files in scm.
+maven.dashboard.aggregator.scmchangedfiles.report = file-activity-report.html
 
 # Changed log: total number of scm commit aggregator
-maven.dashboard.aggregator.scmchangedcommit.script = D:/Developpement/VMA/maven/dashboard/src/plugin-resources/aggregators/changelogcommit.jelly
+maven.dashboard.aggregator.scmchangedcommit.script = ${maven.dashboard.aggregators.dir}/scmchangedcommit.jelly
 maven.dashboard.aggregator.scmchangedcommit.artifact = ${maven.build.dir}/changelog.xml
 maven.dashboard.aggregator.scmchangedcommit.label = SCM commits
 maven.dashboard.aggregator.scmchangedcommit.goal = maven-changelog-plugin:report
 maven.dashboard.aggregator.scmchangedcommit.description = Total number of scm commit.
-
-
+maven.dashboard.aggregator.scmchangedcommit.report = changelog-report.html
 
 ]]></source>
     </section>
Index: src/plugin-test/subproject1/conf/test/changelog-report.xml
===================================================================
RCS file: src/plugin-test/subproject1/conf/test/changelog-report.xml
diff -N src/plugin-test/subproject1/conf/test/changelog-report.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/plugin-test/subproject1/conf/test/changelog-report.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<document>
+  <properties>
+    <title>Changelog Report</title>
+  </properties>
+  <body>
+    <section name="Changelog Report">
+      <p>Timeframe: 30 days, Total Commits: 0 Total Number of Files Changed: 0</p>
+      <table>
+        <thead>
+          <tr>
+            <th>Date</th>
+            <th>Author</th>
+            <th>File/Message</th>
+          </tr>
+        </thead>
+        <tbody>
+        </tbody>
+      </table>
+    </section>
+  </body>
+</document>
Index: src/plugin-test/subproject1/conf/test/file-activity-report.xml
===================================================================
RCS file: src/plugin-test/subproject1/conf/test/file-activity-report.xml
diff -N src/plugin-test/subproject1/conf/test/file-activity-report.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/plugin-test/subproject1/conf/test/file-activity-report.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<document>
+  <properties>
+    <title>File Activity Analysis</title>
+  </properties>
+  <body>
+    <section name="Activity by File">
+      <p>Timeframe: 30 days, Total Commits: 0 Total Number of Files Changed: 0</p>
+      <table>
+        <tr>
+          <th>File Name</th>
+          <th>Number of times changed</th>
+        </tr>
+      </table>
+    </section>
+  </body>
+</document>