From 56b8d4cba0dee9847ae75c8904ed0760e754898e Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 24 Jul 2003 06:26:44 +0000
Subject: [PATCH] Generate nav template in a different way

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113691 13f79535-47bb-0310-9956-ffa450edef68
---
 xdoc/plugin.jelly | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index a2253d0c..39a8fb5d 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -283,6 +283,19 @@
         <util:file var="siteNavFile" name="${maven.gen.docs}/navigation.xml"/> 
       </util:available> 
 
+      <!-- parse the project nav. Someone jellier than me can remove the temp file requirement -->
+      <j:set var="reports"
+        value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+
+      <util:file var="tempnav" name="${maven.build.dir}/project-nav.xml"/>
+    
+      <j:file name="${tempnav.toString()}" outputMode="xml">
+        <j:import file="${plugin.resources}/navigation.jelly" inherit="true"/>    
+      </j:file>
+  
+      <x:parse var="projectNavRoot" xml="${tempnav}"/>
+      <x:set var="projectNav" select="$projectNavRoot/project"/>
+
       <j:forEach var="file" items="${docFiles.iterator()}">
 
         <util:replace var="inDirForward" oldChar="\" newChar="/" value="${file.parent}"/>
@@ -306,29 +319,12 @@
           <util:file var="navFile" name="${file.parentFile.absoluteFile}/navigation.xml"/>
         </util:available>
 
-        <j:set 
-          var="reports"
-          value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
-
         <!-- parse nav and make it available to the stylesheet -->
         <x:parse var="navXML" xml="${navFile}"/>
         <x:set var="nav" select="$navXML/project"/>
         <!-- parse the doc and pass it to the stylesheet -->
         <x:parse var="doc" xml="${file}"/>
         
-        
-        <!-- parse the project nav. Someone jellier than me can remove the temp file requirement -->
-		<util:file var="tempnav" name="${basedir}/target/pnav.xml"/>
-		
-		<j:set var="navigationJSL" value="${resourceTool.findResource('plugin-resources/navigation.jsl')}"/>
-		<j:file name="${tempnav.toString()}" outputMode="xml">
-			<j:include uri="${navigationJSL.toString()}"/>		
-		</j:file>
-	
-		<x:parse var="projectNavRoot" xml="${tempnav}"/>
-		<x:set var="projectNav" select="$projectNavRoot/project"/>
-        
-        
         <j:file name="${outFile}" encoding="${outputencoding}"
           omitXmlDeclaration="true" outputMode="xml"
           prettyPrint="no">