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/05 23:16:57 UTC
svn commit: r1078373 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/main/java/org/apache/maven/plugins/site/SiteMap.java
Author: ltheussl
Date: Sat Mar 5 22:16:56 2011
New Revision: 1078373
URL: http://svn.apache.org/viewvc?rev=1078373&view=rev
Log:
merge r1055089 from trunk
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 5 22:16:56 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,1049020,1051139-1051449,1055019,1055033,1055047
+/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,1049020,1051139-1051449,1055019,1055033,1055047,1055089
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java?rev=1078373&r1=1078372&r2=1078373&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMap.java Sat Mar 5 22:16:56 2011
@@ -157,7 +157,7 @@ public class SiteMap
sink.body_();
}
- private void extractItems( List<MenuItem> items, Sink sink )
+ private static void extractItems( List<MenuItem> items, Sink sink )
{
if ( items == null || items.isEmpty() )
{
@@ -169,7 +169,7 @@ public class SiteMap
for ( MenuItem item : items )
{
sink.listItem();
- sink.link( item.getHref() );
+ sink.link( relativePath( item.getHref() ) );
sink.text( item.getName() );
sink.link_();
extractItems( item.getItems(), sink );
@@ -178,4 +178,10 @@ public class SiteMap
sink.list_();
}
+
+ // sitemap.html gets generated into top-level so we only have to check leading slashes
+ private static String relativePath( String href )
+ {
+ return href.startsWith( "/" ) ? "." + href : href;
+ }
}