Author: shinobu
Date: Sun Feb 18 09:14:28 2007
New Revision: 508920
URL: http://svn.apache.org/viewvc?view=rev&rev=508920
Log:
[MPXDOC-200] Workaround for JELLY-274.
Modified:
maven/maven-1/plugins/trunk/xdoc/plugin.jelly
maven/maven-1/plugins/trunk/xdoc/project.xml
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/xdoc/plugin.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/plugin.jelly?view=diff&rev=508920&r1=508919&r2=508920
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/xdoc/plugin.jelly Sun Feb 18 09:14:28 2007
@@ -662,12 +662,28 @@
<echo message="Validation of the locale entries"/>
<j:invokeStatic method="getAvailableLocales" className="java.util.Locale"
var="availableLocales"/>
+<!-- FIXME: Use this when JELLY-274 gets fixed.
+ cf. https://issues.apache.org/jira/browse/JELLY-274
<j:invokeStatic className="java.util.Arrays" method="asList"
var="availableLocalesAsList">
<j:arg value="${availableLocales}" type="[Ljava.lang.Object;"/>
</j:invokeStatic>
<j:forEach var="locale" items="${locales}">
<j:if test="${!availableLocalesAsList.contains(locale)}">
+ <echo message="WARNING: The locale '${locale}' is not a valid one."/>
+ </j:if>
+ </j:forEach>
+-->
+
+ <!-- Ugly hack to work around JELLY-274. -->
+ <j:forEach var="locale" items="${locales}">
+ <j:set var="localeIsAvailable" value="false"/>
+ <j:forEach var="availableLocale" items="${availableLocales}">
+ <j:if test="${locale == availableLocale}">
+ <j:set var="localeIsAvailable" value="true"/>
+ </j:if>
+ </j:forEach>
+ <j:if test="${!localeIsAvailable}">
<echo message="WARNING: The locale '${locale}' is not a valid one."/>
</j:if>
</j:forEach>
Modified: maven/maven-1/plugins/trunk/xdoc/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/project.xml?view=diff&rev=508920&r1=508919&r2=508920
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/project.xml Sun Feb 18 09:14:28 2007
@@ -172,6 +172,15 @@
</roles>
<timezone>-7</timezone>
</developer>
+ <developer>
+ <name>Shinobu Kawai</name>
+ <id>shinobu</id>
+ <email>[EMAIL PROTECTED]</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
</developers>
<dependencies>
<dependency>
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?view=diff&rev=508920&r1=508919&r2=508920
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Sun Feb 18 09:14:28 2007
@@ -24,9 +24,11 @@
<author email="[EMAIL PROTECTED]">Vincent Massol</author>
<author email="[EMAIL PROTECTED]">Arnaud Heritier</author>
<author email="[EMAIL PROTECTED]">Vincent Siveton</author>
+ <author email="[EMAIL PROTECTED]">Shinobu Kawai</author>
</properties>
<body>
<release version="1.10.1-SNAPSHOT" date="In SVN">
+ <action dev="shinobu" type="fix" issue="MPXDOC-200" due-to="Benoit
Xhenseval">maven-xdoc-plugin-1.10.1-SNAPSHOT fails under JDK 6</action>
<action dev="aheritier" type="add" issue="MPXDOC-203">New 'Built by
Maven' logos - default changed to mavenlogo_builtby_w.png</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-202">Plugin fails with
anonymous access and empty password in scm url.</action>
<action dev="aheritier" type="update">Change margin between menu items
in stylus.css.</action>
