November 2010 - I18n-commits - mailman.cloud.codelutin.com

r1820 - trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 20:27:08 +0100 (Fri, 19 Nov 2010) New Revision: 1820 Url: http://nuiton.org/repositories/revision/i18n/1820 Log: Anomalie #672: I18n does not work when bundles are in none normalized directories (with accents and other...) Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java 2010-11-19 19:25:09 UTC (rev 1819) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java 2010-11-19 19:27:08 UTC (rev 1820) @@ -1,23 +1,23 @@ /* * #%L * I18n :: Api - * + * * $Id$ * $HeadURL$ * %% * Copyright (C) 2004 - 2010 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 + * 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 + * + * 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% @@ -61,6 +61,11 @@ public static final String DIRECTORY_SEARCH_BUNDLE_PATTERN = "i18n"; + /** + * @deprecated since 2.0, this is not compatible with os, so do not used it + * any more. + */ + @Deprecated public static final String SEARCH_BUNDLE_PATTERN = ".*i18n/.+\\.properties"; private static final I18nBundleEntry[] EMPTY_I18N_BUNDLE_ENTRYS_ARRAY = @@ -247,7 +252,10 @@ // TODO deal with encoding in windows, this is very durty, // TODO but it works... File file = new File(fileName.replaceAll("%20", " ")); - + if (log.isDebugEnabled()) { + log.debug("url to search " + file); + log.debug("Is a exsting file or directory ? " + file.exists()); + } if (I18nUtil.isJar(fileName)) { // cas ou le ichier du classLoader est un fichier jar if (log.isDebugEnabled()) { @@ -548,7 +556,7 @@ protected static List<URL> getURLsFromJar(URL incomingURL, File jarfile) { - String pattern = SEARCH_BUNDLE_PATTERN; + String pattern = getSearchBundlePattern(); try { ZipInputStream zis = new ZipInputStream(new FileInputStream(jarfile)); try { @@ -589,9 +597,27 @@ } } + /** + * Compute the search pattern according to the {@link File#separator} on + * the underlying os. + * <p/> + * Under linux this is {@code .*i18n/.+\.properties}, and under windows this + * is {@code .*i18n\\\\.+\.properties}. + * + * @return the correct pattern + * @since 2.0 + */ + protected static String getSearchBundlePattern() { + + String result = ".*i18n"; + String path = File.separator; + result += "\\".equals(path) ? path + path : path; + return result + ".+\\.properties"; + } + protected static List<URL> getURLsFromDirectory(URL incomingURL, File repository) { - String pattern = SEARCH_BUNDLE_PATTERN; + String pattern = getSearchBundlePattern(); try { if (log.isDebugEnabled()) { log.debug("search '" + pattern + "' in " + repository);

1 0

r1819 - trunk/nuiton-i18n/src/main/java/org/nuiton/i18n
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 20:25:09 +0100 (Fri, 19 Nov 2010) New Revision: 1819 Url: http://nuiton.org/repositories/revision/i18n/1819 Log: reformat code Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java 2010-11-19 17:49:43 UTC (rev 1818) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java 2010-11-19 19:25:09 UTC (rev 1819) @@ -67,8 +67,7 @@ * @return list of available locales * @throws IllegalArgumentException ia a locale is not valid */ - public static Locale[] parseLocales(String str) throws - IllegalArgumentException { + public static Locale[] parseLocales(String str) throws IllegalArgumentException { List<Locale> result = new ArrayList<Locale>(); String[] bundlesToUse = str.split(","); LocaleConverter converter = new LocaleConverter(); @@ -94,8 +93,8 @@ try { return (Locale) new LocaleConverter().convert(Locale.class, str); } catch (Exception e) { - if (log.isWarnEnabled()) {log.warn("could not load locale '" + str + " for reason : " + - e.getMessage()); + if (log.isWarnEnabled()) { + log.warn("could not load locale '" + str + " for reason : " + e.getMessage()); } // use default locale return DEFAULT_LOCALE;

1 0

