From 252c778556dfea1868c2be491f026b03466f0e55 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 4 Apr 2005 08:38:36 +0000
Subject: [PATCH] Renamed test projects to more meaningful names

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@160006 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/plugin-test/common/project.properties |   3 -
 dashboard/src/plugin-test/maven.xml           | 123 +++++++++---------
 .../src/plugin-test/subproject3/.cvsignore    |   2 -
 .../subproject3/project.properties            |  19 ---
 .../src/plugin-test/subproject3/project.xml   |  34 -----
 .../.cvsignore                                |   0
 .../project.properties                        |   0
 .../project.xml                               |   4 +-
 .../dashboard/test/subproject2/Sample.java    |   0
 .../dashboard/test/subproject2/Dummy.java     |   0
 .../.cvsignore                                |   0
 .../conf/test/changelog-report.xml            |   0
 .../conf/test/changelog.xml                   |   0
 .../conf/test/file-activity-report.xml        |   0
 .../maven.xml                                 |   0
 .../project.properties                        |   5 +
 .../project.xml                               |   4 +-
 .../dashboard/test/subproject1/Sample.java    |   0
 .../test/subproject1/TestSample.java          |   0
 19 files changed, 71 insertions(+), 123 deletions(-)
 delete mode 100644 dashboard/src/plugin-test/subproject3/.cvsignore
 delete mode 100644 dashboard/src/plugin-test/subproject3/project.properties
 delete mode 100644 dashboard/src/plugin-test/subproject3/project.xml
 rename dashboard/src/plugin-test/{subproject2 => testIndividualReportsGeneratedByDashboard}/.cvsignore (100%)
 rename dashboard/src/plugin-test/{subproject2 => testIndividualReportsGeneratedByDashboard}/project.properties (100%)
 rename dashboard/src/plugin-test/{subproject2 => testIndividualReportsGeneratedByDashboard}/project.xml (91%)
 rename dashboard/src/plugin-test/{subproject2 => testIndividualReportsGeneratedByDashboard}/src/java/org/apache/maven/dashboard/test/subproject2/Sample.java (100%)
 rename dashboard/src/plugin-test/{subproject2 => testIndividualReportsGeneratedByDashboard}/src/test/org/apache/maven/dashboard/test/subproject2/Dummy.java (100%)
 rename dashboard/src/plugin-test/{subproject1 => testIndividualReportsNotGeneratedByDashboard}/.cvsignore (100%)
 rename dashboard/src/plugin-test/{subproject1 => testIndividualReportsNotGeneratedByDashboard}/conf/test/changelog-report.xml (100%)
 rename dashboard/src/plugin-test/{subproject1 => testIndividualReportsNotGeneratedByDashboard}/conf/test/changelog.xml (100%)
 rename dashboard/src/plugin-test/{subproject1 => testIndividualReportsNotGeneratedByDashboard}/conf/test/file-activity-report.xml (100%)
 rename dashboard/src/plugin-test/{subproject1 => testIndividualReportsNotGeneratedByDashboard}/maven.xml (100%)
 rename dashboard/src/plugin-test/{subproject1 => testIndividualReportsNotGeneratedByDashboard}/project.properties (81%)
 rename dashboard/src/plugin-test/{subproject1 => testIndividualReportsNotGeneratedByDashboard}/project.xml (92%)
 rename dashboard/src/plugin-test/{subproject1 => testIndividualReportsNotGeneratedByDashboard}/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java (100%)
 rename dashboard/src/plugin-test/{subproject1 => testIndividualReportsNotGeneratedByDashboard}/src/test/org/apache/maven/dashboard/test/subproject1/TestSample.java (100%)

diff --git a/dashboard/src/plugin-test/common/project.properties b/dashboard/src/plugin-test/common/project.properties
index b49b54e9..4aad2c76 100644
--- a/dashboard/src/plugin-test/common/project.properties
+++ b/dashboard/src/plugin-test/common/project.properties
@@ -36,7 +36,4 @@ maven.dashboard.runreactor = false
 # by the subprojects and thus they don't need to define it again.
 maven.dashboard.aggregators = csall,cserrors,cswarnings,csfiles,clovertpc,cloverloc,cloverncloc,junittests,junitpassrate,junitfailures,juniterrors,simiantdl,pmdfiles,pmdviolations,fbfiles,fbviolations,jcoveragelipc,jcoverageloc,tasklistclass,tasklistmethod,tasklist,scmchangedfiles,scmchangedcommit,javancssclassestotal,javancssfunctionstotal,javancssncsstotal,javancsspackagestotal,javancssjavadocstotal
 
-# Make sure that an XML report is generated whenever Clover is run. Also
-# inherited by the subprojects.
-maven.clover.report.xml = true
 maven.junit.fork=true
diff --git a/dashboard/src/plugin-test/maven.xml b/dashboard/src/plugin-test/maven.xml
index 0f559287..0596ae6f 100644
--- a/dashboard/src/plugin-test/maven.xml
+++ b/dashboard/src/plugin-test/maven.xml
@@ -67,149 +67,150 @@
     <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]/a)"/>
