You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by lt...@apache.org on 2005/09/10 01:48:42 UTC
svn commit: r279918 - in /maven/maven-1/plugins/trunk/xdoc: plugin.jelly
plugin.properties xdocs/changes.xml xdocs/properties.xml
Author: ltheussl
Date: Fri Sep 9 16:48:39 2005
New Revision: 279918
URL: http://svn.apache.org/viewcvs?rev=279918&view=rev
Log:
MPXDOC-144 : Add a property to override navigation.xml
Modified:
maven/maven-1/plugins/trunk/xdoc/plugin.jelly
maven/maven-1/plugins/trunk/xdoc/plugin.properties
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
maven/maven-1/plugins/trunk/xdoc/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/xdoc/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/plugin.jelly?rev=279918&r1=279917&r2=279918&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/xdoc/plugin.jelly Fri Sep 9 16:48:39 2005
@@ -370,7 +370,7 @@
<patternset>
<exclude name="**/project.xml"/>
<exclude name="**/template.xml"/>
- <exclude name="**/navigation.xml"/>
+ <exclude name="**/${maven.xdoc.navigation.file}"/>
<exclude name="changes.xml"/>
<exclude name="**/*.properties"/>
<j:if test="${maven_xdoc_xml_copy_pattern!=null and !maven_xdoc_xml_copy_pattern.equals('')}">
@@ -409,12 +409,12 @@
<util:file var="siteNavFile" name="${maven.docs.src}/project.xml"/>
</util:available>
<!-- supplied navigation file in root of xdocs source tree -->
- <util:available file="${maven.docs.src}/navigation.xml">
- <util:file var="siteNavFile" name="${maven.docs.src}/navigation.xml"/>
+ <util:available file="${maven.docs.src}/${maven.xdoc.navigation.file}">
+ <util:file var="siteNavFile" name="${maven.docs.src}/${maven.xdoc.navigation.file}"/>
</util:available>
<!-- navigation file that was generated -->
- <util:available file="${maven.gen.docs}/navigation.xml">
- <util:file var="siteNavFile" name="${maven.gen.docs}/navigation.xml"/>
+ <util:available file="${maven.gen.docs}/${maven.xdoc.navigation.file}">
+ <util:file var="siteNavFile" name="${maven.gen.docs}/${maven.xdoc.navigation.file}"/>
</util:available>
<!-- hold onto maven.docs.src for later -->
<util:file var="docsSrcFile" name="${maven.docs.src}"/>
@@ -459,10 +459,10 @@
<!-- in the same directory as xml file being processed -->
<!-- if no such nav file available use sitewide nav file -->
<j:set var="navFile" value="${siteNavFile}" />
- <util:available file="${file.parentFile.absoluteFile}/navigation.xml">
- <!-- dont use current directory navigation.xml if it's in maven.docs.src -->
+ <util:available file="${file.parentFile.absoluteFile}/${maven.xdoc.navigation.file}">
+ <!-- dont use current directory ${maven.xdoc.navigation.file} if it's in maven.docs.src -->
<j:if test="${!(file.parentFile.equals(docsSrcFile))}">
- <util:file var="navFile" name="${file.parentFile.absoluteFile}/navigation.xml"/>
+ <util:file var="navFile" name="${file.parentFile.absoluteFile}/${maven.xdoc.navigation.file}"/>
</j:if>
</util:available>
@@ -732,7 +732,7 @@
<fileScanner var="navFiles">
<fileset dir="${maven.docs.src}">
<patternset>
- <include name="**/navigation.xml"/>
+ <include name="**/${maven.xdoc.navigation.file}"/>
</patternset>
</fileset>
</fileScanner>
Modified: maven/maven-1/plugins/trunk/xdoc/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/plugin.properties?rev=279918&r1=279917&r2=279918&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/xdoc/plugin.properties Fri Sep 9 16:48:39 2005
@@ -20,6 +20,8 @@
# Xdoc plugin.
# -------------------------------------------------------------------
+maven.xdoc.navigation.file=navigation.xml
+
maven.xdoc.developmentProcessUrl=http://maven.apache.org/development-process.html
maven.xdoc.includeProjectDocumentation = yes
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?rev=279918&r1=279917&r2=279918&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Fri Sep 9 16:48:39 2005
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.10" date="in SVN">
+ <action dev="ltheussl" type="add" issue="MPXDOC-144">Add a property to override <code>navigation.xml</code>.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-127" due-to="Shinobu Kawai Yoshida">Show organization in header even if logo not set.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-47">Ampersands in navigation.xml being escaped twice.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-133">Ampersand in section/subsection not correct.</action>
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/properties.xml?rev=279918&r1=279917&r2=279918&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/properties.xml Fri Sep 9 16:48:39 2005
@@ -203,6 +203,14 @@
<th>Description</th>
</tr>
<tr>
+ <td>maven.xdoc.navigation.file</td>
+ <td>Yes</td>
+ <td>
+ The name of the navigation file to use.
+ The default is <code>navigation.xml</code>.
+ </td>
+ </tr>
+ <tr>
<td>maven.xdoc.theme</td>
<td>Yes</td>
<td>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org