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

r1830 - in trunk: ant-i18n-task/src/license nuiton-i18n/src/main/java/org/nuiton/util nuiton-i18n/src/main/java/org/nuiton/util/converter nuiton-i18n/src/main/resources/META-INF/services
by tchemit＠users.nuiton.org Nov. 29, 2010

Nov. 29, 2010

Author: tchemit Date: 2010-11-29 21:10:23 +0100 (Mon, 29 Nov 2010) New Revision: 1830 Url: http://nuiton.org/repositories/revision/i18n/1830 Log: Evolution #1120: Move LocaleConverter to the nuiton-utils correct pakcage (org.nuiton.util.converter) Added: trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/ trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java Modified: trunk/ant-i18n-task/src/license/THIRD-PARTY.properties trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java trunk/nuiton-i18n/src/main/resources/META-INF/services/org.apache.commons.beanutils.Converter Modified: trunk/ant-i18n-task/src/license/THIRD-PARTY.properties =================================================================== --- trunk/ant-i18n-task/src/license/THIRD-PARTY.properties 2010-11-22 13:38:42 UTC (rev 1829) +++ trunk/ant-i18n-task/src/license/THIRD-PARTY.properties 2010-11-29 20:10:23 UTC (rev 1830) @@ -1,6 +1,7 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - =The Apache Software License, Version 2.0 # - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) v 3.0 @@ -9,6 +10,6 @@ # Please fill the missing licenses for dependencies : # # -#Thu Nov 11 15:08:04 CET 2010 -org.apache.ant--ant--1.8.0==The Apache Software License, Version 2.0 -org.apache.ant--ant-launcher--1.8.0=The Apache Software License, Version 2.0 +#Mon Nov 22 14:38:26 CET 2010 +org.apache.ant--ant--1.8.0--jar=\=The Apache Software License, Version 2.0 +org.apache.ant--ant-launcher--1.8.0--jar=The Apache Software License, Version 2.0 Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java 2010-11-22 13:38:42 UTC (rev 1829) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java 2010-11-29 20:10:23 UTC (rev 1830) @@ -41,7 +41,9 @@ * classe pour convertir une chaine en un objet {@link Locale}. * * @author tchemit <chemit(a)codelutin.com> + * @deprecated since 2.0.1, use the {@link org.nuiton.util.converter.LocaleConverter} instead */ +@Deprecated public class LocaleConverter implements Converter { private static final Pattern FULL_SCOPE_PATTERN = Copied: trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java (from rev 1829, trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java) =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java (rev 0) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java 2010-11-29 20:10:23 UTC (rev 1830) @@ -0,0 +1,148 @@ +/* + * #%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 + * 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.util.converter; + +import org.apache.commons.beanutils.ConversionException; +import org.apache.commons.beanutils.Converter; +import org.apache.commons.logging.Log; +import org.nuiton.i18n.CountryEnum; +import org.nuiton.i18n.LanguageEnum; + +import java.util.Locale; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static org.apache.commons.logging.LogFactory.getLog; + +/** + * classe pour convertir une chaine en un objet {@link Locale}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0.1 + */ +public class LocaleConverter implements Converter { + + private static final Pattern FULL_SCOPE_PATTERN = + Pattern.compile("([a-zA-Z]{2})_([a-zA-Z]{2})"); + + private static final Pattern MEDIUM_SCOPE_PATTERN = + Pattern.compile("([a-zA-Z]{2})"); + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static Log log = getLog(LocaleConverter.class); + + @Override + public Object convert(Class aClass, Object value) { + if (value == null) { + throw new ConversionException("can not convert null value in " + + this + " convertor"); + } + if (isEnabled(aClass)) { + Object result; + if (isEnabled(value.getClass())) { + result = value; + return result; + } + if (value instanceof String) { + result = valueOf(((String) value).trim()); + return result; + } + } + throw new ConversionException( + "could not find a convertor for type " + aClass.getName() + + " and value : " + value); + } + + public Locale valueOf(String value) { + try { + Locale result = convertFullScope(value); + + if (result == null) { + result = convertMediumScope(value); + } + + if (result == null) { + throw new ConversionException("could not convert locale " + + value); + } + + return result; + } catch (Exception e) { + throw new ConversionException("could not convert locale " + value + + " for reason " + e.getMessage()); + } + } + + private Locale convertFullScope(String value) { + Matcher m = FULL_SCOPE_PATTERN.matcher(value); + if (m.matches()) { + // found a full scope pattern (language + country) + LanguageEnum language = + LanguageEnum.valueOf(m.group(1).toLowerCase()); + CountryEnum country = CountryEnum.valueOf(m.group(2).toUpperCase()); + if (language == null || country == null) { + // not safe + throw new ConversionException("could not convert locale " + + value); + } + return new Locale(language.name(), country.name()); + } + return null; + } + + private Locale convertMediumScope(String value) { + Matcher m = MEDIUM_SCOPE_PATTERN.matcher(value); + if (m.matches()) { + // found a medium scope pattern (only language) + LanguageEnum language = + LanguageEnum.valueOf(m.group(1).toLowerCase()); + + if (language == null) { + // not safe + throw new ConversionException("could not convert locale " + + value); + } + return new Locale(language.name()); + } + return null; + } + + + public LocaleConverter() { + if (log.isDebugEnabled()) { + log.debug(this); + } + } + + protected boolean isEnabled(Class<?> aClass) { + return Locale.class.equals(aClass); + } + + public Class<?> getType() { + return Locale.class; + } + +} Modified: trunk/nuiton-i18n/src/main/resources/META-INF/services/org.apache.commons.beanutils.Converter =================================================================== --- trunk/nuiton-i18n/src/main/resources/META-INF/services/org.apache.commons.beanutils.Converter 2010-11-22 13:38:42 UTC (rev 1829) +++ trunk/nuiton-i18n/src/main/resources/META-INF/services/org.apache.commons.beanutils.Converter 2010-11-29 20:10:23 UTC (rev 1830) @@ -1 +1 @@ -org.nuiton.util.LocaleConverter \ No newline at end of file +org.nuiton.util.converter.LocaleConverter \ No newline at end of file

