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

r1827 - in trunk: . ant-i18n-task maven-i18n-plugin nuiton-i18n
by tchemit＠users.nuiton.org 22 Nov '10

22 Nov '10

Author: tchemit Date: 2010-11-22 14:38:37 +0100 (Mon, 22 Nov 2010) New Revision: 1827 Url: http://nuiton.org/repositories/revision/i18n/1827 Log: [maven-release-plugin] prepare release i18n-2.0 Modified: trunk/ant-i18n-task/pom.xml trunk/maven-i18n-plugin/pom.xml trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2010-11-22 13:28:39 UTC (rev 1826) +++ trunk/ant-i18n-task/pom.xml 2010-11-22 13:38:37 UTC (rev 1827) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2010-11-22 13:28:39 UTC (rev 1826) +++ trunk/maven-i18n-plugin/pom.xml 2010-11-22 13:38:37 UTC (rev 1827) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2010-11-22 13:28:39 UTC (rev 1826) +++ trunk/nuiton-i18n/pom.xml 2010-11-22 13:38:37 UTC (rev 1827) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-22 13:28:39 UTC (rev 1826) +++ trunk/pom.xml 2010-11-22 13:38:37 UTC (rev 1827) @@ -37,7 +37,7 @@ </parent> <artifactId>i18n</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> <modules> <module>nuiton-i18n</module> @@ -200,11 +200,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.0</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/i18n/trunk + scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.0 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> + <url>http://www.nuiton.org/repositories/browse/i18n/tags/i18n-2.0</url> </scm> <profiles>

1 0

22 Nov '10

Author: tchemit Date: 2010-11-22 14:28:39 +0100 (Mon, 22 Nov 2010) New Revision: 1826 Url: http://nuiton.org/repositories/revision/i18n/1826 Log: improve documentation add headers add svn keywords Modified: 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/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/java/org/nuiton/i18n/I18nTest.java trunk/maven-i18n-plugin/src/it/ano-672/verify.groovy trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/i18n/jsp.rules trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/MyJsp.jsp trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/i18n/jsp.rules trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/MyJsp.jsp trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java trunk/pom.xml trunk/src/site/site_en.xml Modified: 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 2010-11-22 09:48:08 UTC (rev 1825) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/org/nuiton/i18n/test/MyBean.java 2010-11-22 13:28:39 UTC (rev 1826) @@ -2,8 +2,8 @@ * #%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… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2007 - 2010 CodeLutin * %% Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/src/main/java/org/nuiton/i18n/test/MyBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: 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 2010-11-22 09:48:08 UTC (rev 1825) +++ trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2010-11-22 13:28:39 UTC (rev 1826) @@ -1,3 +1,27 @@ +/* + * #%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% + */ package org.nuiton.i18n; import org.junit.Assert; Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/it/ano-672/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-672/verify.groovy 2010-11-22 09:48:08 UTC (rev 1825) +++ trunk/maven-i18n-plugin/src/it/ano-672/verify.groovy 2010-11-22 13:28:39 UTC (rev 1826) @@ -1 +1,25 @@ +/* + * #%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% + */ return true; Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/i18n/jsp.rules ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/MyJsp.jsp =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/MyJsp.jsp 2010-11-22 09:48:08 UTC (rev 1825) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/MyJsp.jsp 2010-11-22 13:28:39 UTC (rev 1826) @@ -1,3 +1,27 @@ + <html xmlns="http://www.w3.org/1999/xhtml" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page" Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/MyJsp.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp 2010-11-22 09:48:08 UTC (rev 1825) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp 2010-11-22 13:28:39 UTC (rev 1826) @@ -1,3 +1,27 @@ + <html xmlns="http://www.w3.org/1999/xhtml" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page" Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/i18n/jsp.rules ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/MyJsp.jsp =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/MyJsp.jsp 2010-11-22 09:48:08 UTC (rev 1825) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/MyJsp.jsp 2010-11-22 13:28:39 UTC (rev 1826) @@ -1,3 +1,27 @@ + <html xmlns="http://www.w3.org/1999/xhtml" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page" Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/MyJsp.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-22 09:48:08 UTC (rev 1825) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java 2010-11-22 13:28:39 UTC (rev 1826) @@ -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% Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-22 09:48:08 UTC (rev 1825) +++ trunk/pom.xml 2010-11-22 13:28:39 UTC (rev 1826) @@ -187,7 +187,6 @@  <projectId>i18n</projectId> - <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> <processorVersion>1.0.4</processorVersion>  Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-11-22 09:48:08 UTC (rev 1825) +++ trunk/src/site/site_en.xml 2010-11-22 13:28:39 UTC (rev 1826) @@ -73,7 +73,6 @@ <item name="I18n :: Api" href="../nuiton-i18n/en/index.html"/> <item name="I18n :: Maven Plugin" href="../maven-i18n-plugin/en/index.html"/> - <item name="I18n :: Ant task" href="../ant-i18n-task/en/index.html"/> </menu> <menu ref="reports"/>

