From 2c9c349142a22111dedc57896c0dadc5ac846ff9 Mon Sep 17 00:00:00 2001
From: kaz <kaz@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 31 Jan 2003 18:25:28 +0000
Subject: [PATCH] Here is a first pass to enable users to specify what reports
 should appear in their published site's "Project Reports" section of the
 navbar.  Users can now specify a <reports/> section in the POM that specifies
 exactly which reports should be included in one's site.  For example:

  <reports>
    <report>maven-changelog-plugin</report>
    <report>maven-junit-report-plugin</report>
    <report>maven-javadoc-plugin</report>
    <report>maven-jxr-plugin</report>
  </reports>

This would only run the above four plugins when 'maven site' is invoked.
In addition, the navbar and the maven-reports document that is generated
will only contain links to the above specified reports.  Please note,
that the order the reports are specified is the order in which they will
appear.  Note: if you do not have a <reports/> section in the POM, you
will fallback to the standard behavior (which is predefined reports).

Lets talk about how this all works now.  Previously, site.jsl in the
xdoc plugin contained a static set of reports that were included in the
navbar.  This could not be changed by end users.  In addition, we also
had a separate xdoc to maintain which contained a description of all of
the reports (this page is displayed when you click on 'Project Reports'
to expand that section of the navbar).  Again, this was a static page.
Finally, a developer writing their own plugin which generated a report,
would have to submit patches for both of these files for their report to
be included when a 'maven site' was executed.

All of the above deficiencies have been corrected when using the new
<reports/> mechansim.  There is a new protocol which plugin developers
should follow if their plugin generates a report.  Their plugin's
plugin.jelly file should contain a gool like this (don't forget to
include the 'xmlns:doc="doc"' declaration as well):

  <goal name="maven-changelog-plugin:register">
    <doc:registerReport
      name="Change Log"
      link="changelog-report"
      description="Report on the source control changelog."/>
  </goal>

The above should be pretty self explanatory.  The plugin developer
simply defines a 'name'.  The 'name' is used in the navbar and in the
first column of the table in the auto-generated maven-reports file.
'link' is the relative link from the doc directory to the generated
report (without the extension).  Finally, a 'description' should be used
to create a one line summary of the report's contents.  This is used
when auto-generating the maven-reports document.

A plugin may define multiple reports if needed.  For example, here is
the javadoc plugin example:

  <goal name="maven-javadoc-plugin:register">
    <j:if test="${sourcesPresent}">
      <doc:registerReport
        name="JavaDocs"
        link="apidocs/index"
        description="JavaDoc API documentation."/>
      <doc:registerReport
        name="JavaDoc Report"
        link="javadoc"
        description="Report on the generation of JavaDoc."/>
    </j:if>
  </goal>

Another important difference you'll notice above is that the conditional
tests of whether or not a report should appear is no longer part of
site.jsl.  The logic of determining whether the report appears now lies
within the plugin that generates the report.  Thus, in the above
example, only if sources are present, will the reports actually appear
in the navbar and maven-reports document.

So what happens when one types 'maven site'?  Basically, for each
<report/> defined, maven will try to <attainGoal> on that report.  The
goal runs as it normally does.  The magic kicks in when the 'xdoc'
plugin is run (after all of the <reports/> have been run).  The first
thing the xdoc plugin does is determine what reports should be included
in all of the documentation it generates.  The report list (its really a
set) is generated when xdoc calls its own 'xdoc:register-reports' goal.
This goal looks at each <report/> defined in the POM and then calls
<attainGoal name="xyz:register"/> where "xyz" corresponds to the name
defined in the <report/>.  This is where the new protocol is required.
If that goal does not exist, you will get an error from Jelly.

As each of the xyz:register goals are called, they invoke the
<doc:registerReport> tag (which is defined in the xdoc plugin), this tag
basically builds a set of hashtables.  Each hashtable corresponds to a
report and contains a 'name', 'link', and 'description' entry.  After
the completion of 'xdoc:register-reports' we now have a set in the xdoc
context called 'reports' which contains our descriptions of each report.
Site.jsl uses this to dynamically build up the navbar, and the
maven-reports document uses it to build the content of itself.

