diff --git a/dashboard/sample/project.xml b/dashboard/sample/project.xml
deleted file mode 100644
index 5654d6e6..00000000
--- a/dashboard/sample/project.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
-  <!-- the version of maven's project object model -->
-  <pomVersion>3</pomVersion>
-  
-  <!-- a unique name for this project -->
-  <id>maven-dashboard-sample</id>
-  
-  <!-- a short but descriptive name for the project -->
-  <name>Dashboard Sample</name>
-  
-  <!-- The version of the project under development, e.g.
-       1.1, 1.2, 2.0-dev -->
-  <currentVersion>1.0</currentVersion>
-  
-  <!-- details about the organization that 'owns' the project -->
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://jakarta.apache.org/</url>
-  </organization>
-  
-  <!-- the year the project started -->
-  <inceptionYear>2003</inceptionYear>
-  
-  <!-- the top level of java packages that this project defines
-       e.g. if your project contains the packages
-       com.mycompany.accounts.reports, com.mycompany.accounts.reports
-       and com.mycompany.accounts.utils, the package would be
-       'com.mycompany.accounts' -->
-  <package>org.apache.maven.dashboard.sample</package>
-  
-  <!-- a short description of what the project does -->
-  <shortDescription>A sample project using the Dashboard report</shortDescription>
-
-  <!-- the project home page -->
-  <url>http://maven.apache.org/</url>
-
-  <!-- the version control repository and http url for online access
-       the connection element has the form:
-       scm:<system>:<system specific connection string> -->
-  <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/</url>
-  </repository>
-
-  <!-- any mailing lists for the project -->
-  <mailingLists/>
-  
-  <!-- who the developers are for the project -->
-  <developers/>
-
-  <!-- jar files the project is dependent on -->
-  <dependencies/>
-  
-  <!-- build information for the project -->
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-  </build>
-
-  <reports>
-    <report>maven-dashboard-plugin</report>
-  </reports>
-
-</project>
\ No newline at end of file
diff --git a/dashboard/sample/subproject1/project.xml b/dashboard/sample/subproject1/project.xml
deleted file mode 100644
index 68dc0a58..00000000
--- a/dashboard/sample/subproject1/project.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
-  <!-- the version of maven's project object model -->
-  <pomVersion>3</pomVersion>
-  
-  <!-- a unique name for this project -->
-  <id>maven-dashboard-sample-subproject1</id>
-  
-  <!-- a short but descriptive name for the project -->
-  <name>Dashboard Sample Subproject1</name>
-  
-  <!-- The version of the project under development, e.g.
-       1.1, 1.2, 2.0-dev -->
-  <currentVersion>1.0</currentVersion>
-  
-  <!-- details about the organization that 'owns' the project -->
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://jakarta.apache.org/</url>
-  </organization>
-  
-  <!-- the year the project started -->
-  <inceptionYear>2003</inceptionYear>
-  
-  <!-- the top level of java packages that this project defines
-       e.g. if your project contains the packages
-       com.mycompany.accounts.reports, com.mycompany.accounts.reports
-       and com.mycompany.accounts.utils, the package would be
-       'com.mycompany.accounts' -->
-  <package>org.apache.maven.dashboard.sample.subproject1</package>
-  
-  <!-- a short description of what the project does -->
-  <shortDescription>A sample project using the Dashboard report</shortDescription>
-
-  <!-- the project home page -->
-  <url>http://maven.apache.org/</url>
-
-  <!-- the version control repository and http url for online access
-       the connection element has the form:
-       scm:<system>:<system specific connection string> -->
-  <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/</url>
-  </repository>
-
-  <!-- any mailing lists for the project -->
-  <mailingLists/>
-  
-  <!-- who the developers are for the project -->
-  <developers/>
-
-  <!-- jar files the project is dependent on -->
-  <dependencies/>
-  
-  <!-- build information for the project -->
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-    <unitTest>
-      <includes>
-        <include>**/Test*.java</include>
-      </includes>
-    </unitTest>
-  </build>
-
-  <reports>
-    <report>maven-checkstyle-plugin</report>
-    <report>maven-clover-plugin</report>
-  </reports>
-
-</project>
\ No newline at end of file
diff --git a/dashboard/sample/subproject2/project.xml b/dashboard/sample/subproject2/project.xml
deleted file mode 100644
index 4276b879..00000000
--- a/dashboard/sample/subproject2/project.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
-  <!-- the version of maven's project object model -->
-  <pomVersion>3</pomVersion>
-  
-  <!-- a unique name for this project -->
-  <id>maven-dashboard-sample-subproject2</id>
-  
-  <!-- a short but descriptive name for the project -->
-  <name>Dashboard Sample Subproject2</name>
-  
-  <!-- The version of the project under development, e.g.
-       1.1, 1.2, 2.0-dev -->
-  <currentVersion>1.0</currentVersion>
-  
-  <!-- details about the organization that 'owns' the project -->
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://jakarta.apache.org/</url>
-  </organization>
-  
-  <!-- the year the project started -->
-  <inceptionYear>2003</inceptionYear>
-  
-  <!-- the top level of java packages that this project defines
-       e.g. if your project contains the packages
-       com.mycompany.accounts.reports, com.mycompany.accounts.reports
-       and com.mycompany.accounts.utils, the package would be
-       'com.mycompany.accounts' -->
-  <package>org.apache.maven.dashboard.sample.subproject2</package>
-  
-  <!-- a short description of what the project does -->
-  <shortDescription>A sample project using the Dashboard report</shortDescription>
-
-  <!-- the project home page -->
-  <url>http://maven.apache.org/</url>
-
-  <!-- the version control repository and http url for online access
-       the connection element has the form:
-       scm:<system>:<system specific connection string> -->
-  <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/</url>
-  </repository>
-
-  <!-- any mailing lists for the project -->
-  <mailingLists/>
-  
-  <!-- who the developers are for the project -->
-  <developers/>
-
-  <!-- jar files the project is dependent on -->
-  <dependencies/>
-  
-  <!-- build information for the project -->
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-  </build>
-
-  <reports>
-    <report>maven-checkstyle-plugin</report>
-  </reports>
-
-</project>
\ No newline at end of file
diff --git a/dashboard/sample/subproject3/project.xml b/dashboard/sample/subproject3/project.xml
deleted file mode 100644
index d318a3c6..00000000
--- a/dashboard/sample/subproject3/project.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
-  <!-- the version of maven's project object model -->
-  <pomVersion>3</pomVersion>
-  
-  <!-- a unique name for this project -->
-  <id>maven-dashboard-sample-subproject3</id>
-  
-  <!-- a short but descriptive name for the project -->
-  <name>Dashboard Sample Subproject3</name>
-  
-  <!-- The version of the project under development, e.g.
-       1.1, 1.2, 2.0-dev -->
-  <currentVersion>1.0</currentVersion>
-  
-  <!-- details about the organization that 'owns' the project -->
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://jakarta.apache.org/</url>
-  </organization>
-  
-  <!-- the year the project started -->
-  <inceptionYear>2003</inceptionYear>
-  
-  <!-- the top level of java packages that this project defines
-       e.g. if your project contains the packages
-       com.mycompany.accounts.reports, com.mycompany.accounts.reports
-       and com.mycompany.accounts.utils, the package would be
-       'com.mycompany.accounts' -->
-  <package>org.apache.maven.dashboard.sample.subproject3</package>
-  
-  <!-- a short description of what the project does -->
-  <shortDescription>A sample project using the Dashboard report</shortDescription>
-
-  <!-- the project home page -->
-  <url>http://maven.apache.org/</url>
-
-  <!-- the version control repository and http url for online access
-       the connection element has the form:
-       scm:<system>:<system specific connection string> -->
-  <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/</url>
-  </repository>
-
-  <!-- any mailing lists for the project -->
-  <mailingLists/>
-  
-  <!-- who the developers are for the project -->
-  <developers/>
-
-  <!-- jar files the project is dependent on -->
-  <dependencies/>
-  
-  <!-- build information for the project -->
-  <build/>
-
-</project>
\ No newline at end of file
diff --git a/dashboard/sample/.cvsignore b/dashboard/src/plugin-test/.cvsignore
similarity index 100%
rename from dashboard/sample/.cvsignore
rename to dashboard/src/plugin-test/.cvsignore
diff --git a/dashboard/src/plugin-test/LICENSE.txt b/dashboard/src/plugin-test/LICENSE.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/dashboard/src/plugin-test/maven.xml b/dashboard/src/plugin-test/maven.xml
new file mode 100644
index 00000000..7523ec9e
--- /dev/null
+++ b/dashboard/src/plugin-test/maven.xml
@@ -0,0 +1,21 @@
+<project
+  xmlns:util="jelly:util"
+  xmlns:j="jelly:core"
+  xmlns:ant="jelly:ant"
+  xmlns:assert="assert">
+
+  <goal name="testPlugin">
+
+    <!-- Fixture -->
+  	<j:set var="goal" value="clean"/>
+    <attainGoal name="multiproject:goal"/>
+
+    <!-- Call goal to test -->
+    <attainGoal name="site"/>
+
+    <!-- Verifications -->
+    <assert:assertFileExists file="${maven.gen.docs}/dashboard-report.xml"/>
+
+  </goal>
+
+</project>
\ No newline at end of file
diff --git a/dashboard/sample/project.properties b/dashboard/src/plugin-test/project.properties
similarity index 82%
rename from dashboard/sample/project.properties
rename to dashboard/src/plugin-test/project.properties
index 9820ec25..89c6d4e5 100644
--- a/dashboard/sample/project.properties
+++ b/dashboard/src/plugin-test/project.properties
@@ -3,6 +3,8 @@
 # -------------------------------------------------------------------
 maven.xdoc.date=left
 maven.xdoc.version=${pom.currentVersion}
