diff --git a/xdoc/src/plugin-test/.cvsignore b/xdoc/src/plugin-test/.cvsignore
index 4e1b955e..64d85f5a 100644
--- a/xdoc/src/plugin-test/.cvsignore
+++ b/xdoc/src/plugin-test/.cvsignore
@@ -1,2 +1,5 @@
+gump.xml
 *.log
+targetdist
+dist
 target
diff --git a/xdoc/src/plugin-test/maven.xml b/xdoc/src/plugin-test/maven.xml
index 80206d07..0c5a2c4f 100644
--- a/xdoc/src/plugin-test/maven.xml
+++ b/xdoc/src/plugin-test/maven.xml
@@ -16,24 +16,17 @@
  */
  -->
 <project xmlns:util="jelly:util"
+         xmlns:maven="jelly:maven"
          xmlns:j="jelly:core"
          xmlns:assert="assert"
-         xmlns:doc="doc">
+         xmlns:ant="jelly:ant">
          
-  <goal name="testPlugin" prereqs="clean,test-xdoc,test-jsltosite">
-    <!-- bad xdoc leaves files open <attainGoal name="clean"/> -->
-  </goal>
-  
-  <goal name="test-xdoc">
-    <j:set var="maven.docs.src" value="${basedir}/xdocs-replacement"/>
-    <attainGoal name="xdoc"/>
-    <assert:assertFileExists file="${maven.docs.dest}/test.html"/>
-  </goal>
-  
-  
-  <goal name="test-jsltosite">
-    <doc:jslToSite srcdir="${basedir}/testdocs" />
-    <assert:assertFileExists file="${maven.docs.dest}/testjsltosite.html"/>
+  <goal name="testPlugin">
+    <maven:reactor basedir="${basedir}"
+      includes="test*/project.xml"
+      goals="testPlugin"
+      banner="Test"
+      ignoreFailures="false"/>
   </goal>
   
 </project>
\ No newline at end of file
diff --git a/xdoc/src/plugin-test/project.xml b/xdoc/src/plugin-test/project.xml
index f31d0283..b9c6b26d 100644
--- a/xdoc/src/plugin-test/project.xml
+++ b/xdoc/src/plugin-test/project.xml
@@ -27,11 +27,11 @@
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://www.apache.org/</url>
-    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
+    <logo>http://maven.apache.org/images/apache-maven-project.png</logo>
   </organization>
   <inceptionYear>2001</inceptionYear>
   <package>org.apache.maven</package>
-  <logo>http://maven.apache.org/images/maven.jpg</logo>
+  <logo>http://maven.apache.org/images/maven.gif</logo>
   <description>Test for Maven Xdoc plugin</description>
   <shortDescription>Test for Maven Xdoc plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/xdoc/</url>
@@ -40,18 +40,4 @@
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/xdoc/</connection>
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/xdoc/</url>
   </repository>
-  <developers>
-    <developer>
-      <name>dIon Gillard</name>
-      <id>dion</id>
-      <email>dion@multitask.com.au</email>
-      <organization>Multitask Consulting</organization>
-      <roles>
-        <role>Documentation</role>
-      </roles>
-    </developer>
-  </developers>
-
-  <build>
-  </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/xdoc/src/plugin-test/test01/.cvsignore b/xdoc/src/plugin-test/test01/.cvsignore
new file mode 100644
index 00000000..4e1b955e
--- /dev/null
+++ b/xdoc/src/plugin-test/test01/.cvsignore
@@ -0,0 +1,2 @@
+*.log
+target
diff --git a/xdoc/src/plugin-test/common/links.xml b/xdoc/src/plugin-test/test01/common/links.xml
similarity index 98%
rename from xdoc/src/plugin-test/common/links.xml
rename to xdoc/src/plugin-test/test01/common/links.xml
index 023a71f4..cc4386f7 100644
--- a/xdoc/src/plugin-test/common/links.xml
+++ b/xdoc/src/plugin-test/test01/common/links.xml
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
  -->
-<!-- $Id: links.xml,v 1.2 2004/03/04 18:39:49 evenisse Exp $ -->
+<!-- $Id: links.xml,v 1.1 2004/08/25 19:58:20 aheritier Exp $ -->
 
 <!ENTITY _module '<code>&lt;module&gt;</code>'>
 <!ENTITY module '<a href="descriptor.html#module">&_module;</a>'>
