svn commit: r329665 - /maven/maven-1/plugins/trunk/xdoc/plugin.jelly

[lt...@apache.org]

Author: ltheussl
Date: Sun Oct 30 15:01:05 2005
New Revision: 329665

URL: http://svn.apache.org/viewcvs?rev=329665&view=rev
Log:
Sitemap was always generated because the navigation file was not parsed yet

Modified:
    maven/maven-1/plugins/trunk/xdoc/plugin.jelly

Modified: maven/maven-1/plugins/trunk/xdoc/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/plugin.jelly?rev=329665&r1=329664&r2=329665&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/xdoc/plugin.jelly Sun Oct 30 15:01:05 2005
@@ -720,8 +720,15 @@
     </j:forEach>
 
     <!-- Generate sitemap -->
-    <j:if test="${!nav.sitemap.isEmpty()}">
-        <attainGoal name="xdoc:sitemap-noinit"/>
+    <util:available file="${maven.docs.src}/${maven.xdoc.navigation.file}">
+      <util:file var="siteNavFile" name="${maven.docs.src}/${maven.xdoc.navigation.file}"/>
+    </util:available>
+    <j:set var="navFile" value="${siteNavFile}" />
+    <j:if test="${navFile != null}">
+      <x:parse var="navXML" xml="${navFile}"/>
+      <x:if select="$navXML/project/body/sitemap">
+          <attainGoal name="xdoc:sitemap-noinit"/>
+      </x:if>
     </j:if>
 
     <!-- Copy all generated files in an internationalize site structure, ie: