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/19 23:30:19 UTC
svn commit: r1083316 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/it/inheritedMenus/ src/it/inheritedMenus/parentAsRef/
src/it/inheritedMenus/parentAsRef/childAsRef/
src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/ src/it/inh...
Author: ltheussl
Date: Sat Mar 19 22:30:17 2011
New Revision: 1083316
URL: http://svn.apache.org/viewvc?rev=1083316&view=rev
Log:
add IT from trunk
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/README
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/README
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/invoker.properties
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/childAsRef/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/site.xml
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/grandChildAsRef/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/childAsRef/src/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/childAsRef/src/site/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/childAsRef/src/site/site.xml
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/childAsRef/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/pom.xml
- copied, changed from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/src/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/src/site/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/src/site/site.xml
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/grandChildNotAsRef/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/childNotAsRef/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/pom.xml
- copied, changed from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/src/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/src/site/
- copied from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/src/site/site.xml
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/pom.xml
- copied unchanged from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh
- copied, changed from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 19 22:30:17 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/pom.xml (from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/pom.xml?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/pom.xml&p1=maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml&r1=1082877&r2=1083316&rev=1083316&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentAsRef/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentAsRef/pom.xml Sat Mar 19 22:30:17 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>
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/pom.xml (from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/pom.xml?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/pom.xml&p1=maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml&r1=1082877&r2=1083316&rev=1083316&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/parentNotAsRef/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/parentNotAsRef/pom.xml Sat Mar 19 22:30:17 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>
Copied: maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh (from r1082877, maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh)
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh?p2=maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh&p1=maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh&r1=1082877&r2=1083316&rev=1083316&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh Sat Mar 19 22:30:17 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;