+    <x:set var="taskCount" select="string($doc//body/section/table/tr[3]/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]/a)"/>
+    <x:set var="taskCount" select="string($doc//body/section/table/tr[3]/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]/a)"/>
+    <x:set var="taskCount" select="string($doc/document/body/section/table/tr[3]/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]/a)"/>
+    <x:set var="taskCount" select="string($doc/document/body/section/table/tr[3]/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]/a)"/>
+    <x:set var="taskCount" select="string($doc/document/body/section/table/tr[3]/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 projects have a 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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[1]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/index.html" value="${URL}"/>
+    <x:set var="URLText" select="string($doc/document/body/section/table/tr[3]/td[1]/a)"/>
+    <assert:assertEquals expected="Test Individual Reports Not Generated By Dashboard" value="${URLText}"/>
  
     <!-- Check the link generation to the detail reports -->         
     <!-- Subproject1 has report: we check that the link to the report exist -->
-    <ant:echo>Check that subproject1 has a link to the checkstyle 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}"/>
-    <!-- Subproject2 has no HTML report generated (there are no reports defined in subproject2's
-         project.xml): we check that the link to the report does not exist -->
-    <ant:echo>Check that subproject2 has no link to the checkstyle report</ant:echo>
+    <ant:echo>Check that testIndividualReportsNotGeneratedByDashboard has a link to the checkstyle report</ant:echo>
     <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[2]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle-report.html" value="${URL}"/>
+    <!-- testIndividualReportsGeneratedByDashboard has no HTML report generated (there are no 
+         reports defined in subproject2's project.xml): we check that the link to the report does 
+         not exist -->
+    <ant:echo>Check that testIndividualReportsGeneratedByDashboard has no link to the checkstyle report</ant:echo>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[2]/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[2]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[3]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[4]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[5]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle-report.html" value="${URL}"/>
     <!-- clovertpc -->
     <ant:echo>  Check clovertpc report</ant:echo>
-    <x:set var="URL" select="string($doc//document/body/section/table/tr[2]/td[6]/table/tr/td/a/@href)"/>
-    <assert:assertEquals expected="multiproject/test-maven-dashboard-plugin-subproject1/clover/index.html" value="${URL}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[6]/table/tr/td/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/clover/index.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/clover/index.html" value="${URL}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[7]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/clover/index.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/clover/index.html" value="${URL}"/>  
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[8]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/clover/index.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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[9]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[10]/table/tr[1]/td[1]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[11]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[12]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[13]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[14]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[15]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[16]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[17]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[18]/table/tr[1]/td[1]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[19]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[20]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[21]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[22]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[23]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/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}"/>
+    <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[24]/a/@href)"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/changelog-report.html" value="${URL}"/>
         
   </goal>
 </project>
diff --git a/dashboard/src/plugin-test/subproject3/.cvsignore b/dashboard/src/plugin-test/subproject3/.cvsignore
deleted file mode 100644
index 5d21c883..00000000
--- a/dashboard/src/plugin-test/subproject3/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-target
-maven.log
diff --git a/dashboard/src/plugin-test/subproject3/project.properties b/dashboard/src/plugin-test/subproject3/project.properties
deleted file mode 100644
index d66f96c3..00000000
--- a/dashboard/src/plugin-test/subproject3/project.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# -------------------------------------------------------------------
-# Copyright 2001-2004 The Apache Software Foundation.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-#  
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-# P R O J E C T  P R O P E R T I E S
-# -------------------------------------------------------------------
diff --git a/dashboard/src/plugin-test/subproject3/project.xml b/dashboard/src/plugin-test/subproject3/project.xml
deleted file mode 100644
index 298720dc..00000000
--- a/dashboard/src/plugin-test/subproject3/project.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-
-<project>
-  <extend>${basedir}/../common/project.xml</extend>
-  <id>test-maven-dashboard-plugin-subproject3</id>
-  <name>Maven Dashboard plugin test - Subproject3</name>
-  <reports>
-    <report>maven-changes-plugin</report>
-    <report>maven-tasklist-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-    <report>maven-javadoc-plugin</report>
-    <report>maven-jxr-plugin</report>
-    <report>maven-jdepend-plugin</report>
-    <report>maven-checkstyle-plugin</report>
-    <report>maven-junit-report-plugin</report>
-  </reports>
-</project>
diff --git a/dashboard/src/plugin-test/subproject2/.cvsignore b/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/.cvsignore
similarity index 100%
rename from dashboard/src/plugin-test/subproject2/.cvsignore
rename to dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/.cvsignore
diff --git a/dashboard/src/plugin-test/subproject2/project.properties b/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.properties
similarity index 100%
rename from dashboard/src/plugin-test/subproject2/project.properties
rename to dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.properties
diff --git a/dashboard/src/plugin-test/subproject2/project.xml b/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.xml
similarity index 91%
rename from dashboard/src/plugin-test/subproject2/project.xml
rename to dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.xml
index 11bda6d6..a164b54e 100644
--- a/dashboard/src/plugin-test/subproject2/project.xml
+++ b/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/project.xml
@@ -19,8 +19,8 @@
 
 <project>
   <extend>${basedir}/../common/project.xml</extend>
