- Nuiton-utils-commits - mailman.cloud.codelutin.com

[Lutinutil-commits] r1232 - in maven-i18n-plugin/tags: . 0.7
by tchemit＠users.labs.libre-entreprise.org 17 Nov '08

17 Nov '08

Author: tchemit Date: 2008-11-17 11:38:58 +0000 (Mon, 17 Nov 2008) New Revision: 1232 Added: maven-i18n-plugin/tags/0.7/ maven-i18n-plugin/tags/0.7/changelog maven-i18n-plugin/tags/0.7/pom.xml Removed: maven-i18n-plugin/tags/0.7/changelog maven-i18n-plugin/tags/0.7/pom.xml Log: [maven-release-plugin] copy for tag 0.7 Copied: maven-i18n-plugin/tags/0.7 (from rev 1229, maven-i18n-plugin/trunk) Deleted: maven-i18n-plugin/tags/0.7/changelog =================================================================== --- maven-i18n-plugin/trunk/changelog 2008-10-29 10:14:54 UTC (rev 1229) +++ maven-i18n-plugin/tags/0.7/changelog 2008-11-17 11:38:58 UTC (rev 1232) @@ -1,16 +0,0 @@ -ver-0-7 chemit 200810?? - * 20081026 [chemit] add xworks validator parse - * 20081026 [chemit] improve parser mojo logging - -ver-0-6 thimel 20080922 - * 20080925 [chemit] Using lutinpluginutil 0.2 and license-switcher in pom (no more in superpom) - * 20080922 [thimel] Using lutinpluginproject 3.0 - -ver-0-5 chemit 20080824 - * 20080824 [chemit] refactoring code + unificiation des reader et writer pour que cela fonctionne en utf8 - * 20080824 [chemit] suppresion dependance lutinutil - * 20080824 [chemit] passage du projet en utf8 - * 20080824 [chemit] passage en maven 2 layout directory - -ver-0-4 - * [chemit] pas maintenu avant ! Copied: maven-i18n-plugin/tags/0.7/changelog (from rev 1230, maven-i18n-plugin/trunk/changelog) =================================================================== --- maven-i18n-plugin/tags/0.7/changelog (rev 0) +++ maven-i18n-plugin/tags/0.7/changelog 2008-11-17 11:38:58 UTC (rev 1232) @@ -0,0 +1,16 @@ +ver-0-7 chemit 20081117 + * 20081026 [chemit] add xworks validator parse + * 20081026 [chemit] improve parser mojo logging + +ver-0-6 thimel 20080922 + * 20080925 [chemit] Using lutinpluginutil 0.2 and license-switcher in pom (no more in superpom) + * 20080922 [thimel] Using lutinpluginproject 3.0 + +ver-0-5 chemit 20080824 + * 20080824 [chemit] refactoring code + unificiation des reader et writer pour que cela fonctionne en utf8 + * 20080824 [chemit] suppresion dependance lutinutil + * 20080824 [chemit] passage du projet en utf8 + * 20080824 [chemit] passage en maven 2 layout directory + +ver-0-4 + * [chemit] pas maintenu avant ! Deleted: maven-i18n-plugin/tags/0.7/pom.xml =================================================================== --- maven-i18n-plugin/trunk/pom.xml 2008-10-29 10:14:54 UTC (rev 1229) +++ maven-i18n-plugin/tags/0.7/pom.xml 2008-11-17 11:38:58 UTC (rev 1232) @@ -1,96 +0,0 @@ -<?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.codelutin</groupId> - <artifactId>lutinpluginproject</artifactId> - <version>3.0</version> - </parent> - -  - <artifactId>maven-i18n-plugin</artifactId> - - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinprocessor</artifactId> - <version>0.15</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginutil</artifactId> - <version>0.2</version> - <scope>compile</scope> - </dependency> - - </dependencies> - -  -  -  - <name>Plugin maven pour lutini18n</name> - <version>0.7-SNAPSHOT</version> - <description> - Plugin pour maven 2 pour la génération des bundles pour l'internationnalisation des applications java fait par - lutinutil-i18n - </description> - <inceptionYear>2007</inceptionYear> - -  -  -  - - <packaging>maven-plugin</packaging> - - <build> - <plugins> - - </plugins> - </build> - - <properties> - -  - <labs.id>12</labs.id> - -  - <labs.project>lutinutil</labs.project> - - </properties> - -  -  -  - -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -</project> - Copied: maven-i18n-plugin/tags/0.7/pom.xml (from rev 1231, maven-i18n-plugin/trunk/pom.xml) =================================================================== --- maven-i18n-plugin/tags/0.7/pom.xml (rev 0) +++ maven-i18n-plugin/tags/0.7/pom.xml 2008-11-17 11:38:58 UTC (rev 1232) @@ -0,0 +1,95 @@ +<?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.codelutin</groupId> + <artifactId>lutinpluginproject</artifactId> + <version>3.0</version> + </parent> + +  + <artifactId>maven-i18n-plugin</artifactId> + + <dependencies> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinprocessor</artifactId> + <version>0.15</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>0.2</version> + <scope>compile</scope> + </dependency> + + </dependencies> + +  +  +  + <name>Plugin maven pour lutini18n</name> + <version>0.7</version> + <description> + Plugin pour maven 2 pour la génération des bundles pour l'internationnalisation des applications java fait par + lutinutil-i18n + </description> + <inceptionYear>2007</inceptionYear> + +  +  +  + + <packaging>maven-plugin</packaging> + + <build> + <plugins> + + </plugins> + </build> + + <properties> + +  + <labs.id>12</labs.id> + +  + <labs.project>lutinutil</labs.project> + + </properties> + +  +  +  + +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/tags/0.7</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/tags/0.7</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-i18n-plug…</url> + </scm> + +</project> +

1 0

[Lutinutil-commits] r1231 - maven-i18n-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 17 Nov '08

17 Nov '08

Author: tchemit Date: 2008-11-17 11:38:54 +0000 (Mon, 17 Nov 2008) New Revision: 1231 Modified: maven-i18n-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare release 0.7 Modified: maven-i18n-plugin/trunk/pom.xml =================================================================== --- maven-i18n-plugin/trunk/pom.xml 2008-11-17 11:31:55 UTC (rev 1230) +++ maven-i18n-plugin/trunk/pom.xml 2008-11-17 11:38:54 UTC (rev 1231) @@ -1,6 +1,5 @@ <?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"> +<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> @@ -52,7 +51,7 @@   <name>Plugin maven pour lutini18n</name> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> <description> Plugin pour maven 2 pour la génération des bundles pour l'internationnalisation des applications java fait par lutinutil-i18n @@ -87,9 +86,9 @@  <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/tags/0.7</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-i18n-plugin/tags/0.7</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-i18n-plug…</url> </scm> </project>

