Author: tchemit Date: 2014-02-04 07:31:17 +0100 (Tue, 04 Feb 2014) New Revision: 2619 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2619 Log: fixes #2938: Update to commons-collections4 fixes #3031: Updates mavenpom to 4.6 refs #3032: Updates I18N to 3.0 Modified: trunk/LICENSE.txt trunk/pom.xml trunk/src/main/java/org/nuiton/util/AliasMap.java trunk/src/main/java/org/nuiton/util/MD5InputStream.java trunk/src/main/java/org/nuiton/util/MonthEnum.java trunk/src/main/java/org/nuiton/util/NumberUtil.java trunk/src/main/java/org/nuiton/util/ObjectUtil.java trunk/src/main/java/org/nuiton/util/ReflectUtil.java trunk/src/main/java/org/nuiton/util/Resource.java trunk/src/main/java/org/nuiton/util/Version.java trunk/src/main/java/org/nuiton/util/converter/EnumConverter.java trunk/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java trunk/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java trunk/src/main/java/org/nuiton/util/converter/URIConverter.java trunk/src/main/java/org/nuiton/util/converter/URLConverter.java trunk/src/main/java/org/nuiton/util/converter/VersionConverter.java trunk/src/site/site_fr.xml trunk/src/test/java/org/nuiton/util/NumberUtilTest.java Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/LICENSE.txt 2014-02-04 06:31:17 UTC (rev 2619) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/pom.xml 2014-02-04 06:31:17 UTC (rev 2619) @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.4</version> + <version>4.6</version> </parent> <artifactId>nuiton-utils</artifactId> @@ -125,12 +125,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:https://nuiton.org/svn/nuiton-utils/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:https://nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-utils/repository/show/trunk</url> + <url>https://nuiton.org/projects/nuiton-utils/repository/show/trunk</url> </scm> <distributionManagement> <site> @@ -143,7 +143,7 @@ <projectId>nuiton-utils</projectId> - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <nuitonI18nVersion>3.0-SNAPSHOT</nuitonI18nVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -176,8 +176,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> @@ -288,16 +288,6 @@ </reportSets> </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> - </links> - </configuration> - </plugin> - </plugins> </reporting> Modified: trunk/src/main/java/org/nuiton/util/AliasMap.java =================================================================== --- trunk/src/main/java/org/nuiton/util/AliasMap.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/AliasMap.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -31,8 +31,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.UUID; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.map.MultiValueMap; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.map.MultiValueMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -56,9 +56,6 @@ * @author poussin * @version $Revision$ * @since 3.6.9 - * - * Last update: $Date$ - * by : $Author$ */ public class AliasMap<K, V, A> extends HashMap<K, V> { @@ -72,8 +69,8 @@ protected MultiValueMap keys; public AliasMap() { - aliases = MultiValueMap.decorate(new HashMap<A, K>(), HashSet.class); - keys = MultiValueMap.decorate(new HashMap<K, A>(), HashSet.class); + aliases = MultiValueMap.multiValueMap(new HashMap(), HashSet.class); + keys = MultiValueMap.multiValueMap(new HashMap(), HashSet.class); } /** @@ -216,7 +213,7 @@ keys.remove(key); if (alias != null) { for (Object a : alias) { - aliases.remove(a, key); + aliases.removeMapping(a, key); if (CollectionUtils.isEmpty(aliases.getCollection(a))) { aliases.remove(a); } @@ -269,7 +266,7 @@ aliases.remove(a); if (ks != null) { for (Object k : ks) { - keys.remove(k, a); + keys.removeMapping(k, a); } } } Modified: trunk/src/main/java/org/nuiton/util/MD5InputStream.java =================================================================== --- trunk/src/main/java/org/nuiton/util/MD5InputStream.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/MD5InputStream.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -38,7 +38,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * MD5InputStream, a subclass of FilterInputStream implementing MD5 @@ -57,7 +57,7 @@ return digest; } catch (NoSuchAlgorithmException e) { if (log.isErrorEnabled()) { - log.error(_("nuitonutil.error.could.not.find.MD5"), e); + log.error(t("nuitonutil.error.could.not.find.MD5"), e); } throw new IllegalStateException(e); } Modified: trunk/src/main/java/org/nuiton/util/MonthEnum.java =================================================================== --- trunk/src/main/java/org/nuiton/util/MonthEnum.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/MonthEnum.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Une énumération pour représenter les mois d'une année. @@ -38,18 +38,18 @@ public enum MonthEnum { - JANUARY(_("nuitonutil.month.january")), - FEBRUARY(_("nuitonutil.month.february")), - MARCH(_("nuitonutil.month.march")), - APRIL(_("nuitonutil.month.april")), - MAY(_("nuitonutil.month.may")), - JUNE(_("nuitonutil.month.june")), - JULY(_("nuitonutil.month.july")), - AUGUST(_("nuitonutil.month.august")), - SEPTEMBER(_("nuitonutil.month.september")), - OCTOBER(_("nuitonutil.month.october")), - NOVEMBER(_("nuitonutil.month.november")), - DECEMBER(_("nuitonutil.month.december")); + JANUARY(t("nuitonutil.month.january")), + FEBRUARY(t("nuitonutil.month.february")), + MARCH(t("nuitonutil.month.march")), + APRIL(t("nuitonutil.month.april")), + MAY(t("nuitonutil.month.may")), + JUNE(t("nuitonutil.month.june")), + JULY(t("nuitonutil.month.july")), + AUGUST(t("nuitonutil.month.august")), + SEPTEMBER(t("nuitonutil.month.september")), + OCTOBER(t("nuitonutil.month.october")), + NOVEMBER(t("nuitonutil.month.november")), + DECEMBER(t("nuitonutil.month.december")); /** Logger */ private static final Log log = LogFactory.getLog(MonthEnum.class); @@ -70,7 +70,7 @@ monthEnum = valueOf(month.toUpperCase()); } catch (Exception e) { log.error( - _("nuitonutil.error.unfound.month", month, defaultValue), + t("nuitonutil.error.unfound.month", month, defaultValue), e); } return monthEnum == null ? defaultValue : monthEnum; @@ -80,6 +80,6 @@ public String toString() { // on force la traduction (au cas où i18n n'était pas ini au moment // du chargement de l'enum...) - return _(libelle); + return t(libelle); } } Modified: trunk/src/main/java/org/nuiton/util/NumberUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/NumberUtil.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/NumberUtil.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -1,5 +1,29 @@ package org.nuiton.util; +/* + * #%L + * Nuiton Utils + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.Arrays; /** Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -56,7 +56,7 @@ import java.util.LinkedList; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Outils pour manipuler des objets. Création d'un objet à partir d'une chaîne @@ -114,7 +114,7 @@ (Constructor<E>[]) clazz.getConstructors(); if (constructors.length != 1) { throw new IllegalArgumentException( - _("nuitonutil.error.class.with.more.than.one.constructor", + t("nuitonutil.error.class.with.more.than.one.constructor", clazz)); } @@ -134,8 +134,8 @@ E result = constructor.newInstance(params); return result; } catch (Exception eee) { - throw new IllegalArgumentException(_( - _("nuitonutil.error.cant.instanciate.class", + throw new IllegalArgumentException(t( + t("nuitonutil.error.cant.instanciate.class", clazz, Arrays.toString(params))), eee); } } @@ -183,8 +183,8 @@ // si on ne retrouve rien, result est reste a null if (result == null && !nullIfMissing) { - throw new IllegalArgumentException(_( - _("nuitonutil.error.unfound.assignable.argument", + throw new IllegalArgumentException(t( + t("nuitonutil.error.unfound.assignable.argument", clazz, args))); } return result; @@ -369,7 +369,7 @@ } if (log.isDebugEnabled()) { - log.debug(_("nuitonutil.debug.objectutil.invoke", m, Arrays.toString(parameters))); + log.debug(t("nuitonutil.debug.objectutil.invoke", m, Arrays.toString(parameters))); } Object result = m.invoke(o, parameters); return result; @@ -508,7 +508,7 @@ } if (log.isDebugEnabled()) { - log.debug(_("nuitonutil.debug.objectutil.create", + log.debug(t("nuitonutil.debug.objectutil.create", clazz, Arrays.toString(parameters))); } T result = c.newInstance(parameters); @@ -522,7 +522,7 @@ } } throw new IllegalArgumentException( - _("nuitonutil.debug.objectutil.instantiate", + t("nuitonutil.debug.objectutil.instantiate", clazz, Arrays.toString(params))); } Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -40,7 +40,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Introspection sur une classe. Détermine si un attribut est constant, @@ -143,10 +143,10 @@ @SuppressWarnings({"unchecked"}) public static <T extends Enum<T>> Class<T> getEnumClass(Class<?> type) throws IllegalArgumentException { if (type == null) { - throw new IllegalArgumentException(_("nuitonutil.error.null.parameter", "type")); + throw new IllegalArgumentException(t("nuitonutil.error.null.parameter", "type")); } if (!type.isEnum()) { - throw new IllegalArgumentException(_("nuitonutil.error.not.an.enum", type)); + throw new IllegalArgumentException(t("nuitonutil.error.not.an.enum", type)); } return (Class<T>) type; } Modified: trunk/src/main/java/org/nuiton/util/Resource.java =================================================================== --- trunk/src/main/java/org/nuiton/util/Resource.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/Resource.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -52,7 +52,7 @@ import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Cette class permet de rechercher un fichier en indiquant son nom avec son @@ -102,7 +102,7 @@ method.setAccessible(true); method.invoke(classLoader, url); } catch (Exception eee) { - throw new RuntimeException(_("nuitonutil.error.add.url.in.classloader", classLoader, eee)); + throw new RuntimeException(t("nuitonutil.error.add.url.in.classloader", classLoader, eee)); } } @@ -119,7 +119,7 @@ return url; } - throw new ResourceNotFoundException(_("nuitonutil.error.resource.not.found", name)); + throw new ResourceNotFoundException(t("nuitonutil.error.resource.not.found", name)); } /** @@ -135,7 +135,7 @@ try { return file.toURI().toURL(); } catch (MalformedURLException eee) { - log.warn(_("nuitonutil.error.convert.file.to.url", file, eee.getMessage())); + log.warn(t("nuitonutil.error.convert.file.to.url", file, eee.getMessage())); } } @@ -396,7 +396,7 @@ } return result; } catch (IOException eee) { - throw new ResourceException(_("nuitonutil.error.get.url.from.zip", + throw new ResourceException(t("nuitonutil.error.get.url.from.zip", zipFile.getAbsolutePath(), eee.getMessage()) ); @@ -445,7 +445,7 @@ } return result; } catch (IOException eee) { - throw new ResourceException(_("nuitonutil.error.get.url.from.zip", + throw new ResourceException(t("nuitonutil.error.get.url.from.zip", jarfile.getAbsolutePath(), eee.getMessage()) ); @@ -504,7 +504,7 @@ return urlList; } catch (MalformedURLException eee) { throw new ResourceException( - _("nuitonutil.error.convert.file.to.url", + t("nuitonutil.error.convert.file.to.url", repository + " (pattern " + pattern + ") ", eee.getMessage()) ); @@ -578,7 +578,7 @@ } if (log.isWarnEnabled()) { - log.warn(_("nuitonutil.error.unknown.url.type", url)); + log.warn(t("nuitonutil.error.unknown.url.type", url)); } return false; } Modified: trunk/src/main/java/org/nuiton/util/Version.java =================================================================== --- trunk/src/main/java/org/nuiton/util/Version.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/Version.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -31,7 +31,7 @@ import java.util.Arrays; import java.util.regex.Matcher; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * A class to represent an application version with possible classifier. @@ -183,7 +183,7 @@ if (!matcher.matches()) { // not a known pattern throw new IllegalArgumentException( - _("nuitonutil.error.version.pattern", version)); + t("nuitonutil.error.version.pattern", version)); } // get numbers as string Modified: trunk/src/main/java/org/nuiton/util/converter/EnumConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/EnumConverter.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/converter/EnumConverter.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -32,7 +32,7 @@ import java.util.EnumSet; import static org.apache.commons.logging.LogFactory.getLog; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * classe pour convertir une chaine en un objet Enum type-safe en @@ -69,7 +69,7 @@ return defaultValue; } throw new ConversionException( - _("nuitonutil.error.convertor.noValue", this)); + t("nuitonutil.error.convertor.noValue", this)); } if (isEnabled(aClass, enumType)) { Object result; @@ -93,7 +93,7 @@ } } throw new ConversionException( - _("nuitonutil.error.no.convertor", aClass.getName(), value)); + t("nuitonutil.error.no.convertor", aClass.getName(), value)); } public EnumConverter(Class<?> enumType, Object defaultValue) { Modified: trunk/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -25,7 +25,7 @@ package org.nuiton.util.converter; -import org.apache.commons.collections.map.MultiKeyMap; +import org.apache.commons.collections4.map.MultiKeyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.converter.FormatMap.Format; Modified: trunk/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import static org.apache.commons.logging.LogFactory.getLog; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Used to convert a {@link String} to {@link KeyStroke}. @@ -47,7 +47,7 @@ public Object convert(Class aClass, Object value) { if (value == null) { throw new ConversionException( - _("nuitonutil.error.convertor.noValue", this)); + t("nuitonutil.error.convertor.noValue", this)); } if (isEnabled(aClass)) { Object result; @@ -61,7 +61,7 @@ } } throw new ConversionException( - _("nuitonutil.error.no.convertor", aClass.getName(), value)); + t("nuitonutil.error.no.convertor", aClass.getName(), value)); } protected boolean isEnabled(Class<?> aClass) { Modified: trunk/src/main/java/org/nuiton/util/converter/URIConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/URIConverter.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/converter/URIConverter.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -33,7 +33,7 @@ import java.net.URISyntaxException; import static org.apache.commons.logging.LogFactory.getLog; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * classe pour convertir une chaine en un objet URI. @@ -50,7 +50,7 @@ public Object convert(Class aClass, Object value) { if (value == null) { throw new ConversionException( - _("nuitonutil.error.convertor.noValue", this)); + t("nuitonutil.error.convertor.noValue", this)); } if (isEnabled(aClass)) { Object result; @@ -64,7 +64,7 @@ } } throw new ConversionException( - _("nuitonutil.error.no.convertor", aClass.getName(), value)); + t("nuitonutil.error.no.convertor", aClass.getName(), value)); } protected URI valueOf(String value) { @@ -74,7 +74,7 @@ return result; } catch (URISyntaxException e) { throw new ConversionException( - _("nuitonutil.error.url.convertor", value, this, e.getMessage())); + t("nuitonutil.error.url.convertor", value, this, e.getMessage())); } } Modified: trunk/src/main/java/org/nuiton/util/converter/URLConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/URLConverter.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/converter/URLConverter.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -33,7 +33,7 @@ import java.net.URL; import static org.apache.commons.logging.LogFactory.getLog; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * classe pour convertir une chaine en un objet URL. @@ -50,7 +50,7 @@ public Object convert(Class aClass, Object value) { if (value == null) { throw new ConversionException( - _("nuitonutil.error.convertor.noValue", this)); + t("nuitonutil.error.convertor.noValue", this)); } if (isEnabled(aClass)) { Object result; @@ -64,7 +64,7 @@ } } throw new ConversionException( - _("nuitonutil.error.no.convertor", aClass.getName(), value)); + t("nuitonutil.error.no.convertor", aClass.getName(), value)); } protected URL valueOf(String value) { @@ -74,7 +74,7 @@ return result; } catch (MalformedURLException e) { throw new ConversionException( - _("nuitonutil.error.url.convertor", value, this, e.getMessage())); + t("nuitonutil.error.url.convertor", value, this, e.getMessage())); } } Modified: trunk/src/main/java/org/nuiton/util/converter/VersionConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/VersionConverter.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/main/java/org/nuiton/util/converter/VersionConverter.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -32,7 +32,7 @@ import org.nuiton.util.Version; import org.nuiton.util.VersionUtil; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * classe pour convertir une chaine en un objet Version. @@ -56,7 +56,7 @@ public Object convert(Class aClass, Object value) { if (value == null) { throw new ConversionException( - _("nuitonutil.error.convertor.noValue", this)); + t("nuitonutil.error.convertor.noValue", this)); } if (isEnabled(aClass)) { Object result; @@ -70,12 +70,12 @@ return result; } catch (IllegalArgumentException e) { throw new ConversionException( - _("nuitonutil.error.version.convertor", value, this, e.getMessage()), e); + t("nuitonutil.error.version.convertor", value, this, e.getMessage()), e); } } } throw new ConversionException( - _("nuitonutil.error.no.convertor", aClass.getName(), value)); + t("nuitonutil.error.no.convertor", aClass.getName(), value)); } protected boolean isEnabled(Class<?> aClass) { Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/site/site_fr.xml 2014-02-04 06:31:17 UTC (rev 2619) @@ -30,7 +30,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> @@ -59,7 +59,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.chorem.org/public/images/logos/maven-feather.png"/> + img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> </poweredBy> @@ -67,11 +67,11 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> </head> <links> @@ -94,7 +94,7 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' @@ -103,7 +103,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' locale='fr'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> </div> </footer> </body> Modified: trunk/src/test/java/org/nuiton/util/NumberUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/NumberUtilTest.java 2014-01-06 17:07:48 UTC (rev 2618) +++ trunk/src/test/java/org/nuiton/util/NumberUtilTest.java 2014-02-04 06:31:17 UTC (rev 2619) @@ -1,5 +1,29 @@ package org.nuiton.util; +/* + * #%L + * Nuiton Utils + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert;