diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/pom.xml b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/pom.xml
new file mode 100644
index 0000000000..87b7faf061
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/pom.xml
@@ -0,0 +1,59 @@
+<?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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.plugin.site.test1</groupId>
+  <artifactId>site-plugin-test1</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <inceptionYear>2005</inceptionYear>
+  <name>Maven Site Plugin Test1</name>
+  <description>Test report integration.</description>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <developers>
+    <developer>
+      <id>vsiveton</id>
+      <name>Vincent Siveton</name>
+      <email>vsiveton@apache.org</email>
+      <organization>Apache Software Foundation</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+  </developers>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/java/org/apache/maven/plugin/site/test1/App.java b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/java/org/apache/maven/plugin/site/test1/App.java
new file mode 100644
index 0000000000..e332291bb8
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/main/java/org/apache/maven/plugin/site/test1/App.java
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.site.test1;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/apt/test.apt b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/apt/test.apt
new file mode 100644
index 0000000000..4e35a8f02f
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/apt/test.apt
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Test
+
+Todo
\ No newline at end of file
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/site.xml b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/site.xml
new file mode 100644
index 0000000000..30b6570049
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/site/site.xml
@@ -0,0 +1,40 @@
+<?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 name="Maven Site">
+  <bannerLeft>
+    <name>Maven Site</name>
+    <src>http://maven.apache.org/images/apache-maven-project.png</src>
+    <href>http://maven.apache.org/</href>
+  </bannerLeft>
+  <bannerRight>
+    <src>http://maven.apache.org/images/maven-small.gif</src>
+  </bannerRight>
+  <body>
+    <links>
+      <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+    </links>
+
+    <menu name="Overview">
+      <item name="Test" href="/test.html"/>
+    </menu>
+    ${reports}
+  </body>
+</project>
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/java/org/apache/maven/plugin/site/test1/AppTest.java b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/java/org/apache/maven/plugin/site/test1/AppTest.java
new file mode 100644
index 0000000000..1dbc0f4ea3
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test1/src/test/java/org/apache/maven/plugin/site/test1/AppTest.java
@@ -0,0 +1,38 @@
+package org.apache.maven.plugin.site.test1;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/pom.xml b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/pom.xml
new file mode 100644
index 0000000000..58968744eb
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/pom.xml
@@ -0,0 +1,51 @@
+<?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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.plugin.site.test2</groupId>
+  <artifactId>site-plugin-test2</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <inceptionYear>2005</inceptionYear>
+  <name>Maven Site Plugin Test2</name>
+  <description>Take care of the description in the generated index file.</description>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <developers>
+    <developer>
+      <id>vsiveton</id>
+      <name>Vincent Siveton</name>
+      <email>vsiveton@apache.org</email>
+      <organization>Apache Software Foundation</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+  </developers>
+</project>
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/java/org/apache/maven/plugin/site/test2/App.java b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/java/org/apache/maven/plugin/site/test2/App.java
new file mode 100644
index 0000000000..827ca1ab78
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/main/java/org/apache/maven/plugin/site/test2/App.java
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.site.test2;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/apt/test.apt b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/apt/test.apt
new file mode 100644
index 0000000000..4e35a8f02f
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/apt/test.apt
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Test
+
+Todo
\ No newline at end of file
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/site.xml b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/site.xml
new file mode 100644
index 0000000000..30b6570049
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/site/site.xml
@@ -0,0 +1,40 @@
+<?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 name="Maven Site">
+  <bannerLeft>
+    <name>Maven Site</name>
+    <src>http://maven.apache.org/images/apache-maven-project.png</src>
+    <href>http://maven.apache.org/</href>
+  </bannerLeft>
+  <bannerRight>
+    <src>http://maven.apache.org/images/maven-small.gif</src>
+  </bannerRight>
+  <body>
+    <links>
+      <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+    </links>
+
+    <menu name="Overview">
+      <item name="Test" href="/test.html"/>
+    </menu>
+    ${reports}
+  </body>
+</project>
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/test/java/org/apache/maven/plugin/site/test2/AppTest.java b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/test/java/org/apache/maven/plugin/site/test2/AppTest.java
new file mode 100644
index 0000000000..8df4597070
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test2/src/test/java/org/apache/maven/plugin/site/test2/AppTest.java
@@ -0,0 +1,38 @@
+package org.apache.maven.plugin.site.test2;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/pom.xml b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/pom.xml
new file mode 100644
index 0000000000..8d478471b0
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/pom.xml
@@ -0,0 +1,51 @@
+<?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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.plugin.site.test3</groupId>
+  <artifactId>site-plugin-test3</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <inceptionYear>2005</inceptionYear>
+  <name>Maven Site Plugin Test3</name>
+<!--  <description>Default description should be generated.</description> -->
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <developers>
+    <developer>
+      <id>vsiveton</id>
+      <name>Vincent Siveton</name>
+      <email>vsiveton@apache.org</email>
+      <organization>Apache Software Foundation</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+  </developers>
+</project>
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/main/java/org/apache/maven/plugin/site/test3/App.java b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/main/java/org/apache/maven/plugin/site/test3/App.java
new file mode 100644
index 0000000000..269ac09add
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/main/java/org/apache/maven/plugin/site/test3/App.java
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.site.test3;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/site/apt/test.apt b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/site/apt/test.apt
new file mode 100644
index 0000000000..4e35a8f02f
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/site/apt/test.apt
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Test
+
+Todo
\ No newline at end of file
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/site/site.xml b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/site/site.xml
new file mode 100644
index 0000000000..30b6570049
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/site/site.xml
@@ -0,0 +1,40 @@
+<?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 name="Maven Site">
+  <bannerLeft>
+    <name>Maven Site</name>
+    <src>http://maven.apache.org/images/apache-maven-project.png</src>
+    <href>http://maven.apache.org/</href>
+  </bannerLeft>
+  <bannerRight>
+    <src>http://maven.apache.org/images/maven-small.gif</src>
+  </bannerRight>
+  <body>
+    <links>
+      <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+    </links>
+
+    <menu name="Overview">
+      <item name="Test" href="/test.html"/>
+    </menu>
+    ${reports}
+  </body>
+</project>
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/test/java/org/apache/maven/plugin/site/test3/AppTest.java b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/test/java/org/apache/maven/plugin/site/test3/AppTest.java
new file mode 100644
index 0000000000..0eec355f35
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test3/src/test/java/org/apache/maven/plugin/site/test3/AppTest.java
@@ -0,0 +1,38 @@
+package org.apache.maven.plugin.site.test3;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml
new file mode 100644
index 0000000000..e21ef62078
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml
@@ -0,0 +1,51 @@
+<?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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.plugin.site.test4</groupId>
+  <artifactId>site-plugin-test4</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <inceptionYear>2005</inceptionYear>
+  <name>Maven Site Plugin Test3</name>
+  <description>An index already exists.</description> -->
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <developers>
+    <developer>
+      <id>vsiveton</id>
+      <name>Vincent Siveton</name>
+      <email>vsiveton@apache.org</email>
+      <organization>Apache Software Foundation</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+  </developers>
+</project>
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/main/java/org/apache/maven/plugin/site/test4/App.java b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/main/java/org/apache/maven/plugin/site/test4/App.java
new file mode 100644
index 0000000000..3369c6f8e4
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/main/java/org/apache/maven/plugin/site/test4/App.java
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.site.test4;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/apt/index.apt b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/apt/index.apt
new file mode 100644
index 0000000000..4e35a8f02f
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/apt/index.apt
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Test
+
+Todo
\ No newline at end of file
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/apt/test.apt b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/apt/test.apt
new file mode 100644
index 0000000000..4e35a8f02f
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/apt/test.apt
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Test
+
+Todo
\ No newline at end of file
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/site.xml b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/site.xml
new file mode 100644
index 0000000000..30b6570049
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/site/site.xml
@@ -0,0 +1,40 @@
+<?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 name="Maven Site">
+  <bannerLeft>
+    <name>Maven Site</name>
+    <src>http://maven.apache.org/images/apache-maven-project.png</src>
+    <href>http://maven.apache.org/</href>
+  </bannerLeft>
+  <bannerRight>
+    <src>http://maven.apache.org/images/maven-small.gif</src>
+  </bannerRight>
+  <body>
+    <links>
+      <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+    </links>
+
+    <menu name="Overview">
+      <item name="Test" href="/test.html"/>
+    </menu>
+    ${reports}
+  </body>
+</project>
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/test/java/org/apache/maven/plugin/site/test4/AppTest.java b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/test/java/org/apache/maven/plugin/site/test4/AppTest.java
new file mode 100644
index 0000000000..ae0373508d
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test4/src/test/java/org/apache/maven/plugin/site/test4/AppTest.java
@@ -0,0 +1,38 @@
+package org.apache.maven.plugin.site.test4;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml
new file mode 100644
index 0000000000..5b6a29a673
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml
@@ -0,0 +1,51 @@
+<?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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.plugin.site.test5</groupId>
+  <artifactId>site-plugin-test5</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <inceptionYear>2005</inceptionYear>
+  <name>Maven Site Plugin Test5</name>
+  <description>Two indexes exists.</description> -->
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <developers>
+    <developer>
+      <id>vsiveton</id>
+      <name>Vincent Siveton</name>
+      <email>vsiveton@apache.org</email>
+      <organization>Apache Software Foundation</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>-5</timezone>
+    </developer>
+  </developers>
+</project>
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/main/java/org/apache/maven/plugin/site/test5/App.java b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/main/java/org/apache/maven/plugin/site/test5/App.java
new file mode 100644
index 0000000000..28f4886f65
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/main/java/org/apache/maven/plugin/site/test5/App.java
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.site.test5;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/apt/index.apt b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/apt/index.apt
new file mode 100644
index 0000000000..4e35a8f02f
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/apt/index.apt
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Test
+
+Todo
\ No newline at end of file
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/apt/test.apt b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/apt/test.apt
new file mode 100644
index 0000000000..4e35a8f02f
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/apt/test.apt
@@ -0,0 +1,12 @@
+ ------
+ Configuring Site Plugin
+ ------
+ Vincent Siveton
+ ------
+ 13 July 2005
+ ------
+
+
+Site Plugin Test
+
+Todo
\ No newline at end of file
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/site.xml b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/site.xml
new file mode 100644
index 0000000000..30b6570049
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/site.xml
@@ -0,0 +1,40 @@
+<?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 name="Maven Site">
+  <bannerLeft>
+    <name>Maven Site</name>
+    <src>http://maven.apache.org/images/apache-maven-project.png</src>
+    <href>http://maven.apache.org/</href>
+  </bannerLeft>
+  <bannerRight>
+    <src>http://maven.apache.org/images/maven-small.gif</src>
+  </bannerRight>
+  <body>
+    <links>
+      <item name="Maven 2" href="http://maven.apache.org/maven2/"/>
+    </links>
+
+    <menu name="Overview">
+      <item name="Test" href="/test.html"/>
+    </menu>
+    ${reports}
+  </body>
+</project>
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/xdoc/index.xml b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/xdoc/index.xml
new file mode 100644
index 0000000000..4a5c870663
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/site/xdoc/index.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<!--
+/*
+ * 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.
+ */
+ -->
+
+<document>
+  <properties>
+    <title>Welcome</title>
+    <author email="vincent.siveton">Vincent Siveton</author>
+  </properties>
+  <body>
+    <section name="Welcome to Maven">
+      <p>
+        Test the Maven Site Plugin.
+      </p>
+	</section>
+  </body>
+</document>
+
diff --git a/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/test/java/org/apache/maven/plugin/site/test5/AppTest.java b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/test/java/org/apache/maven/plugin/site/test5/AppTest.java
new file mode 100644
index 0000000000..8262c19860
--- /dev/null
+++ b/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test5/src/test/java/org/apache/maven/plugin/site/test5/AppTest.java
@@ -0,0 +1,38 @@
+package org.apache.maven.plugin.site.test5;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}