diff --git a/xdoc/src/plugin-test/test01/maven.xml b/xdoc/src/plugin-test/test01/maven.xml
new file mode 100644
index 00000000..80206d07
--- /dev/null
+++ b/xdoc/src/plugin-test/test01/maven.xml
@@ -0,0 +1,39 @@
+<!-- 
+/*
+ * 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.
+ */
+ -->
+<project xmlns:util="jelly:util"
+         xmlns:j="jelly:core"
+         xmlns:assert="assert"
+         xmlns:doc="doc">
+         
+  <goal name="testPlugin" prereqs="clean,test-xdoc,test-jsltosite">
+    <!-- bad xdoc leaves files open <attainGoal name="clean"/> -->
+  </goal>
+  
+  <goal name="test-xdoc">
+    <j:set var="maven.docs.src" value="${basedir}/xdocs-replacement"/>
+    <attainGoal name="xdoc"/>
+    <assert:assertFileExists file="${maven.docs.dest}/test.html"/>
+  </goal>
+  
+  
+  <goal name="test-jsltosite">
+    <doc:jslToSite srcdir="${basedir}/testdocs" />
+    <assert:assertFileExists file="${maven.docs.dest}/testjsltosite.html"/>
+  </goal>
+  
+</project>
\ No newline at end of file
diff --git a/xdoc/src/plugin-test/test01/project.xml b/xdoc/src/plugin-test/test01/project.xml
new file mode 100644
index 00000000..0d83d007
--- /dev/null
+++ b/xdoc/src/plugin-test/test01/project.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * 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.
+ */
+ -->
+
+
+<project>
+  <pomVersion>3</pomVersion>
+  <id>test-maven-xdoc-plugin</id>
+  <name>Maven Xdoc Plugin 01</name>
+  <groupId>maven</groupId>
+  <currentVersion>1.0</currentVersion>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/apache-maven-project.png</logo>
+  </organization>
+  <inceptionYear>2001</inceptionYear>
+  <package>org.apache.maven</package>
+  <logo>http://maven.apache.org/images/maven.gif</logo>
+  <description>Test for Maven Xdoc plugin</description>
+  <shortDescription>Test for Maven Xdoc plugin</shortDescription>
+  <url>http://maven.apache.org/reference/plugins/xdoc/</url>
+  <siteDirectory>/www/maven.apache.org/reference/plugins/xdoc/</siteDirectory>
+  <repository>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/xdoc/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/xdoc/</url>
+  </repository>
+  <developers>
+    <developer>
+      <name>dIon Gillard</name>
+      <id>dion</id>
+      <email>dion@multitask.com.au</email>
+      <organization>Multitask Consulting</organization>
+      <roles>
+        <role>Documentation</role>
+      </roles>
+    </developer>
+  </developers>
+</project>
diff --git a/xdoc/src/plugin-test/testdocs/testjsltosite.xml b/xdoc/src/plugin-test/test01/testdocs/testjsltosite.xml
similarity index 100%
rename from xdoc/src/plugin-test/testdocs/testjsltosite.xml
rename to xdoc/src/plugin-test/test01/testdocs/testjsltosite.xml
diff --git a/xdoc/src/plugin-test/xdocs-replacement/navigation.xml b/xdoc/src/plugin-test/test01/xdocs-replacement/navigation.xml
similarity index 100%
rename from xdoc/src/plugin-test/xdocs-replacement/navigation.xml
rename to xdoc/src/plugin-test/test01/xdocs-replacement/navigation.xml
diff --git a/xdoc/src/plugin-test/xdocs-replacement/test.xml b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
similarity index 94%
rename from xdoc/src/plugin-test/xdocs-replacement/test.xml
rename to xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
index 2a061191..45e46411 100644
--- a/xdoc/src/plugin-test/xdocs-replacement/test.xml
+++ b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
@@ -17,7 +17,7 @@
  */
  -->
 
-<!-- $Id: test.xml,v 1.3 2004/04/08 00:42:45 brett Exp $ -->
+<!-- $Id: test.xml,v 1.1 2004/08/25 19:58:20 aheritier Exp $ -->
 <!DOCTYPE document [
 	<!ENTITY % common-links SYSTEM "../common/links.xml">
 	%common-links;