Phew!  That was a long one.  In summary, if you don't use <reports/>
nothing changes (at least it shouldn't), but in the future, if this
<reports/> thing works out, we will migrate users in this direction.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@112789 13f79535-47bb-0310-9956-ffa450edef68
---
 changelog/plugin.jelly                        |   7 +
 checkstyle/plugin.jelly                       |   7 +
 developer-activity/plugin.jelly               |   7 +
 file-activity/plugin.jelly                    |   7 +
 javadoc/plugin.jelly                          |  16 +-
 jdepend/plugin.jelly                          |   7 +
 junit-report/plugin.jelly                     |   7 +
 jxr/plugin.jelly                              |  10 +
 site/plugin.jelly                             |  31 ++-
 tasklist/plugin.jelly                         |   8 +
 xdoc/plugin.jelly                             |  41 +++-
 xdoc/src/plugin-resources/site.jsl            | 224 +++++++++++-------
 .../templates/maven-reports.xml               | 197 +++++++--------
 13 files changed, 371 insertions(+), 198 deletions(-)

diff --git a/changelog/plugin.jelly b/changelog/plugin.jelly
index aee59af0..78a445ca 100644
--- a/changelog/plugin.jelly
+++ b/changelog/plugin.jelly
@@ -6,6 +6,13 @@
   xmlns:changelog="changelog"
   xmlns:doc="doc">
 
+  <goal name="maven-changelog-plugin:register">
+    <doc:registerReport 
+      name="Change Log" 
+      link="changelog-report"
+      description="Report on the source control changelog."/>
+  </goal>
+
   <define:taglib uri="changelog">
     <define:jellybean
       name="changelog"
diff --git a/checkstyle/plugin.jelly b/checkstyle/plugin.jelly
index 9305332e..39fd1aee 100644
--- a/checkstyle/plugin.jelly
+++ b/checkstyle/plugin.jelly
@@ -5,6 +5,13 @@
   xmlns:util="jelly:util"
   xmlns:doc="doc">
 
+  <goal name="maven-checkstyle-plugin:register">
+    <doc:registerReport 
+      name="Checkstyle" 
+      link="checkstyle-report"
+      description="Report on coding style conventions."/>
+  </goal>
+
   <!-- ================================================================== -->
   <!-- C H E C K S T Y L E                                                -->
   <!-- ================================================================== -->
diff --git a/developer-activity/plugin.jelly b/developer-activity/plugin.jelly
index b6d3a370..86c3dec9 100644
--- a/developer-activity/plugin.jelly
+++ b/developer-activity/plugin.jelly
@@ -6,6 +6,13 @@
   xmlns:changelog="changelog"
   xmlns:doc="doc">
 
+  <goal name="maven-developer-activity-plugin:register">
+    <doc:registerReport 
+      name="Developer Activity" 
+      link="developer-activity-report"
+      description="Report on the amount of developer activity."/>
+  </goal>
+
   <!-- ================================================================== -->
   <!-- D E V E L O P E R  A C T I V I T Y  R E P O R T                    -->
   <!-- ================================================================== -->
diff --git a/file-activity/plugin.jelly b/file-activity/plugin.jelly
index e3d93171..a03b96ad 100644
--- a/file-activity/plugin.jelly
+++ b/file-activity/plugin.jelly
@@ -6,6 +6,13 @@
   xmlns:changelog="changelog"
   xmlns:doc="doc">
 
+  <goal name="maven-file-activity-plugin:register">
+    <doc:registerReport 
+      name="File Activity" 
+      link="file-activity-report"
+      description="Report on file activity."/>
+  </goal>
+
   <!-- ================================================================== -->
   <!-- F I L E  A C T I V I T Y  R E P O R T                              -->
   <!-- ================================================================== -->
diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index a4e03a94..adabcb49 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -3,12 +3,26 @@
 <project xmlns:j="jelly:core" 
   xmlns:util="jelly:util"
   xmlns:define="jelly:define"
+  xmlns:doc="doc"
   xmlns:license="license">
 
+  <goal name="maven-javadoc-plugin:register">
+    <j:if test="${sourcesPresent}">
+      <doc:registerReport 
+        name="JavaDocs" 
+        link="apidocs/index"
+        description="JavaDoc API documentation."/>
+      <doc:registerReport 
+        name="JavaDoc Report" 
+        link="javadoc"
+        description="Report on the generation of JavaDoc."/>
+    </j:if>
+  </goal>
+
   <!-- ================================================================== -->
   <!-- J A V A D O C S                                                    -->
   <!-- ================================================================== -->
-  
+
   <!-- Some aliases for ease of use and backward compat. -->
   <goal name="javadoc:generate" prereqs="maven-javadoc-plugin:report"/>
   <goal name="javadoc" prereqs="maven-javadoc-plugin:report"/>
diff --git a/jdepend/plugin.jelly b/jdepend/plugin.jelly
index cafe636a..7dbd07ef 100644
--- a/jdepend/plugin.jelly
+++ b/jdepend/plugin.jelly
@@ -2,6 +2,13 @@
 
 <project xmlns:j="jelly:core" xmlns:doc="doc">
 
+  <goal name="maven-jdepend-plugin:register">
+    <doc:registerReport 
+      name="Metrics" 
+      link="jdepend-report"
+      description="Report on source code metrics."/>
+  </goal>
+
   <!-- ================================================================== -->
   <!-- J D E P E N D  X M L  T A R G E T                                  -->
   <!-- ================================================================== -->
diff --git a/junit-report/plugin.jelly b/junit-report/plugin.jelly
index 893c476c..51f8b410 100644
--- a/junit-report/plugin.jelly
+++ b/junit-report/plugin.jelly
@@ -4,6 +4,13 @@
   xmlns:j="jelly:core" 
   xmlns:doc="doc">
   
+  <goal name="maven-junit-report-plugin:register">
+    <doc:registerReport 
+      name="Unit Tests" 
+      link="junit-report"
+      description="Report on the results of the unit tests."/>
+  </goal>
+
   <!-- ================================================================== -->
   <!-- C R E A T E  J U N I T  X M L  R E P O R T                         -->
   <!-- ================================================================== -->
diff --git a/jxr/plugin.jelly b/jxr/plugin.jelly
index 46ba1947..257b2d67 100644
--- a/jxr/plugin.jelly
+++ b/jxr/plugin.jelly
@@ -3,8 +3,18 @@
 <project 
   xmlns:j="jelly:core"  
   xmlns:define="jelly:define"
+  xmlns:doc="doc"
   xmlns:jxr="jxr">
 
+  <goal name="maven-jxr-plugin:register">
+    <j:if test="${sourcesPresent}">
+      <doc:registerReport 
+        name="Source Xref" 
+        link="xref/index"
+        description="A set of browsable cross-referenced sources."/>
+    </j:if>
+  </goal>
+
     <define:taglib uri="jxr">
       <define:jellybean
         name="jxr"
diff --git a/site/plugin.jelly b/site/plugin.jelly
index 95996977..3c1a096a 100644
--- a/site/plugin.jelly
+++ b/site/plugin.jelly
@@ -20,16 +20,27 @@
     name="site"
     description="Generate the web site">
 
-      <attainGoal name="maven-jdepend-plugin:report"/>
-      <attainGoal name="maven-checkstyle-plugin:report"/>
-      <attainGoal name="maven-changelog-plugin:report"/>
-      <attainGoal name="maven-developer-activity-plugin:report"/>
-      <attainGoal name="maven-file-activity-plugin:report"/>
-      <attainGoal name="maven-javadoc-plugin:report"/>
-      <attainGoal name="maven-jxr-plugin:report"/>
-      <attainGoal name="maven-junit-report-plugin:report"/>
-      <attainGoal name="maven-tasklist-plugin:report"/>
-      <attainGoal name="xdoc"/>
+    <j:choose>
+      <j:when test="${!pom.reports.isEmpty()}">
+        <j:forEach var="report" items="${pom.reports}">
+          <j:set var="reportGoal" value="${report}:report"/>
+          <echo>Generating the ${report} ... </echo>
+          <attainGoal name="${reportGoal}"/>
+        </j:forEach>
+      </j:when>
+      <j:otherwise>
+        <attainGoal name="maven-jdepend-plugin:report"/>
+        <attainGoal name="maven-checkstyle-plugin:report"/>
+        <attainGoal name="maven-changelog-plugin:report"/>
+        <attainGoal name="maven-developer-activity-plugin:report"/>
+        <attainGoal name="maven-file-activity-plugin:report"/>
+        <attainGoal name="maven-javadoc-plugin:report"/>
+        <attainGoal name="maven-jxr-plugin:report"/>
+        <attainGoal name="maven-junit-report-plugin:report"/>
+        <attainGoal name="maven-tasklist-plugin:report"/>
+      </j:otherwise>
+    </j:choose>
+    <attainGoal name="xdoc"/>
 
   </goal>
 
diff --git a/tasklist/plugin.jelly b/tasklist/plugin.jelly
index 81480d2b..fa5b0a32 100644
--- a/tasklist/plugin.jelly
+++ b/tasklist/plugin.jelly
@@ -2,8 +2,16 @@
 
 <project 
   xmlns:j="jelly:core"
+  xmlns:doc="doc"
   xmlns:vdoclet="vdoclet">
 
+  <goal name="maven-tasklist-plugin:register">
+    <doc:registerReport 
+      name="Task List" 
+      link="task-list"
+      description="Report on tasks specified in the source code."/>
+  </goal>
+
   <!-- ================================================================== -->
   <!-- T A S K   C R E A T I O N                                          -->
   <!-- ================================================================== -->
diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 2858bb0d..18e5c9e7 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -13,6 +13,20 @@
 
   <define:taglib uri="doc">
     
+    <define:tag name="registerReport">
+
+      <j:set 
+        var="reports" 
+        value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+
+      <j:new var="report" className="java.util.HashMap"/>
+      <j:set var="dummy" value="${report.put('name', name)}"/>
+      <j:set var="dummy" value="${report.put('link', link)}"/>
+      <j:set var="dummy" value="${report.put('description', description)}"/>
+      <j:set var="dummy" value="${reports.add(report)}"/>
+
+    </define:tag>
+
     <define:tag name="formatAsNumber">
       <!--
        | @string
@@ -170,6 +184,9 @@
           <util:file var="navFile" name="${file.parentFile.absoluteFile}/navigation.xml"/>
         </util:available>
 
+        <j:set 
+          var="reports"
+          value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
 
         <!-- parse nav and make it available to the stylesheet -->
         <x:parse var="navXML" xml="${navFile}"/>
@@ -205,7 +222,7 @@
 
   <goal
     name="xdoc:generate-from-pom"
-    prereqs="xdoc:init"
+    prereqs="xdoc:init, xdoc:register-reports"
     description="Generates xdocs for site based on project descriptor">
     
     <echo>Generating xdocs from POM ... </echo>
@@ -214,6 +231,9 @@
     
     <!-- All the templates use $project for now. -->
     <j:set var="project" value="${pom}"/>
+    <j:set 
+      var="reports"
+      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
     
     <!-- Need the escaper to html output. -->
     <j:useBean var="escape" class="org.apache.velocity.anakia.Escape"/>
@@ -409,8 +429,25 @@
     </tstamp>
   </goal>
 
+  <goal name="xdoc:register-reports">
+
+    <j:new var="reports" className="java.util.HashSet"/>
+    <j:set var="dummy" value="${pom.getPluginContext('maven-xdoc-plugin').setVariable('reports', reports)}"/>
+
+    <!--
+     | We need to have each <report> register itself with us so we can
+     | build up our navbar.  To do this, we call the plugin:register
+     | goal on each report plugin.
+     |-->
+    <j:forEach var="report" items="${pom.reports}">
+      <j:set var="reportGoal" value="${report}:register"/>
+      <echo>${report} is registering with the xdoc plugin ... </echo>
+      <attainGoal name="${reportGoal}"/>
+    </j:forEach>
+  </goal>
+
   <goal name="xdoc:jelly-transform" 
-    prereqs="xdoc:init, xdoc:jelly-init"
+    prereqs="xdoc:init, xdoc:jelly-init, xdoc:register-reports"
     description="transform xdocs using jelly/jsl rather than dvsl">
 
     <j:set var="destdir" value="${maven.docs.dest}"/>
diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 77451a03..244fb492 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -193,99 +193,141 @@
                     <small>
                       <a href="${relativePath}/maven-reports.html">Project Reports</a>
                     </small>
-                    <util:tokenize var="projectReportFiles" delim=",">${maven.xdoc.projectReports}</util:tokenize>
-                    <j:forEach var="reportFile" items="${projectReportFiles}">
-                      <j:if test="${relativePath == '.' and fileName.endsWith(reportFile.trim())}">
-                        <util:available file="${maven.docs.src}/tasks.xml">
-                          <div>
-                            <small>
-                              <a href="${relativePath}/tasks.html">Tasks</a>
-                            </small>
-                          </div>
-                        </util:available>
-                        <util:available file="${maven.gen.docs}/task-list.xml">
-                          <div>
-                            <small>
-                              <a href="${relativePath}/task-list.html">Task List</a>
-                            </small>
-                          </div>
-                        </util:available>
-                        <util:available file="${maven.docs.src}/changes.xml">
-                          <div>
-                            <small>
-                              <a href="${relativePath}/changes.html">Changes</a>
-                            </small>
-                          </div>
-                        </util:available>
-                        <j:if test="${!empty(pom.repository.connection)}">
-                          <div>
-                            <small>
-                              <a href="${relativePath}/changelog-report.html">Change Log</a>
-                            </small>
-                          </div>
-                          <div>
-                            <small>
-                              <a href="${relativePath}/developer-activity-report.html">Developer Activity</a>
-                            </small>
-                          </div>
-                          <div>
-                            <small>
-                              <a href="${relativePath}/file-activity-report.html">File Activity</a>
-                            </small>
-                          </div>
+                    <j:choose>
+                      <j:when test="${!pom.reports.isEmpty()}">
+                        <!--
+                         | Check to see if we need to include the report
+                         | links in this document.  The only time we
+                         | need to do this is when the current document
+                         | either the maven-reports.xml doc (the page
+                         | is displayed when clicking on Project
+                         | Reports) or when the current document is one
+                         | of the actual reports (in which case we want
+                         | to leave the project report links expanded.
+                         |-->
+                         <j:set var="includeReportLinks" value="false"/>
+                         <j:forEach var="report" items="${reports}">
+                           <j:set var="linkWithXmlExt" value="${report.link}.xml"/>
+                           <j:if test="${relativePath == '.' and (fileName.endsWith('maven-reports.xml') or fileName.endsWith(linkWithXmlExt))}">
+                            <j:set var="includeReportLinks" value="true"/>
+                          </j:if>
+                        </j:forEach>
+                        <!--
+                         | If we need to include the report links, then
+                         | do so.  This is determined by the above
+                         | block.
+                         |-->
+                        <j:if test="${includeReportLinks == 'true'}">
+                          <j:forEach var="report" items="${reports}">
+                            <div>
+                              <small>
+                                <a href="${relativePath}/${report.link}.html">
+                                  ${report.name}
+                                </a>
+                              </small>
+                            </div>
+                          </j:forEach>
                         </j:if>
-                        <j:if test="${unitTestSourcesPresent}">
-                          <div>
-                            <small>
-                              <a href="${relativePath}/junit-report.html">Unit Tests</a>
-                            </small>
-                          </div>
-                        </j:if>
-                        <j:if test="${sourcesPresent}">
-                          <div>
-                            <small>
-                              <a href="${relativePath}/jdepend-report.html">Metric Results</a>
-                            </small>
-                          </div>
-                          <div>
-                            <small>
-                              <a href="${relativePath}/checkstyle-report.html">Checkstyle Report</a>
-                            </small>
-                          </div>
-                          <div>
-                            <small>
-                              <a href="${relativePath}/javadoc.html">Javadoc Report</a>
-                            </small>
-                          </div>
-                        </j:if>
-                        <util:available file="${maven.docs.dest}/clover">
-                          <div>
-                            <small>
-                              <a href="${relativePath}/clover/index.html">Clover Test Coverage</a>
-                            </small>
-                          </div>
-                        </util:available>
-                        <util:available file="${maven.gen.docs}/cactus-report.xml">
-                          <div>
-                            <small>
-                              <a href="${relativePath}/cactus-report.html">Cactus Tests</a>
-                            </small>
-                          </div>
-                        </util:available>
-                      </j:if>
-                    </j:forEach>
+                      </j:when>
+                      <j:otherwise>
+                        <!-- The old static method -->
+                        <util:tokenize var="projectReportFiles" delim=",">${maven.xdoc.projectReports}</util:tokenize>
+                        <j:forEach var="reportFile" items="${projectReportFiles}">
+                          <j:if test="${relativePath == '.' and fileName.endsWith(reportFile.trim())}">
+                            <util:available file="${maven.docs.src}/tasks.xml">
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/tasks.html">Tasks</a>
+                                </small>
+                              </div>
+                            </util:available>
+                            <util:available file="${maven.gen.docs}/task-list.xml">
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/task-list.html">Task List</a>
+                                </small>
+                              </div>
+                            </util:available>
+                            <util:available file="${maven.docs.src}/changes.xml">
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/changes.html">Changes</a>
+                                </small>
+                              </div>
+                            </util:available>
+                            <j:if test="${!empty(pom.repository.connection)}">
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/changelog-report.html">Change Log</a>
+                                </small>
+                              </div>
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/developer-activity-report.html">Developer Activity</a>
+                                </small>
+                              </div>
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/file-activity-report.html">File Activity</a>
+                                </small>
+                              </div>
+                            </j:if>
+                            <j:if test="${unitTestSourcesPresent}">
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/junit-report.html">Unit Tests</a>
+                                </small>
+                              </div>
+                            </j:if>
+                            <j:if test="${sourcesPresent}">
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/jdepend-report.html">Metric Results</a>
+                                </small>
+                              </div>
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/checkstyle-report.html">Checkstyle Report</a>
+                                </small>
+                              </div>
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/javadoc.html">Javadoc Report</a>
+                                </small>
+                              </div>
+                            </j:if>
+                            <util:available file="${maven.docs.dest}/clover">
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/clover/index.html">Clover Test Coverage</a>
+                                </small>
+                              </div>
+                            </util:available>
+                            <util:available file="${maven.gen.docs}/cactus-report.xml">
+                              <div>
+                                <small>
+                                  <a href="${relativePath}/cactus-report.html">Cactus Tests</a>
+                                </small>
+                              </div>
+                            </util:available>
+                          </j:if>
+                        </j:forEach>
+                      </j:otherwise>
+                    </j:choose>
                   </div>
-                  <j:if test="${sourcesPresent}">
-                    <div>
-                      <small>
-                        <a href="${relativePath}/apidocs/index.html">JavaDocs</a>
-                      </small>
-                    </div>
-                    <div>
-                      <small>
-                        <a href="${relativePath}/xref/index.html">Source XReference</a>
-                      </small>
-                    </div>
+                  <j:if test="${pom.reports.isEmpty()}">
+                    <j:if test="${sourcesPresent}">
+                      <div>
+                        <small>
+                          <a href="${relativePath}/apidocs/index.html">JavaDocs</a>
+                        </small>
+                      </div>
+                      <div>
+                        <small>
+                          <a href="${relativePath}/xref/index.html">Source XReference</a>
+                        </small>
+                      </div>
+                    </j:if>
                   </j:if>
                   <j:set var="devProcess" value="false"/>
                   <util:available file="${maven.docs.src}/development-process.xml">
diff --git a/xdoc/src/plugin-resources/templates/maven-reports.xml b/xdoc/src/plugin-resources/templates/maven-reports.xml
index 94cc6c39..c6bb3e1d 100644
--- a/xdoc/src/plugin-resources/templates/maven-reports.xml
+++ b/xdoc/src/plugin-resources/templates/maven-reports.xml
@@ -18,100 +18,109 @@
       <subsection name="Overview">
         <table>
           <tr><th>Document</th><th>Description</th></tr>
-          <tr><td><a href="changes.html">Changes</a></td>
-            <td>
-              This document provides a history of the changes made to the
-              project, in a user friendly format, generated from the
-              xdocs/changes.xml file.
-            </td>
-          </tr>
-          #if ($project.repository)
-          <tr><td><a href="changelog-report.html">Change Log</a></td>
-            <td>
-              This document provides a history of the most recent
-              changes made to the project taken directly from the
-              source code repository.
-            </td>
-          </tr>
-          <tr><td><a href="developer-activity-log.html">Developer Activity</a></td>
-            <td>
-              This document provides a report of activity in terms of
-              CVS commits and breaks it out by developer.
-            </td>
-          </tr>
-          <tr><td><a href="file-activity-report.html">File Activity</a></td>
-            <td>
-              This document provides a report of activity in terms of
-              CVS commits and breaks it out by file.
-            </td>
-          </tr>
-          #end
-          <tr><td><a href="tasks.html">Tasks</a></td>
-            <td>
-              This document provides a list of tasks that need to
-              be completed for the project, generated from the
-              xdocs/tasks.xml file.
-            </td>
-          </tr>
-          <tr><td><a href="task-list.html">Task List</a></td>
-            <td>
-              This document provides a list of tasks that need to
-              be completed for the project, generated from the
-              @task javadoc tag in java source code.
-            </td>
-          </tr>
-          #if ($files.file($project.build.unitTestSourceDirectory).exists())
-          <tr><td><a href="junit-report.html">Unit Tests</a></td>
-            <td>
-              This document provides the results of the unit tests that
-              are part of this project.  Successes and failures are
-              noted.
-            </td>
-          </tr>
-          #end
-          
-          #if ($files.file($project.build.sourceDirectory).exists())
-          <tr><td><a href="jdepend-report.html">Metric Results</a></td>
-            <td>
-              This document provides information on various source code
-              metrics that have been computed.  These metrics can
-              provide useful information regarding the abstractness and
-              total number of classes.
-            </td>
-          </tr>
-          <tr><td><a href="checkstyle-report.html">Checkstyle Report</a></td>
-            <td>
-              This document provides the results of the Checkstyle
-              report.  This report provides an indication of how well
-              this project complies with its coding conventions.
-            </td>
-          </tr>
-          <tr><td><a href="javadoc.html">Javadoc Report</a></td>
-            <td>
-              This document the details of javadoc execution against
-              the project. This encourages the reduction of javadoc
-              errors.
-            </td>
-          </tr>
-          #end
-          
-          #if ($files.file("$maven-docs-dest/clover").exists())
-          <tr><td><a href="clover/index.html">Clover Test Coverage</a></td>
-            <td>
-              This document provides the results of the Clover report. This
-              reports show what portion on your code has been executed by
-              your test suite and generates statistics. It gives a very good
-              idea of how good your test suite is.
-            </td>
-          </tr>
-          #end
-          #if ($files.file("$gen-xdocs/cactus-report.xml").exists())
-          <tr><td><a href="cactus-report.html">Cactus Tests</a></td>
-            <td>
-              This document provides the results of the Cactus unit tests that
-              are part of this project.  Successes and failures are noted.
-            </td>
-          </tr>
+          #if (! $project.reports.isEmpty())
+            #foreach ($report in $reports)
+            <tr>
+              <td><a href="${report.link}.html">$report.name</a></td>
+              <td>$report.description</td>
+            </tr>
+            #end
+          #else
+            <tr><td><a href="changes.html">Changes</a></td>
+              <td>
+                This document provides a history of the changes made to the
+                project, in a user friendly format, generated from the
+                xdocs/changes.xml file.
+              </td>
+            </tr>
+            #if ($project.repository)
+            <tr><td><a href="changelog-report.html">Change Log</a></td>
+              <td>
+                This document provides a history of the most recent
+                changes made to the project taken directly from the
+                source code repository.
+              </td>
+            </tr>
+            <tr><td><a href="developer-activity-log.html">Developer Activity</a></td>
+              <td>
+                This document provides a report of activity in terms of
+                CVS commits and breaks it out by developer.
+              </td>
+            </tr>
+            <tr><td><a href="file-activity-report.html">File Activity</a></td>
+              <td>
+                This document provides a report of activity in terms of
+                CVS commits and breaks it out by file.
+              </td>
+            </tr>
+            #end
+            <tr><td><a href="tasks.html">Tasks</a></td>
+              <td>
+                This document provides a list of tasks that need to
+                be completed for the project, generated from the
+                xdocs/tasks.xml file.
+              </td>
+            </tr>
+            <tr><td><a href="task-list.html">Task List</a></td>
+              <td>
+                This document provides a list of tasks that need to
+                be completed for the project, generated from the
+                @task javadoc tag in java source code.
+              </td>
+            </tr>
+            #if ($files.file($project.build.unitTestSourceDirectory).exists())
+            <tr><td><a href="junit-report.html">Unit Tests</a></td>
+              <td>
+                This document provides the results of the unit tests that
+                are part of this project.  Successes and failures are
+                noted.
+              </td>
+            </tr>
+            #end
+            
+            #if ($files.file($project.build.sourceDirectory).exists())
+            <tr><td><a href="jdepend-report.html">Metric Results</a></td>
+              <td>
+                This document provides information on various source code
+                metrics that have been computed.  These metrics can
+                provide useful information regarding the abstractness and
+                total number of classes.
+              </td>
+            </tr>
+            <tr><td><a href="checkstyle-report.html">Checkstyle Report</a></td>
+              <td>
+                This document provides the results of the Checkstyle
+                report.  This report provides an indication of how well
+                this project complies with its coding conventions.
+              </td>
+            </tr>
+            <tr><td><a href="javadoc.html">Javadoc Report</a></td>
+              <td>
+                This document the details of javadoc execution against
+                the project. This encourages the reduction of javadoc
+                errors.
+              </td>
+            </tr>
+            #end
+            
+            #if ($files.file("$maven-docs-dest/clover").exists())
+            <tr><td><a href="clover/index.html">Clover Test Coverage</a></td>
+              <td>
+                This document provides the results of the Clover report. This
+                reports show what portion on your code has been executed by
+                your test suite and generates statistics. It gives a very good
+                idea of how good your test suite is.
+              </td>
+            </tr>
+            #end
+            #if ($files.file("$gen-xdocs/cactus-report.xml").exists())
+            <tr><td><a href="cactus-report.html">Cactus Tests</a></td>
+              <td>
+                This document provides the results of the Cactus unit tests that
+                are part of this project.  Successes and failures are noted.
+              </td>
+            </tr>
+            #end
           #end
         </table>
       </subsection>