-  <id>test-maven-dashboard-plugin-subproject2</id>
-  <name>Maven Dashboard plugin test - Subproject2</name>
+  <id>testIndividualReportsGeneratedByDashboard</id>
+  <name>Test Individual Reports Generated By Dashboard</name>
   <reports>
     <!-- Voluntarily do not put any report that are part of dashboard 
          aggregators. We're forcing the execution of artifact goals using
diff --git a/dashboard/src/plugin-test/subproject2/src/java/org/apache/maven/dashboard/test/subproject2/Sample.java b/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/src/java/org/apache/maven/dashboard/test/subproject2/Sample.java
similarity index 100%
rename from dashboard/src/plugin-test/subproject2/src/java/org/apache/maven/dashboard/test/subproject2/Sample.java
rename to dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/src/java/org/apache/maven/dashboard/test/subproject2/Sample.java
diff --git a/dashboard/src/plugin-test/subproject2/src/test/org/apache/maven/dashboard/test/subproject2/Dummy.java b/dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/src/test/org/apache/maven/dashboard/test/subproject2/Dummy.java
similarity index 100%
rename from dashboard/src/plugin-test/subproject2/src/test/org/apache/maven/dashboard/test/subproject2/Dummy.java
rename to dashboard/src/plugin-test/testIndividualReportsGeneratedByDashboard/src/test/org/apache/maven/dashboard/test/subproject2/Dummy.java
diff --git a/dashboard/src/plugin-test/subproject1/.cvsignore b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/.cvsignore
similarity index 100%
rename from dashboard/src/plugin-test/subproject1/.cvsignore
rename to dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/.cvsignore
diff --git a/dashboard/src/plugin-test/subproject1/conf/test/changelog-report.xml b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/conf/test/changelog-report.xml
similarity index 100%
rename from dashboard/src/plugin-test/subproject1/conf/test/changelog-report.xml
rename to dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/conf/test/changelog-report.xml
diff --git a/dashboard/src/plugin-test/subproject1/conf/test/changelog.xml b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/conf/test/changelog.xml
similarity index 100%
rename from dashboard/src/plugin-test/subproject1/conf/test/changelog.xml
rename to dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/conf/test/changelog.xml
diff --git a/dashboard/src/plugin-test/subproject1/conf/test/file-activity-report.xml b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/conf/test/file-activity-report.xml
similarity index 100%
rename from dashboard/src/plugin-test/subproject1/conf/test/file-activity-report.xml
rename to dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/conf/test/file-activity-report.xml
diff --git a/dashboard/src/plugin-test/subproject1/maven.xml b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/maven.xml
similarity index 100%
rename from dashboard/src/plugin-test/subproject1/maven.xml
rename to dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/maven.xml
diff --git a/dashboard/src/plugin-test/subproject1/project.properties b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.properties
similarity index 81%
rename from dashboard/src/plugin-test/subproject1/project.properties
rename to dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.properties
index d66f96c3..35990720 100644
--- a/dashboard/src/plugin-test/subproject1/project.properties
+++ b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.properties
@@ -17,3 +17,8 @@
 # -------------------------------------------------------------------
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
+
+# Make sure that an XML report is generated whenever Clover is run. This is
+# required for subproject1 because the individual reports are not triggered by 
+# the dashboard.
+maven.clover.report.xml = true
diff --git a/dashboard/src/plugin-test/subproject1/project.xml b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml
similarity index 92%
rename from dashboard/src/plugin-test/subproject1/project.xml
rename to dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml
index 286b138a..901dfcf9 100644
--- a/dashboard/src/plugin-test/subproject1/project.xml
+++ b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml
@@ -20,8 +20,8 @@
 
 <project>
   <extend>${basedir}/../common/project.xml</extend>
-  <id>test-maven-dashboard-plugin-subproject1</id>
-  <name>Maven Dashboard plugin test - Subproject1</name>
+  <id>testIndividualReportsNotGeneratedByDashboard</id>
+  <name>Test Individual Reports Not Generated By Dashboard</name>
   <dependencies>
     <dependency>
       <groupId>xerces</groupId>
diff --git a/dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java
similarity index 100%
rename from dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java
rename to dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java
diff --git a/dashboard/src/plugin-test/subproject1/src/test/org/apache/maven/dashboard/test/subproject1/TestSample.java b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/src/test/org/apache/maven/dashboard/test/subproject1/TestSample.java
similarity index 100%
rename from dashboard/src/plugin-test/subproject1/src/test/org/apache/maven/dashboard/test/subproject1/TestSample.java
rename to dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/src/test/org/apache/maven/dashboard/test/subproject1/TestSample.java