Author: ltheussl
Date: Sat Jan 1 15:45:40 2011
New Revision: 1054247
URL: http://svn.apache.org/viewvc?rev=1054247&view=rev
Log:
make sure auto-generated breadcrumbs have proper relative hrefs
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=1054247&r1=1054246&r2=1054247&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
Sat Jan 1 15:45:40 2011
@@ -209,7 +209,7 @@ public class DefaultDecorationModelInher
{
LinkItem breadcrumb = new LinkItem();
breadcrumb.setName( name );
- breadcrumb.setHref( urlContainer.getNewPath() );
+ breadcrumb.setHref( convertPath( urlContainer.getNewPath(),
urlContainer ) );
cBody.getBreadcrumbs().add( breadcrumb );
}
cBody.setBreadcrumbs( mergeLinkItemLists( cBody.getBreadcrumbs(),
pBody.getBreadcrumbs(), urlContainer ) );
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml?rev=1054247&r1=1054246&r2=1054247&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
Sat Jan 1 15:45:40 2011
@@ -47,7 +47,7 @@ under the License.
<item name="Apache" href="http://www.apache.org/"/>
<item name="Jakarta Commons" href="http://jakarta.apache.org/commons/"/>
<item name="Sandbox" href="http://jakarta.apache.org/commons/sandbox/"/>
- <item name="Name" href="http://maven.apache.org/doxia"/>
+ <item name="Name" href=""/>
</breadcrumbs>
<menu name="Top Menu" inherit="top">
