From ef0236ed260127c60cded886999ed1e5094bfb2b Mon Sep 17 00:00:00 2001 From: aheritier Date: Sat, 3 Sep 2005 22:46:57 +0000 Subject: [PATCH] MPXDOC-150 : maven.xdoc.date.format does not seem to have any effect. Patch submitted by : Ignacio G. Mac Dowell Patch reviewed by : Arnaud Heritier git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@267511 13f79535-47bb-0310-9956-ffa450edef68 --- xdoc/plugin.jelly | 8 +---- xdoc/plugin.properties | 2 +- xdoc/src/plugin-resources/site.jsl | 24 +++++++++---- .../plugin-test/test03/xdocs/navigation.xml | 35 +++++++------------ xdoc/xdocs/changes.xml | 5 +-- xdoc/xdocs/properties.xml | 4 +-- 6 files changed, 37 insertions(+), 41 deletions(-) diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly index 4adc5665..79b274ff 100644 --- a/xdoc/plugin.jelly +++ b/xdoc/plugin.jelly @@ -973,14 +973,8 @@ - - - - - - + diff --git a/xdoc/plugin.properties b/xdoc/plugin.properties index 5d98dab1..415cb79a 100644 --- a/xdoc/plugin.properties +++ b/xdoc/plugin.properties @@ -86,7 +86,7 @@ maven.xdoc.copy.excludes.classic=external-classic.png,help_logo.gif,icon_arrowfo maven.xdoc.date= maven.xdoc.date.format=dd MMMM yyyy # The date locale -maven.xdoc.date.locale=en +maven.xdoc.date.locale=${maven.xdoc.locale.default} # The default locale (if null, it is the default locale for this instance of the Java Virtual Machine) # By default it is en to ensure backward compatible diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl index dcffb48a..5ba492b1 100644 --- a/xdoc/src/plugin-resources/site.jsl +++ b/xdoc/src/plugin-resources/site.jsl @@ -43,14 +43,24 @@ - - - - - - + + + + + - + + + + + + + + + + + + diff --git a/xdoc/src/plugin-test/test03/xdocs/navigation.xml b/xdoc/src/plugin-test/test03/xdocs/navigation.xml index 029ce591..4c94086a 100644 --- a/xdoc/src/plugin-test/test03/xdocs/navigation.xml +++ b/xdoc/src/plugin-test/test03/xdocs/navigation.xml @@ -16,33 +16,24 @@ * limitations under the License. */ --> - - - - - - <body> +<project name="MPXDOC-128"> + <title key="navigation.title"/> + <body> <breadcrumbs> <item name="Maven" href="http://maven.apache.org"/> <item name="Maven Plugins" href="http://maven.apache.org/reference/plugins/index.html"/> </breadcrumbs> - <links> -<!-- + <links> + <!-- <item name="PDF Documentation" href="app.pdf" img="images/pdf.gif"/> --> - </links> - - <!-- project overview --> - <menu key="navigation.menu1.title"> - <item key="navigation.menu1.item1" - href="/myfile_i18n.html" /> - <item key="navigation.menu1.item2" - href="/subdir/testjsltosite.html" /> - <item key="navigation.menu1.item3" - href="/subdir/subdir2/testjsltosite2.html" /> - </menu> - </body> + </links> + <!-- project overview --> + <menu key="navigation.menu1.title"> + <item key="navigation.menu1.item1" href="/myfile_i18n.html"/> + <item key="navigation.menu1.item2" href="/subdir/testjsltosite.html"/> + <item key="navigation.menu1.item3" href="/subdir/subdir2/testjsltosite2.html"/> + </menu> + </body> </project> diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index 5a6cab26..c6049ec1 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -28,13 +28,14 @@ <release version="1.9.2-SNAPSHOT" date="In SVN"> <action dev="aheritier" type="fix" issue="MPXDOC-154" due-to="Juan F. Codagnone,Vincent Siveton,Lukas Theussl">System locale setting makes test cases fail.</action> <action dev="vsiveton" type="fix" issue="MPXDOC-152" due-to="Arnaud Heritier">cvs-usage link not shown in project-info page</action> - <action dev="aheritier" type="fix">i18n : html code removed from bundles.</action> - <action dev="aheritier" type="fix">i18n : doc title wasn't printed in breadcrumbs.</action> <action dev="aheritier" type="fix" issue="MPXDOC-151">i18n : menu tag in xdoc does not work with "key" translated text id.</action> + <action dev="aheritier" type="fix" issue="MPXDOC-150" due-to="Ignacio G. Mac Dowell">maven.xdoc.date.format does not seem to have any effect.</action> <action dev="aheritier" type="fix" issue="MPXDOC-149" due-to="Lukas Theussl"><DT> is appearing same way as subsection. Fix layout for the FAQ plugin.</action> <action dev="vsiveton" type="fix" issue="MPXDOC-148" due-to="Incze Lajos">Fixed bundles expression.</action> <action dev="aheritier" type="fix" issue="MPXDOC-147">Missing "Project Reports" header in the generated menu.</action> <action dev="aheritier" type="add" issue="MPXDOC-131" due-to="Ignacio G. Mac Dowell">Allow i18n links.</action> + <action dev="aheritier" type="fix">i18n : html code removed from bundles.</action> + <action dev="aheritier" type="fix">i18n : doc title wasn't printed in breadcrumbs.</action> </release> <release version="1.9.1" date="2005-06-16"> <action dev="brett" type="fix">Don't override the Maven library. This makes the plugin compatible with both Maven 1.0.2 and Maven 1.1</action> diff --git a/xdoc/xdocs/properties.xml b/xdoc/xdocs/properties.xml index abb32b26..ad1699cc 100644 --- a/xdoc/xdocs/properties.xml +++ b/xdoc/xdocs/properties.xml @@ -19,7 +19,7 @@ <document> <properties> - <title>Xdoc Properties + XDoc plugin properties Stéphane MOR Vincent Massol Vincent Siveton @@ -133,7 +133,7 @@ maven.xdoc.date.locale Yes - Sets the locale used for the date. Defaults to "en", ie english. + DEPRECATED. Use the property maven.xdoc.locale.default instead.
Sets the locale used for the date. Defaults to ${maven.xdoc.locale.default}.