Author: ltheussl
Date: Sat Mar 19 08:01:40 2011
New Revision: 1083147
URL: http://svn.apache.org/viewvc?rev=1083147&view=rev
Log:
[MSITE-568] add missing distMgmnt, that fixes it
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh
Modified:
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=1083147&r1=1083146&r2=1083147&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml
Sat Mar 19 08:01:40 2011
@@ -10,6 +10,15 @@
<name>Parent As Ref</name>
<url>http://example.com/</url>
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <name>Example web site</name>
+ <!-- needed for relative link resolution -->
+ <url>file://@project.build.directory@/it/inheritedMenus/deploy/</url>
+ </site>
+ </distributionManagement>
+
<build>
<pluginManagement>
<plugins>
Modified:
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=1083147&r1=1083146&r2=1083147&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml
Sat Mar 19 08:01:40 2011
@@ -10,6 +10,15 @@
<name>Parent Not As Ref</name>
<url>http://example.com/</url>
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <name>Example web site</name>
+ <!-- needed for relative link resolution -->
+ <url>file://@project.build.directory@/it/inheritedMenus/deploy/</url>
+ </site>
+ </distributionManagement>
+
<build>
<pluginManagement>
<plugins>
Modified: 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=1083147&r1=1083146&r2=1083147&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh Sat
Mar 19 08:01:40 2011
@@ -107,14 +107,12 @@ try
}
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>" );
+ index1 = content.indexOf( "<a href=\"../index.html\" title=\"Parent
Relative Home Inherited\">Parent Relative Home Inherited</a>" );
+ index2 = content.indexOf( "<a href=\"../index.html\" 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 )
+ if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "child index.html has wrong menu items in
inherited menu!" );
result = false;
@@ -175,14 +173,12 @@ try
}
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>" );
+ index1 = content.indexOf( "<a href=\"../../index.html\" title=\"Parent
Relative Home Inherited\">Parent Relative Home Inherited</a>" );
+ index2 = content.indexOf( "<a href=\"../../index.html\" 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 )
+ if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "grandchild index.html has wrong menu items in
inherited menu!" );
result = false;