r1818 - in trunk/maven-i18n-plugin/src/it/ano-672: . src/test src/test/resources
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 18:49:43 +0100 (Fri, 19 Nov 2010) New Revision: 1818 Url: http://nuiton.org/repositories/revision/i18n/1818 Log: add more logs to debug under windows os... Added: trunk/maven-i18n-plugin/src/it/ano-672/src/test/resources/ trunk/maven-i18n-plugin/src/it/ano-672/src/test/resources/log4j.properties Modified: trunk/maven-i18n-plugin/src/it/ano-672/pom.xml Modified: trunk/maven-i18n-plugin/src/it/ano-672/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/pom.xml 2010-11-19 16:51:54 UTC (rev 1817) +++ trunk/maven-i18n-plugin/src/it/ano-672/pom.xml 2010-11-19 17:49:43 UTC (rev 1818) @@ -42,6 +42,7 @@ <groupId>org.nuiton.i18n.test</groupId> <artifactId>ano-672</artifactId> + <version>@pom.version@</version>   @@ -71,7 +72,13 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> Copied: trunk/maven-i18n-plugin/src/it/ano-672/src/test/resources/log4j.properties (from rev 1817, trunk/maven-i18n-plugin/src/main/resources/log4j.properties) =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/src/test/resources/log4j.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/test/resources/log4j.properties 2010-11-19 17:49:43 UTC (rev 1818) @@ -0,0 +1,34 @@ +### +# #%L +# I18n :: Maven Plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 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% +### +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.org.nuiton.util=WARN +log4j.logger.org.nuiton.i18n=DEBUG

1 0

r1817 - in trunk/maven-i18n-plugin/src/it: . ano-672 ano-672/src ano-672/src/main ano-672/src/main/java ano-672/src/main/java/org ano-672/src/main/java/org/nuiton ano-672/src/main/java/org/nuiton/i18n ano-672/src/main/java/org/nuiton/i18n/test ano-672/src/main/resources ano-672/src/main/resources/i18n ano-672/src/test ano-672/src/test/java ano-672/src/test/java/org ano-672/src/test/java/org/nuiton ano-672/src/test/java/org/nuiton/i18n
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 17:51:54 +0100 (Fri, 19 Nov 2010) New Revision: 1817 Url: http://nuiton.org/repositories/revision/i18n/1817 Log: add it for ano-672 Added: trunk/maven-i18n-plugin/src/it/ano-672/ trunk/maven-i18n-plugin/src/it/ano-672/LICENSE.txt trunk/maven-i18n-plugin/src/it/ano-672/README.txt trunk/maven-i18n-plugin/src/it/ano-672/changelog.txt trunk/maven-i18n-plugin/src/it/ano-672/invoker.properties trunk/maven-i18n-plugin/src/it/ano-672/pom.xml trunk/maven-i18n-plugin/src/it/ano-672/src/ trunk/maven-i18n-plugin/src/it/ano-672/src/main/ trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/ trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/org/ trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/org/nuiton/ trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/org/nuiton/i18n/ trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/org/nuiton/i18n/test/ trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/org/nuiton/i18n/test/MyBean.java trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/ trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties trunk/maven-i18n-plugin/src/it/ano-672/src/test/ trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/ trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/ trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/ trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/ trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java trunk/maven-i18n-plugin/src/it/ano-672/verify.groovy Copied: trunk/maven-i18n-plugin/src/it/ano-672/LICENSE.txt (from rev 1803, trunk/maven-i18n-plugin/src/it/parsers/newProject/LICENSE.txt) =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/LICENSE.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/ano-672/LICENSE.txt 2010-11-19 16:51:54 UTC (rev 1817) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 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 +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + 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. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Copied: trunk/maven-i18n-plugin/src/it/ano-672/README.txt (from rev 1803, trunk/maven-i18n-plugin/src/it/parsers/newProject/README.txt) =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/README.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/ano-672/README.txt 2010-11-19 16:51:54 UTC (rev 1817) @@ -0,0 +1,4 @@ +To test bug 672 : on windows os, I18n does not find translations when application +is stored in a none convention directory( with accent or spaces). + +see http://nuiton.org/issues/show/672 Copied: trunk/maven-i18n-plugin/src/it/ano-672/changelog.txt (from rev 1803, trunk/maven-i18n-plugin/src/it/parsers/newProject/changelog.txt) =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/changelog.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/ano-672/changelog.txt 2010-11-19 16:51:54 UTC (rev 1817) @@ -0,0 +1 @@ +see the changelog of org.nuiton:i18n project. \ No newline at end of file Copied: trunk/maven-i18n-plugin/src/it/ano-672/invoker.properties (from rev 1803, trunk/maven-i18n-plugin/src/it/parsers/newProject/invoker.properties) =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/invoker.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/ano-672/invoker.properties 2010-11-19 16:51:54 UTC (rev 1817) @@ -0,0 +1,45 @@ +### +# #%L +# I18n :: Maven Plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 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% +### +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=clean test + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-at-end + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Copied: trunk/maven-i18n-plugin/src/it/ano-672/pom.xml (from rev 1803, trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml) =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/pom.xml (rev 0) +++ trunk/maven-i18n-plugin/src/it/ano-672/pom.xml 2010-11-19 16:51:54 UTC (rev 1817) @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.4</version> + </parent> + + <groupId>org.nuiton.i18n.test</groupId> + <artifactId>ano-672</artifactId> + +  +  +  + + <name>I18n Test :: ano-672</name> + +  +  +  + + <properties> + <i18n.bundles>fr_FR,en_GB</i18n.bundles> + </properties> + + + <dependencies> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>@pom.version@</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + + </dependencies> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <verbose>true</verbose> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> + + Added: trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/org/nuiton/i18n/test/MyBean.java =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/org/nuiton/i18n/test/MyBean.java (rev 0) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/org/nuiton/i18n/test/MyBean.java 2010-11-19 16:51:54 UTC (rev 1817) @@ -0,0 +1,35 @@ +/* + * #%L + * I18n :: Maven Plugin + * + * $Id: MyBean.java 1782 2010-10-25 07:57:22Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/i18n/trunk/maven-i18n-plugin/src/it/parsers/newPr… $ + * %% + * Copyright (C) 2007 - 2010 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% + */ +package org.nuiton.i18n.test; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + +public class MyBean { + + protected String field1 = n_("javaGetter.key1"); + + protected String field2 = _("javaGetter.key2"); +} Added: trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties 2010-11-19 16:51:54 UTC (rev 1817) @@ -0,0 +1 @@ +javaGetter.key1=Hello \ No newline at end of file Added: trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties 2010-11-19 16:51:54 UTC (rev 1817) @@ -0,0 +1 @@ +javaGetter.key1=Salut \ No newline at end of file Added: trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java (rev 0) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2010-11-19 16:51:54 UTC (rev 1817) @@ -0,0 +1,28 @@ +package org.nuiton.i18n; + +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.i18n.init.DefaultI18nInitializer; + +import java.util.Locale; + +public class I18nTest { + + @Test + public void testI18n() { + + I18n.setInitializer(new DefaultI18nInitializer("ano-672-i18n")); + I18n.init(Locale.FRANCE); + + String expected = "Salut"; + String actual = I18n._("javaGetter.key1"); + Assert.assertEquals(expected, actual); + + I18n.init(Locale.ENGLISH); + + expected = "Hello"; + actual = I18n._("javaGetter.key1"); + Assert.assertEquals(expected, actual); + + } +} Copied: trunk/maven-i18n-plugin/src/it/ano-672/verify.groovy (from rev 1803, trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy) =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/verify.groovy (rev 0) +++ trunk/maven-i18n-plugin/src/it/ano-672/verify.groovy 2010-11-19 16:51:54 UTC (rev 1817) @@ -0,0 +1 @@ +return true;

