Author: ltheussl
Date: Tue Jan  4 16:30:31 2011
New Revision: 1055089

URL: http://svn.apache.org/viewvc?rev=1055089&view=rev
Log:
[MSITE-510] Sitemap generates wrong links to project overview pages

Modified:
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java?rev=1055089&r1=1055088&r2=1055089&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java
 Tue Jan  4 16:30:31 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;
+    }
 }


Reply via email to