dion 2003/08/17 21:38:52
Modified: src/plugins-build/xdoc Tag: MAVEN_RC1_STABLE plugin.jelly
Log:
Fix bug where top level xdocs were using the peer-level navigation.xml rather
than one that is in generated-docs.
This fixes a bug in the multiproject plugin where xdocs/navigation.xml wasn't being
processed
as a template.
Revision Changes Path
No revision
No revision
1.38.2.2 +6 -1 maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -u -r1.38.2.1 -r1.38.2.2
--- plugin.jelly 7 Aug 2003 17:00:54 -0000 1.38.2.1
+++ plugin.jelly 18 Aug 2003 04:38:52 -0000 1.38.2.2
@@ -282,6 +282,8 @@
<util:available file="${maven.gen.docs}/navigation.xml">
<util:file var="siteNavFile" name="${maven.gen.docs}/navigation.xml"/>
</util:available>
+ <!-- hold onto maven.docs.src for later -->
+ <util:file var="docsSrcFile" name="${maven.docs.src}"/>
<!-- parse the project nav. Someone jellier than me can remove the temp file
requirement -->
<j:set var="reports"
@@ -316,7 +318,10 @@
<!-- if no such nav file available use sitewide nav file -->
<j:set var="navFile" value="${siteNavFile}" />
<util:available file="${file.parentFile.absoluteFile}/navigation.xml">
- <util:file var="navFile"
name="${file.parentFile.absoluteFile}/navigation.xml"/>
+ <!-- dont use current directory navigation.xml if it's in maven.docs.src
-->
+ <j:if test="${!(file.parentFile.equals(docsSrcFile))}">
+ <util:file var="navFile"
name="${file.parentFile.absoluteFile}/navigation.xml"/>
+ </j:if>
</util:available>
<!-- parse nav and make it available to the stylesheet -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