1 0

r1829 - in trunk: . ant-i18n-task maven-i18n-plugin nuiton-i18n
by tchemit＠users.nuiton.org Nov. 22, 2010

Nov. 22, 2010

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

1 0

r1828 - tags
by tchemit＠users.nuiton.org Nov. 22, 2010

Nov. 22, 2010

Author: tchemit Date: 2010-11-22 14:38:39 +0100 (Mon, 22 Nov 2010) New Revision: 1828 Url: http://nuiton.org/repositories/revision/i18n/1828 Log: [maven-release-plugin] copy for tag i18n-2.0 Added: tags/i18n-2.0/

1 0

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

Nov. 22, 2010

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

Nov. 22, 2010

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 Nov. 22, 2010

Nov. 22, 2010

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 Nov. 21, 2010

Nov. 21, 2010

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 Nov. 21, 2010

Nov. 21, 2010

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 Nov. 21, 2010

Nov. 21, 2010

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 Nov. 20, 2010

Nov. 20, 2010

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 Nov. 19, 2010

Nov. 19, 2010

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. + * + * 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 Nov. 19, 2010

Nov. 19, 2010

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 Nov. 19, 2010

Nov. 19, 2010

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 Nov. 19, 2010

Nov. 19, 2010

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 Nov. 19, 2010

Nov. 19, 2010

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 Nov. 19, 2010

Nov. 19, 2010

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 Nov. 19, 2010

Nov. 19, 2010

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 Nov. 19, 2010

Nov. 19, 2010

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 Nov. 19, 2010

Nov. 19, 2010

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 Nov. 18, 2010

Nov. 18, 2010

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

r1810 - in trunk/maven-i18n-plugin/src: it/parsers/withNewKeys it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test main/resources
by tchemit＠users.nuiton.org Nov. 18, 2010

Nov. 18, 2010

Author: tchemit Date: 2010-11-18 11:00:39 +0100 (Thu, 18 Nov 2010) New Revision: 1810 Url: http://nuiton.org/repositories/revision/i18n/1810 Log: Evolution #1056: Add validators/validator/message in validators ruleset Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy trunk/maven-i18n-plugin/src/main/resources/validation.rules Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml 2010-11-18 10:00:28 UTC (rev 1809) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml 2010-11-18 10:00:39 UTC (rev 1810) @@ -25,24 +25,28 @@ --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> - <field name="field1"> + <validator type="required"> + <message>validationGetter.key3</message> + </validator> + + <field name="field1"> - <field-validator type="required"> - <message>validationGetter.key1</message> - </field-validator> + <field-validator type="required"> + <message>validationGetter.key1</message> + </field-validator> - </field> + </field> - <field name="field2"> + <field name="field2"> - <field-validator type="required"> - <message>validationGetter.key2##${parm1}</message> - </field-validator> + <field-validator type="required"> + <message>validationGetter.key2##${parm1}</message> + </field-validator> - </field> + </field> </validators> Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2010-11-18 10:00:28 UTC (rev 1809) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2010-11-18 10:00:39 UTC (rev 1810) @@ -38,6 +38,7 @@ content = file.text; assert content.contains( 'validationGetter.key1=' ); assert content.contains( 'validationGetter.key2=' ); +assert content.contains( 'validationGetter.key3=' ); file = new File(basedir, 'src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties'); assert file.exists(); @@ -49,5 +50,6 @@ assert content.contains( 'javaGetter.key2=' ); assert content.contains( 'validationGetter.key1=' ); assert content.contains( 'validationGetter.key2=' ); +assert content.contains( 'validationGetter.key3=' ); return true; Modified: trunk/maven-i18n-plugin/src/main/resources/validation.rules =================================================================== --- trunk/maven-i18n-plugin/src/main/resources/validation.rules 2010-11-18 10:00:28 UTC (rev 1809) +++ trunk/maven-i18n-plugin/src/main/resources/validation.rules 2010-11-18 10:00:39 UTC (rev 1810) @@ -1,3 +1,4 @@ # Règles pour la validation XWorks //validators/field/field-validator/message +//validators/validator/message

1 0

r1809 - trunk
by tchemit＠users.nuiton.org Nov. 18, 2010

Nov. 18, 2010

Author: tchemit Date: 2010-11-18 11:00:28 +0100 (Thu, 18 Nov 2010) New Revision: 1809 Url: http://nuiton.org/repositories/revision/i18n/1809 Log: Evolution #1057: Do not include in build the ant task Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-16 08:59:10 UTC (rev 1808) +++ trunk/pom.xml 2010-11-18 10:00:28 UTC (rev 1809) @@ -44,7 +44,7 @@ <modules> <module>nuiton-i18n</module> <module>maven-i18n-plugin</module> - <module>ant-i18n-task</module> +   </modules> @@ -282,4 +282,17 @@ </pluginManagement> </build> + + <profiles> +  + <profile> + <id>ant-task-profile</id> + + <modules> + <module>ant-i18n-task</module> + </modules> + </profile> + + + </profiles> </project>

1 0

r1808 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org Nov. 16, 2010

Nov. 16, 2010

Author: tchemit Date: 2010-11-16 09:59:10 +0100 (Tue, 16 Nov 2010) New Revision: 1808 Url: http://nuiton.org/repositories/revision/i18n/1808 Log: add verbose flag in XmlParser 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/ParserJspMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.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-12 11:48:31 UTC (rev 1807) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2010-11-16 08:59:10 UTC (rev 1808) @@ -287,6 +287,7 @@ private final Map<String, String> namespaces2; + private final boolean verbose; /** * Fonction d'extraction de la chaine * @@ -301,11 +302,14 @@ boolean showTouchedFiles, String rules, XPath xpath, - DocumentBuilder builder, Map<String, String> namespaces) { + DocumentBuilder builder, + Map<String, String> namespaces, + boolean verbose) { super(log, encoding, oldParser, showTouchedFiles); this.xpath = xpath; this.rules = rules; this.builder = builder; + this.verbose = verbose; if (namespaces != null && !namespaces.isEmpty()) { this.namespaces = namespaces; @@ -356,12 +360,15 @@ try { // Recherche des clés à partir d'un xpath + if (verbose) { + getLog().info("Start parsing file " + fileToProcess); + } Document doc = builder.parse(fileToProcess.getAbsolutePath()); XPathExpression expression = xpath.compile(rules); NodeList list = (NodeList) expression.evaluate(doc, XPathConstants.NODESET); - if (getLog().isDebugEnabled()) { - getLog().debug("Detected nodes [" + file + "] : " + list.getLength()); + if (verbose) { + getLog().info("Detected nodes [" + file + "] : " + list.getLength()); } for (int index = 0; index < list.getLength(); index++) { Node node = list.item(index); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2010-11-12 11:48:31 UTC (rev 1807) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2010-11-16 08:59:10 UTC (rev 1808) @@ -152,7 +152,9 @@ showTouchedFiles, rules, xpath, - builder, namespaces) { + builder, + namespaces, + isVerbose()) { @Override public File prepareFile(File file) throws IOException { Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2010-11-12 11:48:31 UTC (rev 1807) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2010-11-16 08:59:10 UTC (rev 1808) @@ -149,7 +149,9 @@ showTouchedFiles, rules, xpath, - builder, namespaces) { + builder, + namespaces, + isVerbose()) { @Override public String extract(String i18nString) { String s = null; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2010-11-12 11:48:31 UTC (rev 1807) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2010-11-16 08:59:10 UTC (rev 1808) @@ -111,7 +111,9 @@ showTouchedFiles, rules, xpath, - builder, namespaces) { + builder, + namespaces, + isVerbose()) { @Override public String extract(String i18nString) { String s = null;