1 0

r1816 - trunk/maven-i18n-plugin
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 17:51:35 +0100 (Fri, 19 Nov 2010) New Revision: 1816 Url: http://nuiton.org/repositories/revision/i18n/1816 Log: can configure its verbosity Modified: trunk/maven-i18n-plugin/pom.xml Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2010-11-19 16:50:52 UTC (rev 1815) +++ trunk/maven-i18n-plugin/pom.xml 2010-11-19 16:51:35 UTC (rev 1816) @@ -186,7 +186,7 @@ </localRepositoryPath> <settingsFile>src/it/settings.xml</settingsFile> <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> -  + <debug>${maven.verbose}</debug> </configuration> <executions> <execution>

1 0

r1815 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 17:50:52 +0100 (Fri, 19 Nov 2010) New Revision: 1815 Url: http://nuiton.org/repositories/revision/i18n/1815 Log: Anomalie #1083: If no i18n artifacts found, bundle mojo fails Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2010-11-19 12:29:07 UTC (rev 1814) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2010-11-19 16:50:52 UTC (rev 1815) @@ -35,6 +35,7 @@ import org.apache.maven.shared.dependency.tree.DependencyNode; import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; +import org.codehaus.plexus.util.CollectionUtils; import org.nuiton.i18n.bundle.I18nBundleEntry; import org.nuiton.plugin.DependencyUtil; @@ -42,6 +43,7 @@ import java.io.IOException; import java.net.URL; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -219,8 +221,11 @@ List<Artifact> artifacts = new ArrayList<Artifact>(dico.keySet()); - DependencyUtil.sortArtifacts(rootNode, artifacts, - getLog().isDebugEnabled()); + // workaround before using maven-helper-plugin 1.3 see http://nuiton.org/issues/show/1082 + if (!artifacts.isEmpty()) { + DependencyUtil.sortArtifacts(rootNode, artifacts, + getLog().isDebugEnabled()); + } // l'artifact du projet est traite en dernier car s'il possède des // bundles alors ils doivent etre charge en dernier

1 0

r1814 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 13:29:07 +0100 (Fri, 19 Nov 2010) New Revision: 1814 Url: http://nuiton.org/repositories/revision/i18n/1814 Log: Anomalie #1080: Using i18n validation parser does not work on windows os Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2010-11-19 10:22:29 UTC (rev 1813) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2010-11-19 12:29:07 UTC (rev 1814) @@ -46,11 +46,13 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathFactory; import java.io.BufferedInputStream; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -255,17 +257,35 @@ */ private String readInputStream(InputStream in) throws IOException { StringBuilder sb = new StringBuilder(); - byte[] buffer = new byte[BUFFER_SIZE]; - while (in.read(buffer, 0, BUFFER_SIZE) != -1) { - String tmp = new String(buffer); - sb.append(tmp); +// byte[] buffer = new byte[BUFFER_SIZE]; + BufferedReader reader = new BufferedReader(new InputStreamReader(in, getEncoding())); + + try { + String line; + while ((line = reader.readLine())!=null) { + line = line.trim(); + if (line.startsWith("#")) { + + // comment line + continue; + } + sb.append(" ").append(line); + } +// sb.append(PluginHelper.readAsString(reader)); + } finally { + reader.close(); } - in.close(); +// +// while (in.read(buffer, 0, BUFFER_SIZE) != -1) { +// String tmp = new String(buffer); +// sb.append(tmp); +// } +// in.close(); // Suppression String txt = sb.toString().trim(); // suppression des commentaires - txt = txt.replaceAll("#.*\n", ""); +// txt = txt.replaceAll("#.*\n", ""); // contruction du xpath avec des ou txt = txt.replaceAll("\\s+", " | "); @@ -288,6 +308,7 @@ private final Map<String, String> namespaces2; private final boolean verbose; + /** * Fonction d'extraction de la chaine *

1 0

r1813 - trunk/maven-i18n-plugin/src/license
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 11:22:29 +0100 (Fri, 19 Nov 2010) New Revision: 1813 Url: http://nuiton.org/repositories/revision/i18n/1813 Log: regenerate thrid-party with m-license-p 3.0 Modified: trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties Modified: trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties 2010-11-19 10:22:09 UTC (rev 1812) +++ trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties 2010-11-19 10:22:29 UTC (rev 1813) @@ -1,40 +1,16 @@ -### -# #%L -# I18n :: Maven Plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2007 - 2010 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% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License # - Common Public License Version 1.0 -# - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Public Domain # - The Apache Software License, Version 2.0 +# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 08:59:18 CEST 2010 -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html -commons-collections--commons-collections--3.1=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 +#Fri Nov 19 11:21:03 CET 2010 +classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org/license.html +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0

1 0

r1812 - trunk
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 11:22:09 +0100 (Fri, 19 Nov 2010) New Revision: 1812 Url: http://nuiton.org/repositories/revision/i18n/1812 Log: use stable of processor + reuse mavenpom default library versions + antversion Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-18 21:38:00 UTC (rev 1811) +++ trunk/pom.xml 2010-11-19 10:22:09 UTC (rev 1812) @@ -52,30 +52,6 @@ <dependencies> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.5</version> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.2</version> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - </dependency> - - <dependency> <groupId>org.nuiton.processor</groupId> <artifactId>nuiton-processor</artifactId> <version>${processorVersion}</version> @@ -154,27 +130,6 @@ <version>1.2</version> </dependency> -  - -  - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.2</version> - <scope>test</scope> - </dependency> -  <dependency> <groupId>org.apache.maven</groupId> @@ -206,15 +161,9 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - </dependency> - - <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.8.0</version> + <version>${antVersion}</version> <scope>compile</scope> </dependency> @@ -240,13 +189,8 @@  <projectId>i18n</projectId> -  - <helperPluginVersion>1.2.9</helperPluginVersion> - - <processorVersion>1.0.4-SNAPSHOT</processorVersion> + <processorVersion>1.0.4</processorVersion> - <mavenVersion>2.2.1</mavenVersion> -  <locales>fr,en</locales>

1 0

r1811 - trunk
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 22:38:00 +0100 (Thu, 18 Nov 2010) New Revision: 1811 Url: http://nuiton.org/repositories/revision/i18n/1811 Log: use mavenpom 2.4.1-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-18 10:00:39 UTC (rev 1810) +++ trunk/pom.xml 2010-11-18 21:38:00 UTC (rev 1811) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4</version> + <version>2.4.1-SNAPSHOT</version> </parent> <artifactId>i18n</artifactId> @@ -265,24 +265,6 @@ <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> </scm> - <build> - <pluginManagement> - <plugins> -  - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/THIRD-PARTY.properties</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <profiles>  <profile>

1 0