Author: ltheussl
Date: Thu Mar 24 09:05:08 2011
New Revision: 1084883
URL: http://svn.apache.org/viewvc?rev=1084883&view=rev
Log:
merge some changes from trunk to fix IT
Modified:
maven/plugins/branches/MSITE-560/pom.xml
maven/plugins/branches/MSITE-560/src/it/MSITE-312/child/pom.xml
maven/plugins/branches/MSITE-560/src/it/MSITE-312/verify.bsh
Modified: maven/plugins/branches/MSITE-560/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MSITE-560/pom.xml?rev=1084883&r1=1084882&r2=1084883&view=diff
==============================================================================
--- maven/plugins/branches/MSITE-560/pom.xml (original)
+++ maven/plugins/branches/MSITE-560/pom.xml Thu Mar 24 09:05:08 2011
@@ -179,7 +179,7 @@ under the License.
<properties>
<doxiaVersion>1.1.4</doxiaVersion>
- <doxiaSitetoolsVersion>1.1.4</doxiaSitetoolsVersion>
+ <doxiaSitetoolsVersion>1.1.5-SNAPSHOT</doxiaSitetoolsVersion>
<mavenVersion>3.0</mavenVersion>
<wagonVersion>1.0-beta-6</wagonVersion>
<plexusVersion>1.5.4</plexusVersion>
Modified: maven/plugins/branches/MSITE-560/src/it/MSITE-312/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MSITE-560/src/it/MSITE-312/child/pom.xml?rev=1084883&r1=1084882&r2=1084883&view=diff
==============================================================================
--- maven/plugins/branches/MSITE-560/src/it/MSITE-312/child/pom.xml (original)
+++ maven/plugins/branches/MSITE-560/src/it/MSITE-312/child/pom.xml Thu Mar 24
09:05:08 2011
@@ -12,9 +12,6 @@
<artifactId>child</artifactId>
<name>Child</name>
- <!-- necessary even though it's equivalent to the default value
- because m2 does not append the slash in the end, which makes the
relative links go boing -->
- <url>http://example.com/parent/child/</url>
<properties>
<childprop>child</childprop>
Modified: maven/plugins/branches/MSITE-560/src/it/MSITE-312/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MSITE-560/src/it/MSITE-312/verify.bsh?rev=1084883&r1=1084882&r2=1084883&view=diff
==============================================================================
--- maven/plugins/branches/MSITE-560/src/it/MSITE-312/verify.bsh (original)
+++ maven/plugins/branches/MSITE-560/src/it/MSITE-312/verify.bsh Thu Mar 24
09:05:08 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>" );
@@ -75,7 +75,7 @@ try
return false;
}
- index1 = content.indexOf( "<a href=\"\" title=\"Child\">Child</a>" );
+ index1 = content.indexOf( "<a href=\"./\" title=\"Child\">Child</a>" );
index2 = content.indexOf( "<a href=\"local/parent\"
title=\"parent\">parent</a>" );
index3 = content.indexOf( "<a href=\"local/child\"
title=\"child\">child</a>" );