-maven.checkstyle.header.file = ${basedir}/../../LICENSE.txt
+maven.checkstyle.header.file = ${basedir}/LICENSE.txt
 
 maven.dashboard.aggregators = csall,cserrors,cswarnings,clovertpc,cloverloc,cloverncloc
+
+offline=true
diff --git a/dashboard/src/plugin-test/project.xml b/dashboard/src/plugin-test/project.xml
new file mode 100644
index 00000000..1c1a9d33
--- /dev/null
+++ b/dashboard/src/plugin-test/project.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <pomVersion>3</pomVersion>
+  <id>test-maven-dashboard-plugin</id>
+  <name>Maven Dashboard plugin test</name>
+  <groupId>maven</groupId>
+  <currentVersion>1.0</currentVersion>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://jakarta.apache.org/</url>
+  </organization>
+  <inceptionYear>2003</inceptionYear>
+  <package>org.apache.maven.dashboard.test</package>
+  <shortDescription>Test project for Maven Dashboard plugin</shortDescription>
+  <url>http://maven.apache.org/reference/plugins/dashboard/</url>
+  <repository>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/dashboard/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/dashboard/</url>
+  </repository>
+  <mailingLists/>
+  <developers/>
+  <dependencies/>
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <unitTest>
+      <includes>
+        <include>**/Test*.java</include>
+      </includes>
+    </unitTest>
+  </build>
+  <reports>
+    <report>maven-dashboard-plugin</report>
+  </reports>
+</project>
\ No newline at end of file
diff --git a/dashboard/sample/subproject1/.cvsignore b/dashboard/src/plugin-test/subproject1/.cvsignore
similarity index 100%
rename from dashboard/sample/subproject1/.cvsignore
rename to dashboard/src/plugin-test/subproject1/.cvsignore
diff --git a/dashboard/sample/subproject2/project.properties b/dashboard/src/plugin-test/subproject1/project.properties
similarity index 79%
rename from dashboard/sample/subproject2/project.properties
rename to dashboard/src/plugin-test/subproject1/project.properties
index dfa71125..4e429a7b 100644
--- a/dashboard/sample/subproject2/project.properties
+++ b/dashboard/src/plugin-test/subproject1/project.properties
@@ -3,4 +3,4 @@
 # -------------------------------------------------------------------
 maven.xdoc.date=left
 maven.xdoc.version=${pom.currentVersion}