1 0

r1825 - in trunk/src/site: apt en/apt
by jcouteau＠users.nuiton.org 22 Nov '10

22 Nov '10

Author: jcouteau Date: 2010-11-22 10:48:08 +0100 (Mon, 22 Nov 2010) New Revision: 1825 Url: http://nuiton.org/repositories/revision/i18n/1825 Log: - Translate index page to english - Fix small spelling mistakes - Fix two old bundle names Modified: trunk/src/site/apt/index.apt trunk/src/site/apt/presentation.apt trunk/src/site/en/apt/index.apt trunk/src/site/en/apt/presentation.apt Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-11-21 14:29:43 UTC (rev 1824) +++ trunk/src/site/apt/index.apt 2010-11-22 09:48:08 UTC (rev 1825) @@ -52,7 +52,7 @@ Quoi de nouveau dans la version 2.0 - Depuis la version 2.0, les bundles i18n générés (dans <src/main.resources/i18n>) + Depuis la version 2.0, les bundles i18n générés (dans <src/main/resources/i18n>) sont compatibles avec l'api java de <ResourceBundle>, à savoir qu'on a remplacé les <<->> par des <<_>>. @@ -62,7 +62,7 @@ malib-fr_FR.properties ----------------------------------------------------------------------------- - Et maintentant c'est : + Et maintenant c'est : ----------------------------------------------------------------------------- malib_fr_FR.properties Modified: trunk/src/site/apt/presentation.apt =================================================================== --- trunk/src/site/apt/presentation.apt 2010-11-21 14:29:43 UTC (rev 1824) +++ trunk/src/site/apt/presentation.apt 2010-11-22 09:48:08 UTC (rev 1825) @@ -35,7 +35,7 @@ Les chaînes à traduire doivent être rentrées dans un fichier de propriétés situé dans le classpath de votre application, dans un dossier i18n, et nommé - de la manière suivante : xxx-fr_FR.properties par exemple. + de la manière suivante : xxx_fr_FR.properties par exemple. A l'initialisation, la librairie recherche dans le classpath tous les fichiers de traduction correspondant à la langue définie (dans les dossiers i18n du Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2010-11-21 14:29:43 UTC (rev 1824) +++ trunk/src/site/en/apt/index.apt 2010-11-22 09:48:08 UTC (rev 1825) @@ -45,10 +45,68 @@ Have a look to the tutorials to see how to enrich your application with Nuiton I18n. - The three Nuiton I18n project modules : + The two Nuiton I18n project modules : - {{{./nuiton-i18n/index.html}I18n Api}} - {{{./maven-i18n-plugin/index.html}I18n Maven Plugin}} - - {{{./ant-i18n-task/index.html}I18n Ant task}} +What is new in the 2.0 version + + Since 2.0 version, the generated i18n bundles (in <src/main/resources/i18n>) + are compatible with the <ResourceBundle> Java API, meaning that we replaced + all <<->> by <<_>>. + + Before we had + +----------------------------------------------------------------------------- +mylib-fr_FR.properties +----------------------------------------------------------------------------- + + And now it is : + +----------------------------------------------------------------------------- +mylib_fr_FR.properties +----------------------------------------------------------------------------- + + * Migration to 2.0 version + + To use the 2.0 version, you first need to rename in your project the bundles + with the new names (or they will be generated at first execution and you will + be good for a copy/paste party. And anyway, it is best to rename existing + files to keep the history in your version control system). + + For the <<bundle>> mode (bundle mojo), no modification is necessary and it + will be compatible with libraries package with older i18n versions (1.x). + + * Add a JSP parser + + A new JSP parserhas been introduced to integrate the i18n detection system in + web developmments (using Struts for example). + + Take a look to the tutorials to see how to enhance your application using + Nuiton I18n. + + * Improve XML parsers + + The xml type parsers (at the moment we had only <<parserValidation>>) have + seen their design improved. Some parameters have become common to all parsers. + See the goal detail page to see what changed. + + We introduced the new <<parserXml>> that contains no key detection rules, the + user have to specify them by himself; this new mojo can allow key detection + in xml files not managed by the project. + + * Suppression of the <<I18n ant tasks>> module + + This module is not maintained for a long time, so it has been unactivated in + the default build. but it is still in the project and can be activated in a + profile named <<ant-task-profile>>. + + So to build the I18n project with this module, you just have to launch : + +----------------------------------------------------------------------------- +mvn install -Pant-task-profile +----------------------------------------------------------------------------- + + Modified: trunk/src/site/en/apt/presentation.apt =================================================================== --- trunk/src/site/en/apt/presentation.apt 2010-11-21 14:29:43 UTC (rev 1824) +++ trunk/src/site/en/apt/presentation.apt 2010-11-22 09:48:08 UTC (rev 1825) @@ -34,7 +34,7 @@ language,... The string to translate have to be put in a properties file located in your - application's classpath, in a i18n file, and named as : xxx-fr_FR.properties + application's classpath, in a i18n file, and named as : xxx_fr_FR.properties for example. On initialisation, the library looks in the classpath for all the translation

