From f6e68cc8137f87a63d4646b276e47d2218bcd9a3 Mon Sep 17 00:00:00 2001
From: bwalding <bwalding@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 23 Jul 2003 10:06:41 +0000
Subject: [PATCH] Pass 1. o It works, but is incomplete and broken.  I am
 committing now as I have very bad non-deterministic behaviour with jelly and
 I like committing as I go.

o Need to convert project documentation tree to navigation.jsl
o Need to remove temporary file creation in plugin.jsl

PR: MAVEN-602


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113687 13f79535-47bb-0310-9956-ffa450edef68
---
 xdoc/plugin.jelly                        | 17 +++++++++++++-
 xdoc/src/plugin-resources/navigation.jsl | 29 ++++++++++++++++++++++++
 xdoc/src/plugin-resources/site.jsl       |  2 ++
 xdoc/src/test/project.properties         |  2 +-
 xdoc/src/test/project.xml                |  4 +---
 5 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 xdoc/src/plugin-resources/navigation.jsl
diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index f1c6d9b6..d464d6b6 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -315,7 +315,22 @@
         <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}"/>
+		<echo>HASHISH ${size(projectNavRoot)} - ${projectNavRoot.getClass().getName()}</echo>
+                
+        <x:set var="projectNav" select="$projectNavRoot/project"/>
+        
+        
         <j:file name="${outFile}" encoding="${outputencoding}"
           omitXmlDeclaration="true" outputMode="xml"
           prettyPrint="no">
diff --git a/xdoc/src/plugin-resources/navigation.jsl b/xdoc/src/plugin-resources/navigation.jsl
new file mode 100644
index 00000000..a4974eac
--- /dev/null
+++ b/xdoc/src/plugin-resources/navigation.jsl
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- stylesheet to be used -->
+<jsl:stylesheet select="$doc"
+  xmlns:define="jelly:define"
+  xmlns:j="jelly:core"
+  xmlns:jsl="jelly:jsl"
+  xmlns:log="jelly:log"
+  xmlns:util="jelly:util"
+  xmlns:x="jelly:xml"
+  xmlns:doc="doc"
+  xmlns="dummy" trim="true">
+  
+  
+  <jsl:template match="document" trim="false">
+    <project>
+      <body>
+        <j:if test="${includeProjectDocumentation.equals('yes')}">
+          <menu name="Project Documentation">
+            <item name="About ${pom.name}" href="/index.html"/>   
+          </menu>
+        </j:if>
+      </body>
+    </project>
+  </jsl:template>
+  
+  <!-- absorb any other elements -->
+  <jsl:template match="*" trim="false"></jsl:template>
+
+</jsl:stylesheet>
\ No newline at end of file
diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 350f40a0..f04b0fbd 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -165,6 +165,8 @@
                 <x:if select="$nav">
                   <jsl:applyTemplates select="$nav/body/menu[not(@type) | @type='header'] | $nav/body/search"/>
                 </x:if>
+
+				<jsl:applyTemplates select="$projectNav/body/menu"/>
                 
                 <!-- Standard Maven Navigation -->
                 <j:set var="fileName">${file}</j:set>
diff --git a/xdoc/src/test/project.properties b/xdoc/src/test/project.properties
index 7a3a9b99..3df8ad6b 100644
--- a/xdoc/src/test/project.properties
+++ b/xdoc/src/test/project.properties
@@ -1,2 +1,2 @@
 maven.xdoc.date=left
-maven.xdoc.includeProjectDocumentation=false
\ No newline at end of file
+mxaven.xdoc.includeProjectDocumentation=false
\ No newline at end of file
diff --git a/xdoc/src/test/project.xml b/xdoc/src/test/project.xml
index 61681fa6..b76609a5 100644
--- a/xdoc/src/test/project.xml
+++ b/xdoc/src/test/project.xml
@@ -8,11 +8,9 @@
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://jakarta.apache.org/</url>
-    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
   <inceptionYear>2001</inceptionYear>
-  <logo>http://maven.apache.org/images/maven.jpg</logo>
-
+  
 
 </project>
 
