On Thu, Jan 16, 2003 at 01:51:10PM +1100, [EMAIL PROTECTED] wrote:
> Incze,
> 
> what is the correct ordering for the navigation.xml files in your opinion? 
> The patch you provide puts the subdir nav files as overriding generated 
> ones. Is that what you want?
> 

I think that if somebody uses a single igenerated sitewide navigation.xml file
the he/she won't have navigation files in the source tree. As I see
this sequence has the only purpose to find a navigation file if the current
directory don't have one. So, I think, the hand edited in-place navigation
file should have allways priority over the generated (the same way as if
I put a navigation.xml into a subdir, it will be applied over the root
navigation file.) If someone uses generated navigation then should
purge out all the nav files from the xdocs source tree.

My earlier patch was partial, as one of the availability lookups is superfluos:

util:available file="${maven.docs.src}/navigation.xml is the same as
util:available file="${file.parentFile.absoluteFile}/navigation.xml when
the current dir is maven.docs.src.

Has this all sense?

incze
--- src/plugins-build/xdoc/plugin.jelly.old     2003-01-16 05:17:11.000000000 +0100
+++ src/plugins-build/xdoc/plugin.jelly 2003-01-16 05:34:42.000000000 +0100
@@ -151,9 +151,6 @@
         <util:available file="${maven.docs.src}/project.xml">
           <util:file var="navFile" name="${maven.docs.src}/project.xml"/>
         </util:available>
-        <util:available file="${maven.docs.src}/navigation.xml">
-          <util:file var="navFile" name="${maven.docs.src}/navigation.xml"/>
-        </util:available>
         <util:available file="${maven.gen.docs}/navigation.xml"> 
           <util:file var="navFile" name="${maven.gen.docs}/navigation.xml"/> 
         </util:available> 

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to