1 0

r1824 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 15:29:43 +0100 (Sun, 21 Nov 2010) New Revision: 1824 Url: http://nuiton.org/repositories/revision/i18n/1824 Log: Update mavenpom4redmineAndCentral to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 10:38:20 UTC (rev 1823) +++ trunk/pom.xml 2010-11-21 14:29:43 UTC (rev 1824) @@ -23,9 +23,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <artifactId>i18n</artifactId>

1 0

r1823 - trunk/src/site/apt
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 11:38:20 +0100 (Sun, 21 Nov 2010) New Revision: 1823 Url: http://nuiton.org/repositories/revision/i18n/1823 Log: update docs Modified: trunk/src/site/apt/index.apt Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-11-21 10:04:23 UTC (rev 1822) +++ trunk/src/site/apt/index.apt 2010-11-21 10:38:20 UTC (rev 1823) @@ -37,20 +37,79 @@ Petit exemple qui démontre la simplicité d'utilisation de Nuiton I18n : ------------------------------------------------------------------------------ +-------------------------------------------------------------------------------- I18n.init(Locale.FR); System.out.println(I18n._("This text will be translated")); +-------------------------------------------------------------------------------- + + Les deux modules du projet Nuiton I18n : + + - {{{./nuiton-i18n/index.html}I18n Api}} + + - {{{./maven-i18n-plugin/index.html}I18n Maven Plugin}} + + - {{{./ant-i18n-task/index.html}I18n Ant task}} (ce module a été désactivé depuis la version 2.0) + +Quoi de nouveau dans la version 2.0 + + Depuis la version 2.0, les bundles i18n générés (dans <src/main.resources/i18n>) + sont compatibles avec l'api java de <ResourceBundle>, à savoir qu'on a + remplacé les <<->> par des <<_>>. + + Avant on avait + ----------------------------------------------------------------------------- +malib-fr_FR.properties +----------------------------------------------------------------------------- + Et maintentant c'est : + +----------------------------------------------------------------------------- +malib_fr_FR.properties +----------------------------------------------------------------------------- + + * Migration vers la version 2.0 + + Pour utiliser la version 2.0, il faut avant tout renommer dans votre projet + les bundles avant les bons noms (sinon ils seront générés lors de la première + exécution et il est toujours mieux de renommer des fichiers existants pour + conserver l'historique des fichiers dans le gestionnaire de versions). + + Pour ce qui est du mode <<bundle>> (mojo bundle), aucune modification n'est + nécessaire et il restera compatible avec des librairies packagées avec I18n + non en 2.0. + + * Ajout d'un parseur JSP + + Un nouveau parseur JSP a été introduit pour pouvoir intégrer le système de + détection I18n dans des développement web (struts par exemple). + Jettez un oeil aux tutoriaux pour voir comment enrichir votre application avec Nuiton I18n. - Les trois modules du projet Nuiton I18n : + * Amélioration des parser xml - - {{{./nuiton-i18n/index.html}I18n Api}} + Les parseurs de type xml (actuellement on avait que le <<parserValidation>>) + ont été améliorés dans leur design. Certain paramètres sont devenus communs + à tous les parseurs. Regarder la page de détails de goal pour voir ce qui a + changé. - - {{{./maven-i18n-plugin/index.html}I18n Maven Plugin}} + On a pu introduire un nouveau parseur <<parserXml>> qui ne contient aucune + règle de détection de clefs (via xpath), l'utilisateur doit les spécifier par + lui même; ce nouveau mojo permet ainsi d'utiliser la détection de clef dans du + xml non pris en charge par le projet. - - {{{./ant-i18n-task/index.html}I18n Ant task}} + * Suppression du module <<I18n ant tasks>> + Ce module n'est plus maintenu depuis bien longtemps, il est donc désactivé du + build par défaut, il reste cependant dans le projet et est activitable dans un + profile nommé <<ant-task-profile>>. + Donc pour construire le projet I18n avec ce module il suffit de lancer : + +----------------------------------------------------------------------------- +mvn install -Pant-task-profile +----------------------------------------------------------------------------- + + +

