Author: ltheussl
Date: Sat Mar 19 22:32:40 2011
New Revision: 1083317
URL: http://svn.apache.org/viewvc?rev=1083317&view=rev
Log:
merge r1083251 from trunk
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/README
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 19 22:32:40 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,1082877,1083147
+/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,1083251
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh?rev=1083317&r1=1083316&r2=1083317&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh
Sat Mar 19 22:32:40 2011
@@ -40,7 +40,7 @@ try
}
String content = IOUtil.toString ( new FileInputStream ( parentIndex ),
"UTF-8" );
- int index1 = content.indexOf( "<a href=\"\" title=\"Parent\">Parent</a>" );
+ int index1 = content.indexOf( "<a href=\"./\" title=\"Parent\">Parent</a>"
);
int index2 = content.indexOf( "<a href=\"inherited/parent\"
title=\"parent\">parent</a>" );
int index3 = content.indexOf( "<a href=\"inherited/${childprop}\"
title=\"${childprop}\">${childprop}</a>" );
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/README
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/README?rev=1083317&r1=1083316&r2=1083317&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/README
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/README
Sat Mar 19 22:32:40 2011
@@ -3,5 +3,3 @@ The projects under parentNotAsRef/ and p
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
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh?rev=1083317&r1=1083316&r2=1083317&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh
Sat Mar 19 22:32:40 2011
@@ -49,11 +49,10 @@ try
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 index3 = content.indexOf( "<a href=\"./\" title=\"Parent Absolute Home
Inherited\">Parent Absolute Home Inherited</a>" );
int index4 = content.indexOf( "<strong>Parent Absolute Home Inherited with
index</strong>" );
- if ( index1 < 0 || index2 < 0 || index4 < 0 )
+ if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "parent index.html has wrong inherited menu
items!" );
result = false;
@@ -61,8 +60,7 @@ try
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>" );
+ index3 = content.indexOf( "<a href=\"./\" title=\"Parent Absolute Home
Local\">Parent Absolute Home Local</a>" );
index4 = content.indexOf( "<strong>Parent Absolute Home Local with
index</strong>" );
if ( index1 < 0 || index2 < 0 || index4 < 0 )
@@ -120,11 +118,10 @@ try
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>" );
+ index3 = content.indexOf( "<a href=\"./\" title=\"Child Absolute Home
Local\">Child Absolute Home Local</a>" );
index4 = content.indexOf( "<strong>Child Absolute Home Local with
index</strong>" );
- if ( index1 < 0 || index2 < 0 || index4 < 0 )
+ if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "child index.html has wrong menu items in local
menu!" );
result = false;
@@ -186,11 +183,10 @@ try
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>" );
+ index3 = content.indexOf( "<a href=\"./\" title=\"Grand Child Absolute
Home Local\">Grand Child Absolute Home Local</a>" );
index4 = content.indexOf( "<strong>Grand Child Absolute Home Local with
index</strong>" );
- if ( index1 < 0 || index2 < 0 || index4 < 0 )
+ if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "grandchild index.html has wrong menu items in
local menu!" );
result = false;
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh?rev=1083317&r1=1083316&r2=1083317&view=diff
==============================================================================
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh
Sat Mar 19 22:32:40 2011
@@ -78,7 +78,7 @@ try
int index1 = content.indexOf( "<a
href=\"www/website/deep/down/below/index.html\" title=\"Child and
Module\">Child and Module</a>" );
int index2 = content.indexOf( "<a href=\"inheriting_child/index.html\"
title=\"Inheriting Child\">Inheriting Child</a>" );
int index3 = content.indexOf( "<a href=\"www/website/module/index.html\"
title=\"Module\">Module</a>" );
- int index4 = content.indexOf( "<a href=\"\"
title=\"Aggregator\">Aggregator</a>" );
+ int index4 = content.indexOf( "<a href=\"./\"
title=\"Aggregator\">Aggregator</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "deploy index.html is missing module link!" );
@@ -256,7 +256,7 @@ try
int index1 = content.indexOf( "<a
href=\"www/website/deep/down/below/index.html\" title=\"Child and
Module\">Child and Module</a>" );
int index2 = content.indexOf( "<a href=\"inheriting_child/index.html\"
title=\"Inheriting Child\">Inheriting Child</a>" );
int index3 = content.indexOf( "<a href=\"www/website/module/index.html\"
title=\"Module\">Module</a>" );
- int index4 = content.indexOf( "<a href=\"\"
title=\"Aggregator\">Aggregator</a>" );
+ int index4 = content.indexOf( "<a href=\"./\"
title=\"Aggregator\">Aggregator</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "staged index.html is missing module link!" );
@@ -433,7 +433,7 @@ try
int index1 = content.indexOf( "<a
href=\"www/website/deep/down/below/index.html\" title=\"Child and
Module\">Child and Module</a>" );
int index2 = content.indexOf( "<a href=\"inheriting_child/index.html\"
title=\"Inheriting Child\">Inheriting Child</a>" );
int index3 = content.indexOf( "<a href=\"www/website/module/index.html\"
title=\"Module\">Module</a>" );
- int index4 = content.indexOf( "<a href=\"\"
title=\"Aggregator\">Aggregator</a>" );
+ int index4 = content.indexOf( "<a href=\"./\"
title=\"Aggregator\">Aggregator</a>" );
if ( index1 < 0 || index2 < 0 || index3 < 0 || index4 < 0 )
{
System.err.println( "stage-deployed index.html is missing module
link!" );
