You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2011/03/18 12:54:45 UTC

svn commit: r1082877 - in /maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus: ./ parentAsRef/ parentAsRef/childAsRef/ parentAsRef/childAsRef/grandChildAsRef/ parentAsRef/childAsRef/grandChildAsRef/src/ parentAsRef/childAsRef/grandChildAsRef/s...

Author: ltheussl
Date: Fri Mar 18 11:54:44 2011
New Revision: 1082877

URL: http://svn.apache.org/viewvc?rev=1082877&view=rev
Log:
add IT to check inherited menus, some things are still to fix

Added:
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/README
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/site.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/src/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/src/site/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/src/site/site.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/src/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/src/site/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/src/site/site.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/src/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/src/site/
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/src/site/site.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/README
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/README?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/README (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/README Fri Mar 18 11:54:44 2011
@@ -0,0 +1,7 @@
+
+The projects under parentNotAsRef/ and parentAsRef/ are identical
+except for the inheritAsRef parameter in the parent's site.xml.
+
+No tests are run for parentAsRef/, it is only built for comparison.
+
+See some FIXMEs in verify.bsh!
\ No newline at end of file

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties Fri Mar 18 11:54:44 2011
@@ -0,0 +1 @@
+invoker.maven.version = 3.0-

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>inheritAsRef</groupId>
+    <artifactId>childAsRef</artifactId>
+    <version>1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>grandChildAsRef</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Grand Child As Ref</name>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.3.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>scm</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+</project>

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/site.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/site.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Grand Child As Ref Site">
+
+  <body>
+
+    <menu name="Not Inherited">
+      <item name="Grand Child Relative Home Local" href="index.html" />
+      <item name="Grand Child Relative Home Local with dot" href="./index.html" />
+      <item name="Grand Child Absolute Home Local" href="http://example.com/childAsRef/grandChildAsRef/" />
+      <item name="Grand Child Absolute Home Local with index" href="http://example.com/childAsRef/grandChildAsRef/index.html" />
+    </menu>
+
+  </body>
+
+</project>
\ No newline at end of file

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>inheritAsRef</groupId>
+    <artifactId>parentAsRef</artifactId>
+    <version>1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>childAsRef</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Child As Ref</name>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.3.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>summary</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <modules>
+    <module>grandChildAsRef</module>
+  </modules>
+
+</project>

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/src/site/site.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/src/site/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/src/site/site.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Child As Ref Site">
+
+  <body>
+
+    <menu name="Not Inherited">
+      <item name="Child Relative Home Local" href="index.html" />
+      <item name="Child Relative Home Local with dot" href="./index.html" />
+      <item name="Child Absolute Home Local" href="http://example.com/childAsRef/" />
+      <item name="Child Absolute Home Local with index" href="http://example.com/childAsRef/index.html" />
+    </menu>
+
+  </body>
+
+</project>
\ No newline at end of file

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>inheritAsRef</groupId>
+  <artifactId>parentAsRef</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <name>Parent As Ref</name>
+  <url>http://example.com/</url>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>@project.version@</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.3.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <modules>
+    <module>childAsRef</module>
+  </modules>
+
+</project>

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/src/site/site.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/src/site/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/src/site/site.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Parent As Ref Site">
+
+  <body>
+
+    <menu name="Inherited" inherit="top">
+      <item name="Parent Relative Home Inherited" href="index.html" />
+      <item name="Parent Relative Home Inherited with dot" href="./index.html" />
+      <item name="Parent Absolute Home Inherited" href="http://example.com/" />
+      <item name="Parent Absolute Home Inherited with index" href="http://example.com/index.html" />
+    </menu>
+
+    <menu name="Not Inherited">
+      <item name="Parent Relative Home Local" href="index.html" />
+      <item name="Parent Relative Home Local with dot" href="./index.html" />
+      <item name="Parent Absolute Home Local" href="http://example.com/" />
+      <item name="Parent Absolute Home Local with index" href="http://example.com/index.html" />
+    </menu>
+
+    <!-- default inheritAsRef = false -->
+    <menu ref="parent" inherit="bottom" inheritAsRef="true" />
+    <menu ref="modules" inherit="bottom" inheritAsRef="true" />
+    <menu ref="reports" inherit="bottom" inheritAsRef="true" />
+
+  </body>
+
+</project>
\ No newline at end of file

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>inheritAsRef</groupId>
+    <artifactId>childNotAsRef</artifactId>
+    <version>1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>grandChildNotAsRef</artifactId>
+  <packaging>pom</packaging>
+
+  <name>GrandChild Not As Ref</name>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.3.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>scm</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+</project>

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Grand Child Not As Ref Site">
+
+  <body>
+
+    <menu name="Not Inherited">
+      <item name="Grand Child Relative Home Local" href="index.html" />
+      <item name="Grand Child Relative Home Local with dot" href="./index.html" />
+      <item name="Grand Child Absolute Home Local" href="http://example.com/childNotAsRef/grandChildNotAsRef/" />
+      <item name="Grand Child Absolute Home Local with index" href="http://example.com/childNotAsRef/grandChildNotAsRef/index.html" />
+    </menu>
+
+  </body>
+
+</project>
\ No newline at end of file

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>inheritAsRef</groupId>
+    <artifactId>parentNotAsRef</artifactId>
+    <version>1.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>childNotAsRef</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Child Not As Ref</name>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.3.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>summary</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <modules>
+    <module>grandChildNotAsRef</module>
+  </modules>
+
+</project>

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Child Not As Ref Site">
+
+  <body>
+
+    <menu name="Not Inherited">
+      <item name="Child Relative Home Local" href="index.html" />
+      <item name="Child Relative Home Local with dot" href="./index.html" />
+      <item name="Child Absolute Home Local" href="http://example.com/childNotAsRef/" />
+      <item name="Child Absolute Home Local with index" href="http://example.com/childNotAsRef/index.html" />
+    </menu>
+
+  </body>
+
+</project>
\ No newline at end of file

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>inheritAsRef</groupId>
+  <artifactId>parentNotAsRef</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <name>Parent Not As Ref</name>
+  <url>http://example.com/</url>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>@project.version@</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.3.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <modules>
+    <module>childNotAsRef</module>
+  </modules>
+
+</project>

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/src/site/site.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/src/site/site.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/src/site/site.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Parent Not As Ref Site">
+
+  <body>
+
+    <menu name="Inherited" inherit="top">
+      <item name="Parent Relative Home Inherited" href="index.html" />
+      <item name="Parent Relative Home Inherited with dot" href="./index.html" />
+      <item name="Parent Absolute Home Inherited" href="http://example.com/" />
+      <item name="Parent Absolute Home Inherited with index" href="http://example.com/index.html" />
+    </menu>
+
+    <menu name="Not Inherited">
+      <item name="Parent Relative Home Local" href="index.html" />
+      <item name="Parent Relative Home Local with dot" href="./index.html" />
+      <item name="Parent Absolute Home Local" href="http://example.com/" />
+      <item name="Parent Absolute Home Local with index" href="http://example.com/index.html" />
+    </menu>
+
+    <!-- default inheritAsRef = false -->
+    <menu ref="parent" inherit="bottom" />
+    <menu ref="modules" inherit="bottom" />
+    <menu ref="reports" inherit="bottom" />
+
+  </body>
+
+</project>
\ No newline at end of file

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/pom.xml?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/pom.xml Fri Mar 18 11:54:44 2011
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>inheritAsRef</groupId>
+  <artifactId>aggregator</artifactId>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+
+  <name>Aggregator</name>
+  <url>http://example.com/junk/</url>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>@project.version@</version>
+          <configuration>
+            <generateReports>false</generateReports>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <modules>
+    <module>parentAsRef</module>
+    <module>parentNotAsRef</module>
+  </modules>
+
+</project>

Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh?rev=1082877&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh Fri Mar 18 11:54:44 2011
@@ -0,0 +1,227 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+import java.io.*;
+import org.codehaus.plexus.util.*;
+
+boolean result = true;
+
+try
+{
+    File parentDirectory = new File ( basedir, "parentNotAsRef" );
+    if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
+    {
+        System.err.println( "parent is missing or not a directory." );
+        result = false;
+    }
+
+    File parentSiteDirectory = new File ( parentDirectory, "target/site" );
+    if ( !parentSiteDirectory.exists() || !parentSiteDirectory.isDirectory() )
+    {
+        System.err.println( "parent site is missing or not a directory." );
+        result = false;
+    }
+
+    File parentIndex = new File ( parentSiteDirectory, "index.html" );
+    if ( !parentIndex.exists() || parentIndex.isDirectory() )
+    {
+        System.err.println( "no index file in parent or is a directory." );
+        result = false;
+    }
+
+    String content = IOUtil.toString ( new FileInputStream ( parentIndex ), "UTF-8" );
+    int index1 = content.indexOf( "<strong>Parent Relative Home Inherited</strong>" );
+    int index2 = content.indexOf( "<strong>Parent Relative Home Inherited with dot</strong>" );
+    // FIXME! this doesn't work
+    int index3 = content.indexOf( "<strong>Parent Absolute Home Inherited</strong>" );
+    int index4 = content.indexOf( "<strong>Parent Absolute Home Inherited with index</strong>" );
+
+    if ( index1 < 0 || index2 < 0 || index4 < 0 )
+    {
+        System.err.println( "parent index.html has wrong inherited menu items!" );
+        result = false;
+    }
+
+    index1 = content.indexOf( "<strong>Parent Relative Home Local</strong>" );
+    index2 = content.indexOf( "<strong>Parent Relative Home Local with dot</strong>" );
+    // FIXME! this doesn't work
+    index3 = content.indexOf( "<strong>Parent Absolute Home Local</strong>" );
+    index4 = content.indexOf( "<strong>Parent Absolute Home Local with index</strong>" );
+
+    if ( index1 < 0 || index2 < 0 || index4 < 0 )
+    {
+        System.err.println( "parent index.html has wrong local menu items!" );
+        result = false;
+    }
+
+    index1 = content.indexOf( "<a href=\"childNotAsRef/index.html\" title=\"Child Not As Ref\">Child Not As Ref</a>" );
+    index2 = content.indexOf( "<a href=\"project-info.html\" title=\"Project Information\">Project Information</a>" );
+    index3 = content.indexOf( "<h5>Parent Project</h5>" );
+
+    if ( index1 < 0 || index2 < 0 || index3 >= 0 )
+    {
+        System.err.println( "parent index.html has wrong reference menu items!" );
+        result = false;
+    }
+
+
+    // CHILD
+
+
+    File childDirectory = new File ( parentDirectory, "childNotAsRef" );
+    if ( !childDirectory.exists() || !childDirectory.isDirectory() )
+    {
+        System.err.println( "child is missing or not a directory." );
+        result = false;
+    }
+
+    File childSiteDirectory = new File ( childDirectory, "target/site" );
+    if ( !childSiteDirectory.exists() || !childSiteDirectory.isDirectory() )
+    {
+        System.err.println( "child site is missing or not a directory." );
+        result = false;
+    }
+
+    File childIndex = new File ( childSiteDirectory, "index.html" );
+    if ( !childIndex.exists() || childIndex.isDirectory() )
+    {
+        System.err.println( "no index file in child or is a directory." );
+        result = false;
+    }
+
+    content = IOUtil.toString ( new FileInputStream ( childIndex ), "UTF-8" );
+    // FIXME! this doesn't work
+    index1 = content.indexOf( "<a href=\"../\" title=\"Parent Relative Home Inherited\">Parent Relative Home Inherited</a>" );
+    // FIXME! this doesn't work
+    index2 = content.indexOf( "<a href=\"../\" title=\"Parent Relative Home Inherited with dot\">Parent Relative Home Inherited with dot</a>" );
+    index3 = content.indexOf( "<a href=\"../\" title=\"Parent Absolute Home Inherited\">Parent Absolute Home Inherited</a>" );
+    index4 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Absolute Home Inherited with index\">Parent Absolute Home Inherited with index</a>" );
+
+    if ( index3 < 0 || index4 < 0 )
+    {
+        System.err.println( "child index.html has wrong menu items in inherited menu!" );
+        result = false;
+    }
+
+    index1 = content.indexOf( "<strong>Child Relative Home Local</strong>" );
+    index2 = content.indexOf( "<strong>Child Relative Home Local with dot</strong>" );
+    // FIXME! this doesn't work
+    index3 = content.indexOf( "<strong>Child Absolute Home Local</strong>" );
+    index4 = content.indexOf( "<strong>Child Absolute Home Local with index</strong>" );
+
+    if ( index1 < 0 || index2 < 0 || index4 < 0 )
+    {
+        System.err.println( "child index.html has wrong menu items in local menu!" );
+        result = false;
+    }
+
+    index1 = content.indexOf( "<a href=\"grandChildNotAsRef/index.html\" title=\"GrandChild Not As Ref\">GrandChild Not As Ref</a>" );
+    index2 = content.indexOf( "<a href=\"project-summary.html\" title=\"Project Summary\">Project Summary</a>" );
+    index3 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Not As Ref\">Parent Not As Ref</a>" );
+
+    if ( index1 < 0 || index2 < 0 || index3 < 0 )
+    {
+        System.err.println( "child index.html has wrong reference menu items!" );
+        result = false;
+    }
+
+    File childSummary = new File ( childSiteDirectory, "project-summary.html" );
+    if ( !childSummary.exists() || childSummary.isDirectory() )
+    {
+        System.err.println( "no summary file in child or is a directory." );
+        result = false;
+    }
+
+
+    // GRANDCHILD
+
+
+    File grandChildDirectory = new File ( childDirectory, "grandChildNotAsRef" );
+    if ( !grandChildDirectory.exists() || !grandChildDirectory.isDirectory() )
+    {
+        System.err.println( "grandchild is missing or not a directory." );
+        result = false;
+    }
+
+    File grandChildSiteDirectory = new File ( grandChildDirectory, "target/site" );
+    if ( !grandChildSiteDirectory.exists() || !grandChildSiteDirectory.isDirectory() )
+    {
+        System.err.println( "grandchild site is missing or not a directory." );
+        result = false;
+    }
+
+    File grandChildIndex = new File ( grandChildSiteDirectory, "index.html" );
+    if ( !grandChildIndex.exists() || grandChildIndex.isDirectory() )
+    {
+        System.err.println( "no index file in grandchild or is a directory." );
+        result = false;
+    }
+
+    content = IOUtil.toString ( new FileInputStream ( grandChildIndex ), "UTF-8" );
+    // FIXME! this doesn't work
+    index1 = content.indexOf( "<a href=\"../\" title=\"Parent Relative Home Inherited\">Parent Relative Home Inherited</a>" );
+    // FIXME! this doesn't work
+    index2 = content.indexOf( "<a href=\"../\" title=\"Parent Relative Home Inherited with dot\">Parent Relative Home Inherited with dot</a>" );
+    index3 = content.indexOf( "<a href=\"../../\" title=\"Parent Absolute Home Inherited\">Parent Absolute Home Inherited</a>" );
+    index4 = content.indexOf( "<a href=\"../../index.html\" title=\"Parent Absolute Home Inherited with index\">Parent Absolute Home Inherited with index</a>" );
+
+    if ( index3 < 0 || index4 < 0 )
+    {
+        System.err.println( "grandchild index.html has wrong menu items in inherited menu!" );
+        result = false;
+    }
+
+    index1 = content.indexOf( "<strong>Grand Child Relative Home Local</strong>" );
+    index2 = content.indexOf( "<strong>Grand Child Relative Home Local with dot</strong>" );
+    // FIXME! this doesn't work
+    index3 = content.indexOf( "<strong>Grand Child Absolute Home Local</strong>" );
+    index4 = content.indexOf( "<strong>Grand Child Absolute Home Local with index</strong>" );
+
+    if ( index1 < 0 || index2 < 0 || index4 < 0 )
+    {
+        System.err.println( "grandchild index.html has wrong menu items in local menu!" );
+        result = false;
+    }
+
+    index1 = content.indexOf( "<a href=\"../index.html\" title=\"Child Not As Ref\">Child Not As Ref</a>" );
+    index2 = content.indexOf( "<a href=\"source-repository.html\" title=\"Source Repository\">Source Repository</a>" );
+    index3 = content.indexOf( "<h5>Modules</h5>" );
+
+    if ( index1 < 0 || index2 < 0 || index3 >= 0 )
+    {
+        System.err.println( "grandchild index.html has wrong reference menu items!" );
+        result = false;
+    }
+
+    File grandChildScm = new File ( grandChildSiteDirectory, "source-repository.html" );
+    if ( !grandChildScm.exists() || grandChildScm.isDirectory() )
+    {
+        System.err.println( "no source-repository file in grandchild or is a directory." );
+        result = false;
+    }
+
+}
+catch( IOException e )
+{
+    e.printStackTrace();
+    result = false;
+}
+
+return result;