1 0

r1822 - in trunk/maven-i18n-plugin/src/it/parsers: newProject newProject/src/main newProject/src/main/i18n newProject/src/main/webapp newProject/src/main/webapp/jsp withNewKeys withNewKeys/src/main withNewKeys/src/main/i18n withNewKeys/src/main/resources/i18n withNewKeys/src/main/webapp withNewKeys/src/main/webapp/jsp
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 11:04:23 +0100 (Sun, 21 Nov 2010) New Revision: 1822 Url: http://nuiton.org/repositories/revision/i18n/1822 Log: add jsp parser in it Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/i18n/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/i18n/jsp.rules trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/MyJsp.jsp trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/i18n/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/i18n/jsp.rules trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/MyJsp.jsp Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml 2010-11-20 14:25:42 UTC (rev 1821) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml 2010-11-21 10:04:23 UTC (rev 1822) @@ -43,19 +43,8 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>parsers-newProject</artifactId> -  -  -  - <name>I18n Test :: parsers-new</name> -  -  -  - - <packaging>jar</packaging> - - <dependencies> <dependency> @@ -83,7 +72,22 @@ <goals> <goal>parserJava</goal> <goal>parserValidation</goal> + </goals> + </execution> + <execution> + <id>jsp</id> + <goals> + <goal>parserJsp</goal> </goals> + <configuration> + <userRulesFiles> + <file>${basedir}/src/main/i18n/jsp.rules</file> + </userRulesFiles> + <namespaces> + <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> + <jsp>http://java.sun.com/JSP/Page</jsp> + </namespaces> + </configuration> </execution> <execution>  Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/i18n/jsp.rules =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/i18n/jsp.rules (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/i18n/jsp.rules 2010-11-21 10:04:23 UTC (rev 1822) @@ -0,0 +1,3 @@ +# Règles i18n pour les jsp + +//s:text/@name \ No newline at end of file Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/MyJsp.jsp =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/MyJsp.jsp (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/MyJsp.jsp 2010-11-21 10:04:23 UTC (rev 1822) @@ -0,0 +1,12 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title><s:text name="jspGetter.key1"/></title> +</head> +<s:text name="jspGetter.key2"/> +<body> +</body> +</html> \ No newline at end of file Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy 2010-11-20 14:25:42 UTC (rev 1821) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy 2010-11-21 10:04:23 UTC (rev 1822) @@ -37,4 +37,11 @@ assert content.contains( 'validationGetter.key1=' ); assert content.contains( 'validationGetter.key2=' ); +file = new File(basedir, 'target/generated-sources/i18n/jsp.getter'); +assert file.exists(); + +content = file.text; +assert content.contains( 'jspGetter.key1=' ); +assert content.contains( 'jspGetter.key2=' ); + return true; Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml 2010-11-20 14:25:42 UTC (rev 1821) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml 2010-11-21 10:04:23 UTC (rev 1822) @@ -83,6 +83,26 @@ <goals> <goal>parserJava</goal> <goal>parserValidation</goal> + </goals> + </execution> + <execution> + <id>jsp</id> + <goals> + <goal>parserJsp</goal> + </goals> + <configuration> + <userRulesFiles> + <file>${basedir}/src/main/i18n/jsp.rules</file> + </userRulesFiles> + <namespaces> + <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> + <jsp>http://java.sun.com/JSP/Page</jsp> + </namespaces> + </configuration> + </execution> + <execution> + <id>first-gen</id> + <goals> <goal>gen</goal> </goals> </execution> Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp 2010-11-21 10:04:23 UTC (rev 1822) @@ -0,0 +1,12 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title><s:text name="jspGetter.key1"/></title> +</head> +<s:text name="jspGetter.key2"/> +<body> +</body> +</html> \ No newline at end of file Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/i18n/jsp.rules =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/i18n/jsp.rules (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/i18n/jsp.rules 2010-11-21 10:04:23 UTC (rev 1822) @@ -0,0 +1,3 @@ +# Règles i18n pour les jsp + +//s:text/@name \ No newline at end of file Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties 2010-11-20 14:25:42 UTC (rev 1821) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties 2010-11-21 10:04:23 UTC (rev 1822) @@ -1,26 +1,3 @@ -### -# #%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% -### javaGetter.old.key1=hum1 javaGetter.old.key2=hum2 +jspGetter.key1=humJsp1 Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/MyJsp.jsp =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/MyJsp.jsp (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/MyJsp.jsp 2010-11-21 10:04:23 UTC (rev 1822) @@ -0,0 +1,12 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title><s:text name="jspGetter.key1"/></title> +</head> +<s:text name="jspGetter.key2"/> +<body> +</body> +</html> \ No newline at end of file Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2010-11-20 14:25:42 UTC (rev 1821) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2010-11-21 10:04:23 UTC (rev 1822) @@ -40,6 +40,13 @@ assert content.contains( 'validationGetter.key2=' ); assert content.contains( 'validationGetter.key3=' ); +file = new File(basedir, 'target/generated-sources/i18n/jsp.getter'); +assert file.exists(); + +content = file.text; +assert content.contains( 'jspGetter.key1=' ); +assert content.contains( 'jspGetter.key2=' ); + file = new File(basedir, 'src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties'); assert file.exists(); @@ -51,5 +58,7 @@ assert content.contains( 'validationGetter.key1=' ); assert content.contains( 'validationGetter.key2=' ); assert content.contains( 'validationGetter.key3=' ); +assert content.contains( 'jspGetter.key1=' ); +assert content.contains( 'jspGetter.key2=' ); return true;

1 0

r1821 - trunk
by tchemit＠users.nuiton.org 20 Nov '10

20 Nov '10

Author: tchemit Date: 2010-11-20 15:25:42 +0100 (Sat, 20 Nov 2010) New Revision: 1821 Url: http://nuiton.org/repositories/revision/i18n/1821 Log: Evolution #1085: Update maven-helper-plugin to 1.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-19 19:27:08 UTC (rev 1820) +++ trunk/pom.xml 2010-11-20 14:25:42 UTC (rev 1821) @@ -189,6 +189,7 @@  <projectId>i18n</projectId> + <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> <processorVersion>1.0.4</processorVersion>

1 0

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