1 0

r1807 - in trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin: bundle parser/impl
by tchemit＠users.nuiton.org Nov. 12, 2010

Nov. 12, 2010

Author: tchemit Date: 2010-11-12 12:48:31 +0100 (Fri, 12 Nov 2010) New Revision: 1807 Url: http://nuiton.org/repositories/revision/i18n/1807 Log: add headers + keywords Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java 2010-11-12 11:41:48 UTC (rev 1806) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java 2010-11-12 11:48:31 UTC (rev 1807) @@ -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.plugin.parser.impl; import org.nuiton.processor.Processor; Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2010-11-12 11:41:48 UTC (rev 1806) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2010-11-12 11:48:31 UTC (rev 1807) @@ -2,8 +2,8 @@ * #%L * I18n :: Maven Plugin * - * $Id: ParserValidationMojo.java 1800 2010-11-11 13:02:21Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/i18n/trunk/maven-i18n-plugin/src/main/java/org/nu… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2007 - 2010 CodeLutin * %% Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1806 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org Nov. 12, 2010

Nov. 12, 2010

Author: tchemit Date: 2010-11-12 12:41:48 +0100 (Fri, 12 Nov 2010) New Revision: 1806 Url: http://nuiton.org/repositories/revision/i18n/1806 Log: Evolution #1041: Introduce ParserJspMojo Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java 2010-11-12 11:41:48 UTC (rev 1806) @@ -0,0 +1,143 @@ +package org.nuiton.i18n.plugin.parser.impl; + +import org.nuiton.processor.Processor; +import org.nuiton.processor.ProcessorUtil; +import org.nuiton.processor.filters.DefaultFilter; +import org.nuiton.processor.filters.Filter; + +import java.io.File; +import java.io.IOException; + +/** + * To transform jsp files to valid xml files. + * + * Says : + * <ul> + * <li>Remove jsp directive</li> + * <li>Remove jsp comment</li> + * <li>Remove any tags in attributes (used for example in struts)</li> + * <li>? Other thing</li> + * </ul> + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class JspFileProcessor extends Processor { + + public JspFileProcessor() { + setInputFilter( + new Filter[]{ + new JspDirectiveFilter(), + new JspCommentFilter(), + new JspAttributeWithTagFilter() + } + ); + } + + /** + * @param filein the source file to process + * @param fileout the output file to generate + * @param encoding encoding used to read and write files + * @throws IOException if any io problems while processing + * @since 1.0.4 + */ + public void process(File filein, + File fileout, + String encoding) throws IOException { + ProcessorUtil.doProcess(this, filein, fileout, encoding); + } + + /** + * To remove in attributes any sub tags inside it (used for example in + * struts) from jsp files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ + public static class JspAttributeWithTagFilter extends DefaultFilter { + + private String header = "=" + "\"" + "<"; + + private String footer = "\"" + "/" + ">" + "\""; + + @Override + protected String performInFilter(String ch) { + return "=\"\""; + } + + @Override + protected String performOutFilter(String ch) { + return ch; + } + + protected String getHeader() { + return header; + } + + protected String getFooter() { + return footer; + } + } + + /** + * To remove jsp comment from files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ + public static class JspCommentFilter extends DefaultFilter { + + private String header = "<" + "%" + "-" + "-"; + + private String footer = "-" + "-" + "%" + ">"; + + @Override + protected String performInFilter(String ch) { + return ""; + } + + @Override + protected String performOutFilter(String ch) { + return ch; + } + + protected String getHeader() { + return header; + } + + protected String getFooter() { + return footer; + } + } + + /** + * To remove jsp directive from files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ + public static class JspDirectiveFilter extends DefaultFilter { + + private String header = "<" + "%"; + + private String footer = "%" + ">"; + + @Override + protected String performInFilter(String ch) { + return ""; + } + + @Override + protected String performOutFilter(String ch) { + return ch; + } + + protected String getHeader() { + return header; + } + + protected String getFooter() { + return footer; + } + } +} Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2010-11-12 11:41:48 UTC (rev 1806) @@ -0,0 +1,196 @@ +/* + * #%L + * I18n :: Maven Plugin + * + * $Id: ParserValidationMojo.java 1800 2010-11-11 13:02:21Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/i18n/trunk/maven-i18n-plugin/src/main/java/org/nu… $ + * %% + * 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.plugin.parser.impl; + +import org.nuiton.i18n.plugin.parser.I18nSourceEntry; +import org.nuiton.i18n.plugin.parser.SourceEntry; +import org.nuiton.io.FileUpdater; +import org.nuiton.io.MirroredFileUpdater; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.xpath.XPath; +import java.io.File; +import java.io.IOException; + +/** + * Find i18n keys from jsp files. + * + * Note: this goal must always be invoked before the {@code process-resources} + * phase, otherwise all files will be considered as uptodate. + * + * @author tchemit <chemit(a)codelutin.com> + * @goal parserJsp + * @phase generate-resources + * @since 2.0 + */ +public class ParserJspMojo extends AbstractParserXmlMojo { + + /** + * Root directory of the default entry. + * + * @parameter expression="${i18n.defaultBasedir}" default-value="${basedir}/src/main/webapp" + * @required + */ + protected File defaultBasedir; + + /** + * Default included files to process (ant-like expression). + * + * @parameter expression="${i18n.defaultIncludes}" default-value="**\/**.jsp" + */ + protected String defaultIncludes; + + /** + * Defines the core rules file used to detect i18n keys in jsp files. + * + * Note : If you do not want to use it, set it to empty and fill the + * {@link #userRulesFiles} parameter. + * + * @parameter expression="${i18n.coreRuleFile}" + * @since 2.0 + */ + protected String coreRuleFile; + + /** + * Defines the file name of the getter where to put detected i18n keys + * while getter phase. + * + * @parameter expression="${i18n.outputGetter}" default-value="jsp.getter" + * @since 2.0 + */ + protected String outputGetter; + + /** + * Where to generated temporary processed files. + * + * @parameter expression="${i18n.workdir}" default-value="${basedir}/target/i18n-workdir" + * @since 2.0 + */ + protected File workdir; + + @Override + public String[] getDefaultIncludes() { + return new String[]{defaultIncludes}; + } + + @Override + public String[] getDefaultExcludes() { + return I18nSourceEntry.EMPTY_STRING_ARRAY; + } + + @Override + public File getDefaultBasedir() { + return defaultBasedir; + } + + MirroredFileUpdater entryUpdater; + + @Override + protected boolean onEnterEntry(I18nSourceEntry entry) { + boolean b = super.onEnterEntry(entry); + if (!b) { + + // no skipped entry + // keep the file updater + entryUpdater = (MirroredFileUpdater) entry.getUpdater(); + } + return b; + } + + @Override + public FileUpdater newFileUpdater(SourceEntry entry) { + return new MirroredFileUpdater("", "", entry.getBasedir(), workdir) { + + @Override + public File getMirrorFile(File f) { + String file = + f.getAbsolutePath().substring(prefixSourceDirecotory); + return new File(destinationDirectory + File.separator + file + "~"); + } + }; + } + + @Override + protected String getOutGetter() { + return outputGetter; + } + + @Override + protected String getCoreRuleFile() { + return coreRuleFile; + } + + protected XmlFileParser newXmlFileParser(final XPath xpath, + final DocumentBuilder builder) { + + return new XmlFileParser(getLog(), + getEncoding(), + oldParser, + showTouchedFiles, + rules, + xpath, + builder, namespaces) { + + @Override + public File prepareFile(File file) throws IOException { + + // clean the jsp to make it xml + + File result = entryUpdater.getMirrorFile(file); + createDirectoryIfNecessary(result.getParentFile()); + JspFileProcessor processor = new JspFileProcessor(); + processor.process(file, result, getEncoding()); + return result; + } + + @Override + public String extract(String i18nString) { + String s = null; + if (!i18nString.trim().isEmpty()) { + s = i18nString.trim(); + } + if (getLog().isDebugEnabled()) { + getLog().debug(i18nString + " = " + s); + } + return s; + } + + }; + } + + + @Override + @Deprecated + protected String getKeyModifierStart() { + return "=\\s*[\"\']"; + } + + @Override + @Deprecated + protected String getKeyModifierEnd() { + return "[\"\']"; + } +}

1 0