-maven.checkstyle.header.file = ${basedir}/../../../LICENSE.txt
+maven.checkstyle.header.file = ${basedir}/../LICENSE.txt
diff --git a/dashboard/src/plugin-test/subproject1/project.xml b/dashboard/src/plugin-test/subproject1/project.xml
new file mode 100644
index 00000000..532518fa
--- /dev/null
+++ b/dashboard/src/plugin-test/subproject1/project.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <extend>${basedir}/../project.xml</extend>
+  <id>test-maven-dashboard-plugin-subproject1</id>
+  <name>Maven Dashboard plugin test - Subproject1</name>
+  <reports>
+    <report>maven-checkstyle-plugin</report>
+    <report>maven-clover-plugin</report>
+  </reports>
+</project>
diff --git a/dashboard/sample/subproject1/src/java/org/apache/maven/dashboard/sample/subproject1/Sample.java b/dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java
similarity index 96%
rename from dashboard/sample/subproject1/src/java/org/apache/maven/dashboard/sample/subproject1/Sample.java
rename to dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java
index 1d70fd20..aa24913c 100644
--- a/dashboard/sample/subproject1/src/java/org/apache/maven/dashboard/sample/subproject1/Sample.java
+++ b/dashboard/src/plugin-test/subproject1/src/java/org/apache/maven/dashboard/test/subproject1/Sample.java
@@ -1,4 +1,4 @@
-package org.apache.maven.dashboard.sample.subproject1;
+package org.apache.maven.dashboard.test.subproject1;
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -61,7 +61,7 @@ package org.apache.maven.dashboard.sample.subproject1;
  *
  * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
  *
