dion 2003/07/23 23:26:44
Modified: src/plugins-build/xdoc plugin.jelly
Log:
Generate nav template in a different way
Revision Changes Path
1.37 +13 -17 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- plugin.jelly 23 Jul 2003 10:25:17 -0000 1.36
+++ plugin.jelly 24 Jul 2003 06:26:44 -0000 1.37
@@ -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,28 +319,11 @@
<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"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