1 0

[Lutinutil-commits] r1230 - maven-i18n-plugin/trunk
by chemit＠users.labs.libre-entreprise.org 17 Nov '08

17 Nov '08

Author: chemit Date: 2008-11-17 11:31:55 +0000 (Mon, 17 Nov 2008) New Revision: 1230 Modified: maven-i18n-plugin/trunk/changelog Log: prepare release 0.7 (changelog) Modified: maven-i18n-plugin/trunk/changelog =================================================================== --- maven-i18n-plugin/trunk/changelog 2008-10-29 10:14:54 UTC (rev 1229) +++ maven-i18n-plugin/trunk/changelog 2008-11-17 11:31:55 UTC (rev 1230) @@ -1,4 +1,4 @@ -ver-0-7 chemit 200810?? +ver-0-7 chemit 20081117 * 20081026 [chemit] add xworks validator parse * 20081026 [chemit] improve parser mojo logging

1 0

[Lutinutil-commits] r1229 - in lutinutil/trunk: . src/main/java/org/codelutin/i18n src/main/java/org/codelutin/log src/main/java/org/codelutin/util
by chatellier＠users.labs.libre-entreprise.org 29 Oct '08

29 Oct '08

Author: chatellier Date: 2008-10-29 10:14:54 +0000 (Wed, 29 Oct 2008) New Revision: 1229 Removed: lutinutil/trunk/src/main/java/org/codelutin/i18n/I18nf.java Modified: lutinutil/trunk/changelog lutinutil/trunk/pom.xml lutinutil/trunk/src/main/java/org/codelutin/i18n/I18n.java lutinutil/trunk/src/main/java/org/codelutin/i18n/Language.java lutinutil/trunk/src/main/java/org/codelutin/i18n/LocaleEditor.java lutinutil/trunk/src/main/java/org/codelutin/log/LutinLog.java lutinutil/trunk/src/main/java/org/codelutin/log/LutinLogEvent.java lutinutil/trunk/src/main/java/org/codelutin/log/LutinLogFactory.java lutinutil/trunk/src/main/java/org/codelutin/log/LutinProgressEvent.java lutinutil/trunk/src/main/java/org/codelutin/log/ProgressMonitorFrame.java lutinutil/trunk/src/main/java/org/codelutin/util/ApplicationConfig.java lutinutil/trunk/src/main/java/org/codelutin/util/ObjectUtil.java Log: Remove duplicated i18nf class and remove deprecated i18n code Version bump to next major snapshot Modified: lutinutil/trunk/changelog =================================================================== --- lutinutil/trunk/changelog 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/changelog 2008-10-29 10:14:54 UTC (rev 1229) @@ -1,3 +1,6 @@ +ver 1.0 ??? ??? + * Remove deprecated I18n._ and replace by temporary code + ver-0-31 chemit 2008???? * always build javadoc * Change group id Modified: lutinutil/trunk/pom.xml =================================================================== --- lutinutil/trunk/pom.xml 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/pom.xml 2008-10-29 10:14:54 UTC (rev 1229) @@ -53,7 +53,7 @@  <name>Lutin utilities library</name> - <version>0.32-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> <description>Library of usefull class to be used in any project.</description> <inceptionYear>2004</inceptionYear> Modified: lutinutil/trunk/src/main/java/org/codelutin/i18n/I18n.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/i18n/I18n.java 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/src/main/java/org/codelutin/i18n/I18n.java 2008-10-29 10:14:54 UTC (rev 1229) @@ -30,15 +30,16 @@ package org.codelutin.i18n; -import org.codelutin.i18n.bundle.I18nBundleManager; -import org.codelutin.util.ConverterUtil; - import java.net.URL; -import java.text.MessageFormat; import java.util.Arrays; import java.util.Locale; import java.util.logging.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.i18n.bundle.I18nBundleManager; +import org.codelutin.util.ConverterUtil; + /** * This class is a facility for internationalization. To use it in your soft, * you can either : @@ -60,6 +61,9 @@ */ public class I18n { + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static Log log = LogFactory.getLog(I18n.class); + public static final String ISO_8859_1_ENCONDING = "ISO-8859-1"; public static final String UTF_8_ENCONDING = "UTF-8"; @@ -102,16 +106,6 @@ } /** - * Initialise la librairie. - * - * @param language une chaine representant la langue à utiliser fr, en, ... - * @deprecated - */ - public static void init(String language) { - init(language, null, null); - } - - /** * Initialise la librairie * * @param language une chaine representant la langue à utiliser fr, en, ... @@ -159,14 +153,11 @@ /** * Retourne la chaine traduite si possible. * - * @param message message formate avec la m?me syntaxe que {@link MessageFormat} + * @param message message formate avec la meme syntaxe que {@link String#format} * @param args les parametres pour le message. * @return la traduction si possible ou la chaine passee en parametre * sinon. - * @deprecated use {@link I18nf#_} that used String.format. When all project are - * switched this method use String.format too. */ - @Deprecated public static String _(String message, Object... args) { String result = message; Language language = loader == null ? null : loader.getLanguage(); @@ -174,49 +165,46 @@ result = language.translate(message); } try { - return applyFilter(MessageFormat.format(result, args)); + return applyFilter(String.format(result, args)); } catch (Exception eee) { try { - return applyFilter(MessageFormat.format(message, args)); + return applyFilter(String.format(message, args)); } catch (Exception zzz) { - Logger.getLogger("org.codelutin.i18n.I18n").warning(_("lutinutil.error.i18n.untranslated.message", message)); + log.warn(I18n._("lutinutil.error.i18n.untranslated.message", message)); return applyFilter(message); } } } /** - * Retourne la chaine passé en argument - * - * @param message la chaine à traduire - * @return la chaine passée en argument - * sinon. - */ - public static String n_(String message) { - return message; - } - - /** * Retourne la chaine passée en argument. * * @param message message formate avec la meme syntaxe que {@link - * MessageFormat}Message + * java.text.MessageFormat} * @param args les parametres pour le message. * @return le message passe en argument mais formatte * avec les parametres - * @deprecated use {@link I18nf#n_} that used String.format. When all project are - * switched this method use String.format too. */ - @Deprecated public static String n_(String message, Object... args) { try { - return MessageFormat.format(message, args); + return String.format(message, args); } catch (Exception eee) { - Logger.getLogger("org.codelutin.i18n.I18n").warning(I18n._("lutinutil.error.i18n.unformated.message", message, Arrays.toString(args))); + log.warn(I18n._("lutinutil.error.i18n.unformated.message", message, Arrays.toString(args))); return message; } } + /** + * Retourne la chaine passé en argument + * + * @param message la chaine à traduire + * @return la chaine passée en argument + * sinon. + */ + public static String n_(String message) { + return message; + } + public static String getRecordFilePath() { return recordFilePath; } @@ -308,17 +296,19 @@ * @return the required loader with given encoding */ protected static synchronized I18nLoader getLoader(String encoding) { - if (encoding == null) { - encoding = DEFAULT_ENCODING; + + String localEncoding = encoding; + if (localEncoding == null) { + localEncoding = DEFAULT_ENCODING; } if (loader == null) { - loader = new I18nLoader(encoding); + loader = new I18nLoader(localEncoding); } else { - if (!loader.getEncoding().equals(encoding)) { + if (!loader.getEncoding().equals(localEncoding)) { // close previous loader but not the bundle manager loader.close(); // open a new loader - loader = new I18nLoader(encoding); + loader = new I18nLoader(localEncoding); } } return loader; Deleted: lutinutil/trunk/src/main/java/org/codelutin/i18n/I18nf.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/i18n/I18nf.java 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/src/main/java/org/codelutin/i18n/I18nf.java 2008-10-29 10:14:54 UTC (rev 1229) @@ -1,84 +0,0 @@ -/* *##% Lutin utilities library - * Copyright (C) 2004 - 2008 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>. ##%* */ - -package org.codelutin.i18n; - - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.Arrays; - -/** - * Transition class during project switch between MessageFormat.format syntax - * to String.format syntax. - * - * @author poussin - * @version $Revision$ - * <p/> - * Last update: $Date$ - * by : $Author$ - */ -public class I18nf extends I18n { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(I18nf.class); - - /** - * Retourne la chaine traduite si possible. - * - * @param message message formate avec la meme syntaxe que {@link String#format} - * @param args les parametres pour le message. - * @return la traduction si possible ou la chaine passee en parametre - * sinon. - */ - public static String _(String message, Object... args) { - String result = message; - Language language = loader == null ? null : loader.getLanguage(); - if (language != null) { - result = language.translate(message); - } - try { - return applyFilter(String.format(result, args)); - } catch (Exception eee) { - try { - return applyFilter(String.format(message, args)); - } catch (Exception zzz) { - log.warn(I18n._("lutinutil.error.i18n.untranslated.message", message)); - return applyFilter(message); - } - } - } - - /** - * Retourne la chaine passée en argument. - * - * @param message message formate avec la meme syntaxe que {@link - * java.text.MessageFormat} - * @param args les parametres pour le message. - * @return le message passe en argument mais formatte - * avec les parametres - */ - public static String n_(String message, Object... args) { - try { - return String.format(message, args); - } catch (Exception eee) { - log.warn(I18n._("lutinutil.error.i18n.unformated.message", message, Arrays.toString(args))); - return message; - } - } -} Modified: lutinutil/trunk/src/main/java/org/codelutin/i18n/Language.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/i18n/Language.java 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/src/main/java/org/codelutin/i18n/Language.java 2008-10-29 10:14:54 UTC (rev 1229) @@ -148,7 +148,7 @@ return sentence; } try { - Enumeration e = resource.propertyNames(); + Enumeration<?> e = resource.propertyNames(); // Look for the given sentence through all translations while (e.hasMoreElements()) { String key = (String) e.nextElement(); Modified: lutinutil/trunk/src/main/java/org/codelutin/i18n/LocaleEditor.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/i18n/LocaleEditor.java 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/src/main/java/org/codelutin/i18n/LocaleEditor.java 2008-10-29 10:14:54 UTC (rev 1229) @@ -32,6 +32,9 @@ */ public class LocaleEditor extends JComboBox { + /** serialVersionUID */ + private static final long serialVersionUID = -6777873426011538807L; + protected Locale[] type; public static LocaleEditor newEditor(Locale... type) { Modified: lutinutil/trunk/src/main/java/org/codelutin/log/LutinLog.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/log/LutinLog.java 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/src/main/java/org/codelutin/log/LutinLog.java 2008-10-29 10:14:54 UTC (rev 1229) @@ -146,6 +146,7 @@ /** * apres un start le temps avant de mettre le progress en marche (<=0 pour jamais) + * @param time time */ public void setActivateProgressMonitorTime(long time) { activeProgressMonitorTime = time; @@ -167,7 +168,7 @@ fireProgressEvent(LutinProgressEvent.ProgressType.start); } /** - * @return + * @return ProgressMonitorFrame */ protected Component getProgressMonitorFrame() { if (progressMonitorFrame == null) { @@ -181,8 +182,9 @@ } /** - * si on a demande a ce que la tache soit arretee - * @return + * Si on a demande a ce que la tache soit arretee. + * + * @return stopped state */ public boolean isAskStopTask() { boolean result = progressState == ProgressState.stopAsked; @@ -218,9 +220,9 @@ } /** - * donne le timeout particulier pour une tache + * Donne le timeout particulier pour une tache. * - * @return + * @return timeout */ public long getTimeout() { return timeout; Modified: lutinutil/trunk/src/main/java/org/codelutin/log/LutinLogEvent.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/log/LutinLogEvent.java 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/src/main/java/org/codelutin/log/LutinLogEvent.java 2008-10-29 10:14:54 UTC (rev 1229) @@ -48,7 +48,12 @@ user, trace, debug, info, warn, error, fatal } - /** @param source */ + /** + * @param source + * @param logType + * @param msg + * @param eee + */ public LutinLogEvent(Object source, LogType logType, String msg, Throwable eee) { super(source); this.logType = logType; Modified: lutinutil/trunk/src/main/java/org/codelutin/log/LutinLogFactory.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/log/LutinLogFactory.java 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/src/main/java/org/codelutin/log/LutinLogFactory.java 2008-10-29 10:14:54 UTC (rev 1229) @@ -63,7 +63,7 @@ return instance; } - static public LutinLog getLutinLog(Class clazz) { + static public LutinLog getLutinLog(Class<?> clazz) { LutinLogFactory factory = LutinLogFactory.getInstance(); LutinLog result = (LutinLog) factory.getInstance(clazz); return result; Modified: lutinutil/trunk/src/main/java/org/codelutin/log/LutinProgressEvent.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/log/LutinProgressEvent.java 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/src/main/java/org/codelutin/log/LutinProgressEvent.java 2008-10-29 10:14:54 UTC (rev 1229) @@ -44,7 +44,10 @@ min, max, value, askStop, cancelAskStop, start, end } - /** @param source */ + /** + * @param source + * @param type + */ public LutinProgressEvent(Object source, ProgressType type) { super(source); this.type = type; Modified: lutinutil/trunk/src/main/java/org/codelutin/log/ProgressMonitorFrame.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/log/ProgressMonitorFrame.java 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/src/main/java/org/codelutin/log/ProgressMonitorFrame.java 2008-10-29 10:14:54 UTC (rev 1229) @@ -45,6 +45,8 @@ public class ProgressMonitorFrame extends JFrame { + /** serialVersionUID */ + private static final long serialVersionUID = 3878314562707954612L; protected LutinLog lutinLog; protected JLabel label; protected JProgressBar progress; Modified: lutinutil/trunk/src/main/java/org/codelutin/util/ApplicationConfig.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/ApplicationConfig.java 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/src/main/java/org/codelutin/util/ApplicationConfig.java 2008-10-29 10:14:54 UTC (rev 1229) @@ -21,7 +21,7 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.codelutin.i18n.I18nf._; +import static org.codelutin.i18n.I18n._; import java.io.File; import java.io.FileWriter; Modified: lutinutil/trunk/src/main/java/org/codelutin/util/ObjectUtil.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/ObjectUtil.java 2008-10-26 13:58:03 UTC (rev 1228) +++ lutinutil/trunk/src/main/java/org/codelutin/util/ObjectUtil.java 2008-10-29 10:14:54 UTC (rev 1229) @@ -33,7 +33,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import static org.codelutin.i18n.I18nf._; +import static org.codelutin.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

[Lutinutil-commits] r1228 - maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser
by tchemit＠users.labs.libre-entreprise.org 26 Oct '08

26 Oct '08

Author: tchemit Date: 2008-10-26 13:58:03 +0000 (Sun, 26 Oct 2008) New Revision: 1228 Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java Log: normalize property name Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java 2008-10-26 13:42:43 UTC (rev 1227) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java 2008-10-26 13:58:03 UTC (rev 1228) @@ -65,7 +65,7 @@ /** * treate default entry * - * @parameter expression="${i18n.treateDefault}" default-value="true" + * @parameter expression="${i18n.treateDefaultEntry}" default-value="true" */ protected boolean treateDefaultEntry;

1 0

[Lutinutil-commits] r1227 - in maven-i18n-plugin/trunk: . src/main/java/org/codelutin/i18n/plugin src/main/java/org/codelutin/i18n/plugin/parser src/main/java/org/codelutin/i18n/plugin/parser/impl src/main/resources
by tchemit＠users.labs.libre-entreprise.org 26 Oct '08

26 Oct '08

Author: tchemit Date: 2008-10-26 13:42:43 +0000 (Sun, 26 Oct 2008) New Revision: 1227 Added: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserValidation.java maven-i18n-plugin/trunk/src/main/resources/validation.rules Modified: maven-i18n-plugin/trunk/changelog maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/AbstractI18nPlugin.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/SourceEntry.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJava.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJaxx.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserSwixat.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserXml.java Log: * add validator parser * improve parser mojos Modified: maven-i18n-plugin/trunk/changelog =================================================================== --- maven-i18n-plugin/trunk/changelog 2008-10-24 08:33:10 UTC (rev 1226) +++ maven-i18n-plugin/trunk/changelog 2008-10-26 13:42:43 UTC (rev 1227) @@ -1,3 +1,7 @@ +ver-0-7 chemit 200810?? + * 20081026 [chemit] add xworks validator parse + * 20081026 [chemit] improve parser mojo logging + ver-0-6 thimel 20080922 * 20080925 [chemit] Using lutinpluginutil 0.2 and license-switcher in pom (no more in superpom) * 20080922 [thimel] Using lutinpluginproject 3.0 Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/AbstractI18nPlugin.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/AbstractI18nPlugin.java 2008-10-24 08:33:10 UTC (rev 1226) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/AbstractI18nPlugin.java 2008-10-26 13:42:43 UTC (rev 1227) @@ -20,7 +20,6 @@ import org.codelutin.i18n.plugin.parser.ParserEvent; import org.apache.maven.plugin.AbstractMojo; -import org.codelutin.i18n.plugin.PluginHelper; import java.io.File; import java.util.ArrayList; @@ -53,7 +52,7 @@ /** * Repertoire des fichiers generes i18n. * - * @parameter expression="${i18n.out}" default-value="${basedir}/target/gen/i18n" + * @parameter expression="${i18n.out}" default-value="${basedir}/target/generated-sources/i18n" * @required */ protected File out; @@ -136,26 +135,5 @@ this.events.remove(parserEvent); } - /** - * Construit une chaine de log formatée. - * - * @param msg le prefix du message - * @param nbFiles le nombre de fichiers actuellement traités - * @param time le time de traitement de ce fichier - * @param all le temps de traitement de tous les fichiers - * @return la chaine de log formatée - */ - protected String getLogEntry(String msg, int nbFiles, long time, long all) { - long now = System.nanoTime(); - long delta = now - time; - String s = "[" + artifactId + "] i18n." + getClass().getSimpleName() + " : " + msg; - if (time > 0) { - s += " (" + PluginHelper.convertTime(delta) + ")"; - } - if (all > 0 && nbFiles > -1) { - s += "(total time:" + PluginHelper.convertTime(now - all) + ") ( ~ " + PluginHelper.convertTime(((now - all) / (nbFiles + 1))) + " / file)"; - } - return s; - } } Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/SourceEntry.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/SourceEntry.java 2008-10-24 08:33:10 UTC (rev 1226) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/SourceEntry.java 2008-10-26 13:42:43 UTC (rev 1227) @@ -19,6 +19,7 @@ import org.apache.maven.plugin.logging.Log; import org.codehaus.plexus.util.DirectoryScanner; +import org.codelutin.util.FileUpdater; import java.io.File; import java.lang.annotation.Annotation; @@ -54,9 +55,16 @@ protected File basedir; protected String[] includes; - protected String[] excludes; + /** Files to be find */ + protected String[] files; + protected String[] skipFiles; + + protected String skipMessage; + + protected FileUpdater updater; + public String[] getExcludes() { return excludes; } @@ -105,6 +113,18 @@ return excludes != null && excludes.length > 0; } + /** + * Test if a file is up to date and not to be treated. + * <p/> + * + * @param file the file path to test + * @return <code>true</code> if file is up to date and do not need to be parsed + * @see FileUpdater + */ + public final boolean isFileUptodate(File file) { + return updater != null && updater.isFileUpToDate(file); + } + public String[] getIncludedFiles(File defaultBasedir, String[] defaultIncludes, String[] defaultExcludes) { // normalized entry if (!hasSrc()) { @@ -131,6 +151,7 @@ return foundFiles; } + @Override public String toString() { StringBuilder sb = new StringBuilder("basedir:").append(basedir); if (includes != null) { @@ -214,4 +235,27 @@ return getAnnotation(f, loader, annotationClass, log); } + public String getSkipMessage() { + return skipMessage; + } + + public String[] getFiles() { + return files; + } + + public String[] getSkipFiles() { + return skipFiles; + } + + public int getFoudFiles() { + return skipFiles.length + files.length; + } + + public FileUpdater getUpdater() { + return updater; + } + + public void setUpdater(FileUpdater updater) { + this.updater = updater; + } } Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java 2008-10-24 08:33:10 UTC (rev 1226) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java 2008-10-26 13:42:43 UTC (rev 1227) @@ -17,17 +17,18 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ package org.codelutin.i18n.plugin.parser; -import org.codelutin.i18n.plugin.SourceEntry; -import org.codelutin.i18n.plugin.AbstractI18nPlugin; -import org.codelutin.i18n.plugin.parser.ParserEvent; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugin.logging.SystemStreamLog; +import org.codelutin.i18n.plugin.AbstractI18nPlugin; import org.codelutin.i18n.plugin.PluginHelper; import org.codelutin.i18n.plugin.PluginHelper.I18nProperties; +import org.codelutin.i18n.plugin.SourceEntry; import org.codelutin.i18n.plugin.parser.event.KeysModifier; import org.codelutin.util.FileUpdater; import org.codelutin.util.FileUtil; +import java.beans.Introspector; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -59,6 +60,8 @@ /** @return the default src directory to use in directory scanner */ protected abstract File getDefaultBasedir(); + public abstract FileUpdater newFileUpdater(SourceEntry entry); + /** * treate default entry * @@ -71,7 +74,7 @@ * * @parameter expression="${i18n.entries}" */ - protected SourceEntry[] entries; + protected MySourceEntry[] entries; protected I18nProperties result; @@ -84,10 +87,11 @@ protected boolean touchFile; protected List<File> treadedFiles; - protected SourceEntry currentEntry; + @Override + public ParserLog getLog() { + return (ParserLog) super.getLog(); + } - protected FileUpdater updater; - public void init() { t0 = System.nanoTime(); result = new I18nProperties(encoding); @@ -101,20 +105,6 @@ treadedFiles = new ArrayList<File>(); } - /** - * Test if a file is up to date and not to be treated. - * <p/> - * This method is called on a file only in not {@link #strictMode}. - * <p/> - * If {@link #updater} is null, then it considers that file as always to be treated. - * - * @param file the file path to test - * @return <code>true</code> if file is up to date and do not need to be parsed - * @see FileUpdater - */ - protected final boolean isFileUptodate(File file) { - return updater != null && updater.isFileUpToDate(file); - } /* * (non-Javadoc) @@ -122,6 +112,8 @@ */ public void execute() throws MojoExecutionException, MojoFailureException { + setLog(new ParserLog(this)); + init(); if (entries == null || entries.length == 0 && !treateDefaultEntry) { // nothing to do @@ -148,7 +140,11 @@ saveFile.delete(); int i = treadedFiles.size(); - getLog().info(getLogEntry(" success <getter:" + getOutGetter() + "> [treated file(s) : " + i + '/' + fileTreated + "]", fileTreated, 0, t0)); + if (fileTreated == 0) { + getLog().info(getLog().getLogEntry("parsing is done. [no files treated]", 0, 0, t0)); + } else { + getLog().info(getLog().getLogEntry("parsing is done. [treated file(s) : " + i + '/' + fileTreated + "]", fileTreated, 0, t0)); + } } catch (Exception e) { getLog().error("Error code parsing ", e); @@ -167,41 +163,43 @@ addDefaultEntry(); } long t00 = System.nanoTime(); - for (SourceEntry entry : entries) { - if (!entry.useForGoal(getClass().getSimpleName())) { + for (MySourceEntry entry : this.entries) { + + getLog().setEntry(entry); + + boolean skip = entry.init(this); + + if (skip) { if (verbose) { - getLog().debug("skip entry " + entry.toString()); + getLog().infoEntry("skip", entry.getSkipMessage()); } continue; } - currentEntry = entry; - // get found files - String[] foundFiles = getFilesForEntry(entry); + long t000 = System.nanoTime(); + int nbFiles = entry.getFiles().length; if (verbose) { - getLog().debug(getLogEntry(" parse <" + entry + "> [incoming file(s) : " + foundFiles.length + "]", 0, 0, 0)); - } else { - getLog().info(getLogEntry(" parse <" + entry.getBasedir() + "> [incoming file(s) : " + foundFiles.length + "]", 0, 0, 0)); + getLog().infoEntry("start", getLog().getLogEntry("[incoming file(s) : " + entry.getFoudFiles() + "]", 0, 0, 0)); } + // launch parser for found files - parseEntry(entry.getBasedir(), foundFiles); - fileTreated += foundFiles.length; + parseEntry(entry); + if (verbose) { - getLog().debug(getLogEntry(" success <" + entry.getBasedir() + "> [treated file(s) : " + foundFiles.length + "]", foundFiles.length - 1, t000, t00)); + // log skipped files + for (String skipFile : entry.getSkipFiles()) { + getLog().file = new File(entry.getBasedir(), skipFile); + getLog().infoFile("skip", null); + } } + fileTreated += nbFiles; + if (verbose) { + getLog().infoEntry("end", getLog().getLogEntry("[treated file(s) : " + nbFiles + "]", nbFiles, t000, t00)); + } t00 = System.nanoTime(); } } - /** - * Obtain all the relative path of files to treate for a given entry. - * - * @param entry the given entry - * @return the list of relative path of files for the given entry - */ - protected String[] getFilesForEntry(SourceEntry entry) { - return entry.getIncludedFiles(getDefaultBasedir(), getDefaultIncludes(), getDefaultExcludes()); - } /** * Add the default entry to entries given in configuration. @@ -209,53 +207,52 @@ * This is a convinient method to simplify the configuration of the plugin. */ protected void addDefaultEntry() { - List<SourceEntry> list; + List<MySourceEntry> list; if (entries == null || entries.length == 0) { - list = new ArrayList<SourceEntry>(); + list = new ArrayList<MySourceEntry>(); } else { - list = new ArrayList<SourceEntry>(Arrays.asList(entries)); + list = new ArrayList<MySourceEntry>(Arrays.asList(entries)); } - list.add(new SourceEntry()); - entries = list.toArray(new SourceEntry[list.size()]); + list.add(new MySourceEntry()); + entries = list.toArray(new MySourceEntry[list.size()]); } /** * launch parsing on a given entry. * - * @param basedir the basedir of the entry - * @param files the relative path of files to be treated for the entry. + * @param entry currentEntry to treate * @throws IOException if any io pb. */ - protected void parseEntry(File basedir, String[] files) throws IOException { + protected final void parseEntry(SourceEntry entry) throws IOException { long t00 = System.nanoTime(); - for (int i = 0; i < files.length; i++) { + String[] files = entry.getFiles(); + for (int i = 0, max = files.length; i < max; i++) { String file1 = files[i]; long t000 = System.nanoTime(); - String fileName = basedir.getAbsolutePath() + File.separator + file1; + String fileName = entry.getBasedir().getAbsolutePath() + File.separator + file1; File file = new File(fileName); for (ParserEvent event : events) { event.eventChangeFile(file); } + getLog().file = file; + touchFile = false; int size = result.size(); - if (strictMode || !isFileUptodate(file)) { - // on parse toujours en mode strict ou quand le fichier n'est pas à jour - getLog().info("parseFile " + file); - parseFile(file); + if (verbose) { + getLog().infoFile("parse", null); } + parseFile(file); // Detection de nouvelles cles, sauvegarde du fichier pour pouvoir le restaurer en cas de plantage if (size != result.size()) { saveGetterFile(); } if (touchFile) { - if (verbose) { - getLog().info("touched file " + file); - } + getLog().infoFile("touch", null); treadedFiles.add(file); - if (verbose) { - getLog().debug(getLogEntry(fileName, i, t000, t00)); + if (getLog().isDebugEnabled()) { + getLog().debug(getLog().getLogEntry(fileName, i, t000, t00)); } } for (ParserEvent event : events) { @@ -273,4 +270,143 @@ File getterFile = PluginHelper.getGetterFile(out, getOutGetter(), false); result.store(getterFile); } + + + public static class ParserLog extends SystemStreamLog { + + private SourceEntry entry; + + protected File file; + + protected String parser; + + public ParserLog(AbstractI18nParser parser) { + this.parser = "i18n:" + Introspector.decapitalize(parser.getClass().getSimpleName()) + " on " + parser.artifactId; + } + + @Override + public void info(CharSequence content) { + print(0, "INFO", null, content.toString()); + } + + @Override + public void debug(CharSequence content) { + print(0, "DEBUG", null, content.toString()); + } + + public void infoEntry(String action, CharSequence content) { + print(0, "INFO", action, entry.toString() + (content == null ? "" : " - " + content.toString())); + } + + public void infoFile(String action, String content) { + print(2, "INFO", action, file.toString() + (content == null ? "" : " - " + content)); + } + + private void print(int start, String prefix, String context, String content) { + StringBuilder sb = new StringBuilder(); + sb.append("[").append(prefix).append("] [").append(parser).append("] "); + + for (int i = 0; i < start; i++) { + sb.append(' '); + } + if (context != null) { + sb.append("<").append(context).append("> "); + } + sb.append(content); + System.out.println(sb.toString()); + } + + public void setEntry(SourceEntry entry) { + this.entry = entry; + } + + /** + * Construit une chaine de log formatée. + * + * @param msg le prefix du message + * @param nbFiles le nombre de fichiers actuellement traités + * @param time le time de traitement de ce fichier + * @param all le temps de traitement de tous les fichiers + * @return la chaine de log formatée + */ + protected String getLogEntry(String msg, int nbFiles, long time, long all) { + long now = System.nanoTime(); + long delta = now - time; + String s = msg; + if (time > 0) { + s += " (" + PluginHelper.convertTime(delta) + ")"; + } + if (all > 0) { + s += "(total time:" + PluginHelper.convertTime(now - all) + ")"; + } + if (nbFiles > 0) { + s += " ( ~ " + PluginHelper.convertTime(((now - all) / (nbFiles))) + " / file)"; + } + return s; + } + + } + + public static class MySourceEntry extends SourceEntry { + + public boolean init(AbstractI18nParser mojo) { + if (!useForGoal(mojo.getClass().getSimpleName())) { + // skip not for this goal + skipMessage = "exclude for this goal."; + return true; + } + + String[] files = getFilesForEntry(mojo); + + if (files.length == 0) { + // skip no file found + skipMessage = "no file found."; + return true; + } + setUpdater(mojo.newFileUpdater(this)); + + if (mojo.strictMode || updater == null) { + // mojo strict mode or not updater, so force all files + skipFiles = new String[0]; + this.files = files; + return false; + } + + List<String> listFiles = new ArrayList<String>(); + List<String> listSkipFiles = new ArrayList<String>(); + + // test if have any file + for (String foundFile : files) { + File file = new File(getBasedir(), foundFile); + if (isFileUptodate(file)) { + listSkipFiles.add(foundFile); + } else { + listFiles.add(foundFile); + } + } + boolean todo = !listFiles.isEmpty(); + if (!todo) { + // skip, no file out-of -date + skipMessage = "all files are up to date."; + this.skipFiles = listSkipFiles.toArray(new String[listSkipFiles.size()]); + this.files = new String[0]; + return true; + } + this.skipFiles = listSkipFiles.toArray(new String[listSkipFiles.size()]); + this.files = listFiles.toArray(new String[listFiles.size()]); + return false; + } + + + /** + * Obtain all the relative path of files to treate for a given entry. + * + * @param mojo the given mojo + * @return the list of relative path of files for the given entry + */ + protected String[] getFilesForEntry(AbstractI18nParser mojo) { + return getIncludedFiles(mojo.getDefaultBasedir(), mojo.getDefaultIncludes(), mojo.getDefaultExcludes()); + } + + } } Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJava.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJava.java 2008-10-24 08:33:10 UTC (rev 1226) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJava.java 2008-10-26 13:42:43 UTC (rev 1227) @@ -19,15 +19,16 @@ package org.codelutin.i18n.plugin.parser.impl; import org.apache.maven.project.MavenProject; +import org.codelutin.i18n.plugin.SourceEntry; import org.codelutin.i18n.plugin.parser.AbstractI18nParser; import org.codelutin.i18n.plugin.parser.ParserEvent; import org.codelutin.i18n.plugin.parser.ParserException; import org.codelutin.processor.filters.I18nFilter; +import org.codelutin.util.FileUpdater; import org.codelutin.util.FileUpdaterHelper; import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.io.InputStreamReader; import java.io.LineNumberReader; @@ -71,20 +72,24 @@ protected File cp; @Override - protected String[] getDefaultIncludes() { + public String[] getDefaultIncludes() { return new String[]{defaultIncludes}; } @Override - protected String[] getDefaultExcludes() { + public String[] getDefaultExcludes() { return new String[]{}; } @Override - protected File getDefaultBasedir() { + public File getDefaultBasedir() { return defaultBasedir; } + public FileUpdater newFileUpdater(SourceEntry entry) { + return FileUpdaterHelper.newJavaFileUpdater(entry.getBasedir(), cp); + } + @Override protected String getKeyModifierStart() { return "_\\(\\s*\""; @@ -108,12 +113,6 @@ filter = new I18nFilter(); } - protected void parseEntry(File basedir, String[] files) throws IOException { - // prepare new file updater - updater = FileUpdaterHelper.newJavaFileUpdater(basedir, cp); - super.parseEntry(basedir, files); - } - @Override public void parseFile(File srcFile) { try { Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJaxx.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJaxx.java 2008-10-24 08:33:10 UTC (rev 1226) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJaxx.java 2008-10-26 13:42:43 UTC (rev 1227) @@ -18,10 +18,11 @@ package org.codelutin.i18n.plugin.parser.impl; +import org.codelutin.i18n.plugin.SourceEntry; +import org.codelutin.util.FileUpdater; import org.codelutin.util.FileUpdaterHelper; import java.io.File; -import java.io.IOException; /** * Récupération des chaine à traduire depuis les fichiers xml Jaxx. @@ -54,19 +55,17 @@ protected String rulesJaxx; @Override - protected String[] getDefaultIncludes() { + public String[] getDefaultIncludes() { return new String[]{defaultIncludes}; } @Override - protected String[] getDefaultExcludes() { + public String[] getDefaultExcludes() { return new String[]{}; } - protected void parseEntry(File basedir, String[] files) throws IOException { - // prepare new file updater - updater = FileUpdaterHelper.newJavaFileUpdater(basedir, defaultGenerateBasedir); - super.parseEntry(basedir, files); + public FileUpdater newFileUpdater(SourceEntry entry) { + return FileUpdaterHelper.newJavaFileUpdater(entry.getBasedir(), defaultGenerateBasedir); } @Override Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserSwixat.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserSwixat.java 2008-10-24 08:33:10 UTC (rev 1226) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserSwixat.java 2008-10-26 13:42:43 UTC (rev 1227) @@ -18,6 +18,9 @@ package org.codelutin.i18n.plugin.parser.impl; +import org.codelutin.i18n.plugin.SourceEntry; +import org.codelutin.util.FileUpdater; + /** * Recuperation des chaines à traduire depuis les fichiers xml Swixat. * @@ -49,15 +52,19 @@ protected String rulesSwixat; @Override - protected String[] getDefaultIncludes() { + public String[] getDefaultIncludes() { return new String[]{defaultIncludes}; } @Override - protected String[] getDefaultExcludes() { + public String[] getDefaultExcludes() { return new String[]{defaultExcludes}; } + public FileUpdater newFileUpdater(SourceEntry entry) { + return null; + } + @Override protected String getKeyModifierStart() { return "=\\s*[\"\']"; Copied: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserValidation.java (from rev 1226, maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserJaxx.java) =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserValidation.java (rev 0) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserValidation.java 2008-10-26 13:42:43 UTC (rev 1227) @@ -0,0 +1,126 @@ +/* + * *##% Plugin maven pour lutini18n + * Copyright (C) 2007 - 2008 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>. ##%* */ + +package org.codelutin.i18n.plugin.parser.impl; + +import org.codelutin.i18n.plugin.SourceEntry; +import org.codelutin.util.FileUpdater; +import org.codelutin.util.MirroredFileUpdater; + +import java.io.File; + +/** + * Récupération des chaine à traduire depuis les fichiers xml de validation. + * <p/> + * Le goal doit etre execute avant que les resources soient copiees dans target/classes + * pour rendre operatne le file updater (sinon lesfichiers sont toujours a jour...) + * + * @author chemit + * @goal parserValidation + * @phase generate-resources + */ +public class ParserValidation extends ParserXml { + + /** + * Source entries (src+includes+excludes) . + * + * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/**-validation.xml" + */ + protected String defaultIncludes; + + /** + * Where jaxx files should have been generated. + * + * @parameter expression="${i18n.cp}" default-value="${basedir}/target/classes" + */ + protected File cp; + + /** + * Regles xml. + * + * @parameter expression="${i18n.rulesValidation}" default-value="validation.rules" + */ + protected String rulesValidation; + + /** + * default src for an entry. + * + * @parameter expression="${i18n.defaultBasedir}" default-value="${basedir}/src/resources" + * @required + */ + protected File defaultBasedir; + + public String[] getDefaultIncludes() { + return new String[]{defaultIncludes}; + } + + public String[] getDefaultExcludes() { + return new String[]{}; + } + + @Override + public File getDefaultBasedir() { + return defaultBasedir; + } + + public FileUpdater newFileUpdater(SourceEntry entry) { + return new MirroredFileUpdater(entry.getBasedir(), this.cp) { + public File getMirrorFile(File f) { + String file = f.getAbsolutePath().substring(this.prefixSourceDirecotory); + return new File(this.destinationDirectory + File.separator + file); + } + }; + } + + protected String getOutGetter() { + return "validation.getter"; + } + + protected String getKeyModifierStart() { + return "=\\s*[\"\']"; + } + + protected String getKeyModifierEnd() { + return "[\"\']"; + } + + protected String getFileRules() { + return rulesValidation; + } + + protected String getCoreFileRules() { + return "validation.rules"; + } + + public void setRulesJaxx(String rulesJaxx) { + this.rulesValidation = rulesJaxx; + } + + /* + * (non-Javadoc) + * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) + */ + public String extract(String i18nString) { + String s = i18nString.length() == 0 ? null : i18nString; + if (getLog().isDebugEnabled()) { + getLog().debug(i18nString + " = " + s); + } + return s; + } + +} \ No newline at end of file Property changes on: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserValidation.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserXml.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserXml.java 2008-10-24 08:33:10 UTC (rev 1226) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserXml.java 2008-10-26 13:42:43 UTC (rev 1227) @@ -86,7 +86,7 @@ */ public void parseFile(File file) { NodeList list; - InputSource inputSource = new InputSource(file.getAbsolutePath()); // TODO: A d�placer pour les performances + InputSource inputSource = new InputSource(file.getAbsolutePath()); // TODO: A deplacer pour les performances try { int size = result.size(); @@ -131,7 +131,7 @@ } } - protected File getDefaultBasedir() { + public File getDefaultBasedir() { return defaultBasedir; } @@ -150,7 +150,7 @@ // load core rules readInputStream = loadRulesFile(getCoreFileRules()); if (verbose) { - getLog().debug("core rules : " + readInputStream); + getLog().info("core rules : " + getCoreFileRules()); } result.append(readInputStream); @@ -158,7 +158,7 @@ // add custom rules readInputStream = loadRulesFile(fileRules); if (verbose) { - getLog().debug("custom rules : " + readInputStream); + getLog().info("custom rules : " + fileRules); } result.append(" | ").append(readInputStream); } Copied: maven-i18n-plugin/trunk/src/main/resources/validation.rules (from rev 1226, maven-i18n-plugin/trunk/src/main/resources/jaxx.rules) =================================================================== --- maven-i18n-plugin/trunk/src/main/resources/validation.rules (rev 0) +++ maven-i18n-plugin/trunk/src/main/resources/validation.rules 2008-10-26 13:42:43 UTC (rev 1227) @@ -0,0 +1,3 @@ +# Règles pour la validation XWorks + +//validators/field/field-validator/message Property changes on: maven-i18n-plugin/trunk/src/main/resources/validation.rules ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native

1 0

[Lutinutil-commits] r1226 - lutinutil/trunk/src/site
by chatellier＠users.labs.libre-entreprise.org 24 Oct '08

24 Oct '08

Author: chatellier Date: 2008-10-24 08:33:10 +0000 (Fri, 24 Oct 2008) New Revision: 1226 Modified: lutinutil/trunk/src/site/site.xml Log: Update skin Modified: lutinutil/trunk/src/site/site.xml =================================================================== --- lutinutil/trunk/src/site/site.xml 2008-10-24 08:10:06 UTC (rev 1225) +++ lutinutil/trunk/src/site/site.xml 2008-10-24 08:33:10 UTC (rev 1226) @@ -6,7 +6,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2</version> + <version>0.2.1</version> </skin> <bannerLeft>

1 0

[Lutinutil-commits] r1225 - lutinutil/trunk/src/main/java/org/codelutin/util
by chatellier＠users.labs.libre-entreprise.org 24 Oct '08

24 Oct '08

Author: chatellier Date: 2008-10-24 08:10:06 +0000 (Fri, 24 Oct 2008) New Revision: 1225 Modified: lutinutil/trunk/src/main/java/org/codelutin/util/ListenerSet.java Log: Refactor template name Modified: lutinutil/trunk/src/main/java/org/codelutin/util/ListenerSet.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/ListenerSet.java 2008-10-24 08:08:52 UTC (rev 1224) +++ lutinutil/trunk/src/main/java/org/codelutin/util/ListenerSet.java 2008-10-24 08:10:06 UTC (rev 1225) @@ -65,12 +65,12 @@ * * @see org.codelutin.util.CategorisedListenerSet */ -public class ListenerSet<Listerner> implements Iterable<Listerner> { // ListenerSet +public class ListenerSet<Listener> implements Iterable<Listener> { // ListenerSet /** DOCUMENTME Description of the Field DOCUMENTME Description of the Field DOCUMENTME Description of the Field */ // protected Class<T> listenerClass = null; /** DOCUMENTME Description of the Field */ - protected HashSet<Reference<Listerner>> listeners = new HashSet<Reference<Listerner>>(); + protected HashSet<Reference<Listener>> listeners = new HashSet<Reference<Listener>>(); /** DOCUMENTME Constructor for the ListenerSet object */ public ListenerSet() { @@ -97,12 +97,12 @@ * si l'objet n'est pas du type passé en argument du constructeur * une IllegalArgumentException est levée. */ - public void add(Listerner l) { + public void add(Listener l) { if (l == null) { return; } // if (listenerClass == null || listenerClass.isInstance(l)) { - TransparenteWeakReference<Listerner> ref = new TransparenteWeakReference<Listerner>(l); + TransparenteWeakReference<Listener> ref = new TransparenteWeakReference<Listener>(l); listeners.add(ref); // } else { // throw new IllegalArgumentException("Listener object (" @@ -116,7 +116,7 @@ * * @param ls The feature to be added to the All attribute */ - public void addAll(ListenerSet<Listerner> ls) { + public void addAll(ListenerSet<Listener> ls) { // if (listenerClass == null || (ls.listenerClass != null && // listenerClass.isAssignableFrom(ls.listenDOCUMENTME Description of the ExceptionerClass))) { listeners.addAll(ls.listeners); @@ -165,8 +165,8 @@ * * @return DOCUMENTME Description of the Return Value */ - public Iterator<Listerner> iterator() { - return new ReferenceIterator<Listerner>(listeners.iterator()); + public Iterator<Listener> iterator() { + return new ReferenceIterator<Listener>(listeners.iterator()); } /** @@ -174,8 +174,8 @@ * * @param l DOCUMENTME Description of the Parameter */ - public void remove(Listerner l) { - TransparenteWeakReference<Listerner> ref = new TransparenteWeakReference<Listerner>(l); + public void remove(Listener l) { + TransparenteWeakReference<Listener> ref = new TransparenteWeakReference<Listener>(l); listeners.remove(ref); }

1 0

[Lutinutil-commits] r1224 - lutinutil/trunk/src/main/java/org/codelutin/util
by chatellier＠users.labs.libre-entreprise.org 24 Oct '08

24 Oct '08

Author: chatellier Date: 2008-10-24 08:08:52 +0000 (Fri, 24 Oct 2008) New Revision: 1224 Modified: lutinutil/trunk/src/main/java/org/codelutin/util/package.html Log: Encodage Modified: lutinutil/trunk/src/main/java/org/codelutin/util/package.html =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/package.html 2008-10-15 13:01:44 UTC (rev 1223) +++ lutinutil/trunk/src/main/java/org/codelutin/util/package.html 2008-10-24 08:08:52 UTC (rev 1224) @@ -1,11 +1,11 @@ <html> <body> <h1>Lutin util</h1> -Ensemble de classe Java permettant de simplifier le d�veloppement en -factorisant des besoins que l'on retrouve dans tous les d�veloppement. -On y trouve de fontion de travail sur les cha�nes de caract�res. Des +Ensemble de classe Java permettant de simplifier le développement en +factorisant des besoins que l'on retrouve dans tous les développement. +On y trouve de fontion de travail sur les chaînes de caractères. Des fonctions de parsage des arguements de la ligne de commande. Des fonctions -permettant tr�s simplement de rechercher une resource (images, fichier de -propri�t�s, ...) +permettant très simplement de rechercher une resource (images, fichier de +propriétés, ...) </body> </html> \ No newline at end of file

1 0

[Lutinutil-commits] r1223 - maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin
by tchemit＠users.labs.libre-entreprise.org 15 Oct '08

15 Oct '08

Author: tchemit Date: 2008-10-15 13:01:44 +0000 (Wed, 15 Oct 2008) New Revision: 1223 Modified: maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/SwitchLicenseMojo.java Log: skip this goal for site and pom packaging Modified: maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/SwitchLicenseMojo.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/SwitchLicenseMojo.java 2008-10-15 12:59:09 UTC (rev 1222) +++ maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/SwitchLicenseMojo.java 2008-10-15 13:01:44 UTC (rev 1223) @@ -113,8 +113,16 @@ protected long timestamp; + protected boolean skip; + protected void init() throws IOException { + if ("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging())) { + // nothing to be done for this type of packaging + skip=true; + return; + } + timestamp = System.nanoTime(); // obtain all java source files to be treated @@ -143,6 +151,11 @@ super.execute(); + if (skip) { + getLog().info("skip switch goal for packaging " + project.getPackaging()); + return; + } + if (javaFilesToTreate.isEmpty()) { getLog().warn("no java source files found to be treated."); return;

1 0