- * @version $Id: Sample.java,v 1.2 2003/11/05 19:26:58 vmassol Exp $
+ * @version $Id: Sample.java,v 1.1 2003/11/17 21:36:58 vmassol Exp $
  */
 public class Sample
 {
diff --git a/dashboard/sample/subproject1/src/test/org/apache/maven/dashboard/sample/subproject1/TestSample.java b/dashboard/src/plugin-test/subproject1/src/test/org/apache/maven/dashboard/test/subproject1/TestSample.java
similarity index 96%
rename from dashboard/sample/subproject1/src/test/org/apache/maven/dashboard/sample/subproject1/TestSample.java
rename to dashboard/src/plugin-test/subproject1/src/test/org/apache/maven/dashboard/test/subproject1/TestSample.java
index f0fdd984..3d8db863 100644
--- a/dashboard/sample/subproject1/src/test/org/apache/maven/dashboard/sample/subproject1/TestSample.java
+++ b/dashboard/src/plugin-test/subproject1/src/test/org/apache/maven/dashboard/test/subproject1/TestSample.java
@@ -1,4 +1,4 @@
-package org.apache.maven.dashboard.sample.subproject1;
+package org.apache.maven.dashboard.test.subproject1;
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -63,7 +63,7 @@ import junit.framework.TestCase;
  *
  * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
  *
- * @version $Id: TestSample.java,v 1.1 2003/11/05 19:26:58 vmassol Exp $
+ * @version $Id: TestSample.java,v 1.1 2003/11/17 21:37:00 vmassol Exp $
  */
 public class TestSample extends TestCase
 {
diff --git a/dashboard/sample/subproject2/.cvsignore b/dashboard/src/plugin-test/subproject2/.cvsignore
similarity index 100%
rename from dashboard/sample/subproject2/.cvsignore
rename to dashboard/src/plugin-test/subproject2/.cvsignore
diff --git a/dashboard/sample/subproject1/project.properties b/dashboard/src/plugin-test/subproject2/project.properties
similarity index 79%
rename from dashboard/sample/subproject1/project.properties
rename to dashboard/src/plugin-test/subproject2/project.properties
index dfa71125..4e429a7b 100644
--- a/dashboard/sample/subproject1/project.properties
+++ b/dashboard/src/plugin-test/subproject2/project.properties
@@ -3,4 +3,4 @@
 # -------------------------------------------------------------------
 maven.xdoc.date=left
 maven.xdoc.version=${pom.currentVersion}
-maven.checkstyle.header.file = ${basedir}/../../../LICENSE.txt
+maven.checkstyle.header.file = ${basedir}/../LICENSE.txt
diff --git a/dashboard/src/plugin-test/subproject2/project.xml b/dashboard/src/plugin-test/subproject2/project.xml
new file mode 100644
index 00000000..edb44528
--- /dev/null
+++ b/dashboard/src/plugin-test/subproject2/project.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <extend>${basedir}/../project.xml</extend>
+  <id>test-maven-dashboard-plugin-subproject2</id>
+  <name>Maven Dashboard plugin test - Subproject2</name>
+  <reports>
+    <report>maven-checkstyle-plugin</report>
+  </reports>
+</project>
diff --git a/dashboard/sample/subproject2/src/java/org/apache/maven/dashboard/sample/subproject2/Sample.java b/dashboard/src/plugin-test/subproject2/src/java/org/apache/maven/dashboard/test/subproject2/Sample.java
similarity index 96%
rename from dashboard/sample/subproject2/src/java/org/apache/maven/dashboard/sample/subproject2/Sample.java
rename to dashboard/src/plugin-test/subproject2/src/java/org/apache/maven/dashboard/test/subproject2/Sample.java
index 5f7373cd..7e93ae56 100644
--- a/dashboard/sample/subproject2/src/java/org/apache/maven/dashboard/sample/subproject2/Sample.java
+++ b/dashboard/src/plugin-test/subproject2/src/java/org/apache/maven/dashboard/test/subproject2/Sample.java
@@ -1,4 +1,4 @@
-package org.apache.maven.dashboard.sample.subproject2;
+package org.apache.maven.dashboard.test.subproject2;
 
 /* ====================================================================
  * The Apache Software License, Version 1.1
@@ -61,7 +61,7 @@ package org.apache.maven.dashboard.sample.subproject2;
  *
  * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
  *
- * @version $Id: Sample.java,v 1.1 2003/11/04 21:11:32 vmassol Exp $
+ * @version $Id: Sample.java,v 1.1 2003/11/17 21:37:00 vmassol Exp $
  */
 public class Sample
 {
diff --git a/dashboard/sample/subproject3/.cvsignore b/dashboard/src/plugin-test/subproject3/.cvsignore
similarity index 100%
rename from dashboard/sample/subproject3/.cvsignore
rename to dashboard/src/plugin-test/subproject3/.cvsignore
diff --git a/dashboard/sample/subproject3/project.properties b/dashboard/src/plugin-test/subproject3/project.properties
similarity index 79%
rename from dashboard/sample/subproject3/project.properties
rename to dashboard/src/plugin-test/subproject3/project.properties
index dfa71125..4e429a7b 100644
--- a/dashboard/sample/subproject3/project.properties
+++ b/dashboard/src/plugin-test/subproject3/project.properties
@@ -3,4 +3,4 @@
 # -------------------------------------------------------------------
 maven.xdoc.date=left
 maven.xdoc.version=${pom.currentVersion}
-maven.checkstyle.header.file = ${basedir}/../../../LICENSE.txt
+maven.checkstyle.header.file = ${basedir}/../LICENSE.txt
diff --git a/dashboard/src/plugin-test/subproject3/project.xml b/dashboard/src/plugin-test/subproject3/project.xml
new file mode 100644
index 00000000..844a3148
--- /dev/null
+++ b/dashboard/src/plugin-test/subproject3/project.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <extend>${basedir}/../project.xml</extend>
+  <id>test-maven-dashboard-plugin-subproject3</id>
+  <name>Maven Dashboard plugin test - Subproject3</name>
+</project>