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

[Lutinutil-commits] r1426 - lutinpluginutil/trunk
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:38:08 +0000 (Mon, 20 Apr 2009) New Revision: 1426 Modified: lutinpluginutil/trunk/pom.xml Log: [maven-release-plugin] prepare release 0.4 Modified: lutinpluginutil/trunk/pom.xml =================================================================== --- lutinpluginutil/trunk/pom.xml 2009-04-20 10:37:41 UTC (rev 1425) +++ lutinpluginutil/trunk/pom.xml 2009-04-20 10:38:08 UTC (rev 1426) @@ -15,7 +15,7 @@ <artifactId>lutinpluginutil</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> <dependencies> @@ -89,9 +89,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/lutinpluginutil/tags/0.4</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/lutinpluginutil/tags/0.4</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutinpluginutil…</url> </scm>

1 0

[Lutinutil-commits] r1425 - lutinpluginutil/trunk
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:37:41 +0000 (Mon, 20 Apr 2009) New Revision: 1425 Modified: lutinpluginutil/trunk/changelog.txt Log: bump versions Modified: lutinpluginutil/trunk/changelog.txt =================================================================== --- lutinpluginutil/trunk/changelog.txt 2009-04-20 10:37:22 UTC (rev 1424) +++ lutinpluginutil/trunk/changelog.txt 2009-04-20 10:37:41 UTC (rev 1425) @@ -1,4 +1,4 @@ -0.4 ??? 200904?? +0.4 chemit 20090420 * 20090417 [chemit] - use lutinproject 3.5.3 - use doxia-module-jrst instead on maven-jrst-plugin

1 0

[Lutinutil-commits] r1424 - lutinpluginutil/trunk
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:37:22 +0000 (Mon, 20 Apr 2009) New Revision: 1424 Modified: lutinpluginutil/trunk/changelog.txt lutinpluginutil/trunk/pom.xml Log: bump versions Modified: lutinpluginutil/trunk/changelog.txt =================================================================== --- lutinpluginutil/trunk/changelog.txt 2009-04-17 09:08:13 UTC (rev 1423) +++ lutinpluginutil/trunk/changelog.txt 2009-04-20 10:37:22 UTC (rev 1424) @@ -1,5 +1,5 @@ 0.4 ??? 200904?? - * 20090417 [chemit] - use lutinproject 3.5.xx + * 20090417 [chemit] - use lutinproject 3.5.3 - use doxia-module-jrst instead on maven-jrst-plugin 0.3 chemit 20090218 Modified: lutinpluginutil/trunk/pom.xml =================================================================== --- lutinpluginutil/trunk/pom.xml 2009-04-17 09:08:13 UTC (rev 1423) +++ lutinpluginutil/trunk/pom.xml 2009-04-20 10:37:22 UTC (rev 1424) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.5.2</version> + <version>3.5.3</version> </parent> <artifactId>lutinpluginutil</artifactId>

1 0

[Lutinutil-commits] r1423 - in maven-i18n-plugin/trunk: . src/main/java/org/codelutin/i18n/plugin src/main/java/org/codelutin/i18n/plugin/parser src/site src/site/rst
by tchemit＠users.labs.libre-entreprise.org 17 Apr '09

17 Apr '09

Author: tchemit Date: 2009-04-17 09:08:13 +0000 (Fri, 17 Apr 2009) New Revision: 1423 Added: maven-i18n-plugin/trunk/src/site/rst/ maven-i18n-plugin/trunk/src/site/rst/Todo.rst maven-i18n-plugin/trunk/src/site/rst/index.rst Modified: maven-i18n-plugin/trunk/changelog.txt maven-i18n-plugin/trunk/pom.xml maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/AbstractI18nPlugin.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Generate.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Getter.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java maven-i18n-plugin/trunk/src/site/site.xml Log: - replace bundles paramters from tyep String[] to String type to make easier configuration - use lutinproject 3.5.xx - use lutinpluginutil 0.4 Modified: maven-i18n-plugin/trunk/changelog.txt =================================================================== --- maven-i18n-plugin/trunk/changelog.txt 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/changelog.txt 2009-04-17 09:08:13 UTC (rev 1423) @@ -1,3 +1,8 @@ +0.11 chemit 20090311 + * 20090417 [chemit] - replace bundles paramters from tyep String[] to String type to make easier configuration + - use lutinproject 3.5.xx + - use lutinpluginutil 0.4 + 0.10 chemit 20090311 * 20090223 [chemit] will skip get and gen goal if no getters were registred while parsing goals 0.9 chemit 20090218 Modified: maven-i18n-plugin/trunk/pom.xml =================================================================== --- maven-i18n-plugin/trunk/pom.xml 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/pom.xml 2009-04-17 09:08:13 UTC (rev 1423) @@ -9,7 +9,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5.2</version> </parent> <artifactId>maven-i18n-plugin</artifactId> @@ -46,7 +46,7 @@ <scope>compile</scope> </dependency> - <dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>${maven.version}</version> @@ -88,7 +88,7 @@ <maven.version>2.0.10</maven.version> <processor.version>0.17</processor.version> - <lutinpluginutil.version>0.3</lutinpluginutil.version> + <lutinpluginutil.version>0.4-SNAPSHOT</lutinpluginutil.version> </properties> <build> @@ -99,7 +99,6 @@  <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.3</version> <executions> <execution> <goals> @@ -109,21 +108,20 @@ </executions> </plugin> -  +  <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.4</version> + <artifactId>maven-site-plugin</artifactId> <configuration> - <defaultLocale>fr</defaultLocale> + <locales>fr</locales> + <siteDirectory>src/site</siteDirectory> </configuration> - <executions> - <execution> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> </plugin> </plugins> </build> 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 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/AbstractI18nPlugin.java 2009-04-17 09:08:13 UTC (rev 1423) @@ -15,7 +15,6 @@ * 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; import org.apache.maven.plugin.AbstractMojo; @@ -23,7 +22,6 @@ import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -38,16 +36,13 @@ * Le nombre de getters détectés pendant le cycle de vie du build. */ private static int NB_GETTER_FILES = 0; - /** * Répertoire de stockage des fichiers i18n pour la recuperation des fichiers * de traduction entre librairie */ protected static final String DIRECTORY_INSTALL = "i18n" + File.separatorChar; - /** les bundles par defaut utilisés, si aucun bundle n'est renseigné. */ - protected static final String[] DEFAULT_BUNDLES = new String[]{"fr_FR", "en_GB"}; - + //protected static final String[] DEFAULT_BUNDLES = new String[]{"fr_FR", "en_GB"}; /** * Nom du projet. * @@ -55,16 +50,14 @@ * @readonly */ protected String artifactId; - /** * Langues des bundles generes. * - * Note: Si aucun bundle n'est definie, on utilise par defaut {@link #DEFAULT_BUNDLES}. * - * @parameter expression="${i18n.bundles}" + * @parameter expression="${i18n.bundles}" default-value="fr_FR,en_GB" + * @required */ - protected String[] bundles = DEFAULT_BUNDLES; - + protected String bundles; /** * Repertoire sources des fichiers i18n. * @@ -72,7 +65,6 @@ * @required */ protected File src; - /** * Repertoire des fichiers generes i18n. * @@ -80,7 +72,6 @@ * @required */ protected File out; - /** * encoding a utiliser pour charger et sauver les bundles * @@ -88,7 +79,6 @@ * @required */ protected String encoding; - /** * Met les fichiers generes dans le repertoire des sources i18n. * @@ -97,7 +87,6 @@ * @parameter expression="${i18n.genSrc}" default-value="true" */ protected boolean genSrc; - /** * Active la modification de cle. * @@ -106,7 +95,6 @@ * @parameter expression="${i18n.keysModifier}" default-value="false" */ protected boolean keysModifier; - /** * verbose flag * @@ -115,7 +103,6 @@ * @parameter expression="${i18n.verbose}" default-value="${maven.verbose}" */ protected boolean verbose; - /** * conserve les anciens fichiers de traduction avec un suffix ~ * @@ -124,7 +111,6 @@ * @parameter expression="${i18n.keepBackup}" default-value="false" */ protected boolean keepBackup; - /** * ne conserve que les clef scannees (et donc traite tous les fichiers) * @@ -134,10 +120,9 @@ * @parameter expression="${i18n.strictMode}" default-value="false" */ protected boolean strictMode; - /** Liste des évènements */ protected List<ParserEvent> events = new ArrayList<ParserEvent>(); - + protected String[] bundlesToUse; /**logger verbeux */ protected I18nLogger verboseLog; @@ -162,16 +147,13 @@ public void init() { verboseLog = new I18nLogger(this); - + if (verbose) { getLog().info("config - verbose mode is on"); } - // set default bundle in none specified - if (bundles == null || bundles.length == 0 || (bundles.length == 1 && (bundles[0] == null || bundles[0].trim().isEmpty()))) { - if (verbose) { - getLog().info("config - use default bundles " + Arrays.toString(DEFAULT_BUNDLES)); - } - bundles = DEFAULT_BUNDLES; + bundlesToUse = bundles.split(","); + for (int i = 0, j = bundlesToUse.length; i < j; i++) { + bundlesToUse[i] = bundlesToUse[i].trim(); } } @@ -184,8 +166,8 @@ * @return <code>true</code> si des getters ont etes enregistres pendant * le cycle de vie, <code>false</code> sinon. */ - protected boolean needGeneration(){ - boolean needGeneration = NB_GETTER_FILES > 0; + protected boolean needGeneration() { + boolean needGeneration = NB_GETTER_FILES > 0; return needGeneration; } @@ -202,5 +184,4 @@ protected I18nLogger getVerboseLog() { return verboseLog; } - } Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Generate.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Generate.java 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Generate.java 2009-04-17 09:08:13 UTC (rev 1423) @@ -51,7 +51,7 @@ return; } - for (String bundle : bundles) { + for (String bundle : bundlesToUse) { try { // Merge File bundleSrc = PluginHelper.getI18nFile(src, artifactId, bundle, false); Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Getter.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Getter.java 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Getter.java 2009-04-17 09:08:13 UTC (rev 1423) @@ -74,7 +74,7 @@ } // Création des bundles - for (String bundle : bundles) { + for (String bundle : bundlesToUse) { File bundleOut = PluginHelper.getI18nFile(out, artifactId, bundle, false); FileUtil.copy(bundleGetters, bundleOut); if (verbose) { 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 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java 2009-04-17 09:08:13 UTC (rev 1423) @@ -153,7 +153,7 @@ // Anciennes cles disponnibles //fixme : pourquoi on utilise un bundle precis ? le premier ici, je ne comprends pas - File oldLanguageFile = PluginHelper.getI18nFile(src, artifactId, bundles[0], true); + File oldLanguageFile = PluginHelper.getI18nFile(src, artifactId, bundlesToUse[0], true); oldLanguage.load(oldLanguageFile); Copied: maven-i18n-plugin/trunk/src/site/rst/Todo.rst (from rev 1409, maven-i18n-plugin/trunk/src/site/fr/rst/Todo.rst) =================================================================== --- maven-i18n-plugin/trunk/src/site/rst/Todo.rst (rev 0) +++ maven-i18n-plugin/trunk/src/site/rst/Todo.rst 2009-04-17 09:08:13 UTC (rev 1423) @@ -0,0 +1,4 @@ +TODO +==== + +Any idea ? Property changes on: maven-i18n-plugin/trunk/src/site/rst/Todo.rst ___________________________________________________________________ Name: svn:mergeinfo + Copied: maven-i18n-plugin/trunk/src/site/rst/index.rst (from rev 1409, maven-i18n-plugin/trunk/src/site/fr/rst/index.rst) =================================================================== --- maven-i18n-plugin/trunk/src/site/rst/index.rst (rev 0) +++ maven-i18n-plugin/trunk/src/site/rst/index.rst 2009-04-17 09:08:13 UTC (rev 1423) @@ -0,0 +1,40 @@ +Introduction +------------ + +Maven I18n Plugin +================= + +The Maven I18n Plugin is used to compute i18n bundles for a given maven module. + +Goals Overview +~~~~~~~~~~~~~~ + +The I18n plugin has the following goals: + + * **i18n:parserJava** parse Java sources. + + * **i18n:parserJaxx** parse Jaxx sources. + + * **i18n:parserSwixat** parse Jaxx sources. + + * **i18n:parserValidation** parse XWorks validation sources. + + * **i18n:parserJavaActionConfig** parse des actions jaxx. + + * **i18n:parserJavaTabConfig** parse des onglets jaxx. + + * **i18n:get** assembly getter computed by parser-like goals. + + * **i18n:gen** generate i18n bundle from getters. + + * **i18n:help** display help. + +Usage +~~~~~ + +Instructions on how to use the Help Plugin can be found in **usages** page. + +Examples +~~~~~~~~ + + to be done. Property changes on: maven-i18n-plugin/trunk/src/site/rst/index.rst ___________________________________________________________________ Name: svn:mergeinfo + Modified: maven-i18n-plugin/trunk/src/site/site.xml =================================================================== --- maven-i18n-plugin/trunk/src/site/site.xml 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/src/site/site.xml 2009-04-17 09:08:13 UTC (rev 1423) @@ -40,6 +40,7 @@ <item name="parserSwixat" href="parserSwixat-mojo.html"/> <item name="parserJavaActionConfig" href="parserJavaActionConfig-mojo.html"/> <item name="parserJavaTabConfig" href="parserJavaTabConfig-mojo.html"/> + <item name="parserXWorks" href="parserValidation-mojo.html"/> <item name="get" href="get-mojo.html"/> <item name="gen" href="gen-mojo.html"/> <item name="help" href="help-mojo.html"/>

1 0

[Lutinutil-commits] r1422 - maven-i18n-plugin/trunk/src/site
by tchemit＠users.labs.libre-entreprise.org 17 Apr '09

17 Apr '09

Author: tchemit Date: 2009-04-17 09:08:10 +0000 (Fri, 17 Apr 2009) New Revision: 1422 Removed: maven-i18n-plugin/trunk/src/site/fr/ maven-i18n-plugin/trunk/src/site/xdoc/ Log: - replace bundles paramters from tyep String[] to String type to make easier configuration - use lutinproject 3.5.xx - use lutinpluginutil 0.4

1 0

[Lutinutil-commits] r1421 - in lutinpluginutil/trunk: . src/site src/site/rst
by tchemit＠users.labs.libre-entreprise.org 17 Apr '09

17 Apr '09

Author: tchemit Date: 2009-04-17 08:37:53 +0000 (Fri, 17 Apr 2009) New Revision: 1421 Added: lutinpluginutil/trunk/src/site/rst/ lutinpluginutil/trunk/src/site/rst/Todo.rst lutinpluginutil/trunk/src/site/rst/index.rst Modified: lutinpluginutil/trunk/changelog.txt lutinpluginutil/trunk/pom.xml Log: - use lutinproject 3.5.xx - use doxia-module-jrst instead on maven-jrst-plugin Modified: lutinpluginutil/trunk/changelog.txt =================================================================== --- lutinpluginutil/trunk/changelog.txt 2009-04-17 08:37:50 UTC (rev 1420) +++ lutinpluginutil/trunk/changelog.txt 2009-04-17 08:37:53 UTC (rev 1421) @@ -1,3 +1,7 @@ +0.4 ??? 200904?? + * 20090417 [chemit] - use lutinproject 3.5.xx + - use doxia-module-jrst instead on maven-jrst-plugin + 0.3 chemit 20090218 * 20090210 [chemit] use lutinproject 3.4 * 20090111 [chemit] use lutinpluginproject 3.3 Modified: lutinpluginutil/trunk/pom.xml =================================================================== --- lutinpluginutil/trunk/pom.xml 2009-04-17 08:37:50 UTC (rev 1420) +++ lutinpluginutil/trunk/pom.xml 2009-04-17 08:37:53 UTC (rev 1421) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5.2</version> </parent> <artifactId>lutinpluginutil</artifactId> @@ -66,21 +66,20 @@ <defaultGoal>install</defaultGoal> <plugins> -  +  <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.4</version> + <artifactId>maven-site-plugin</artifactId> <configuration> - <defaultLocale>fr</defaultLocale> + <locales>fr</locales> + <siteDirectory>src/site</siteDirectory> </configuration> - <executions> - <execution> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> </plugin> </plugins> </build> Copied: lutinpluginutil/trunk/src/site/rst/Todo.rst (from rev 1400, lutinpluginutil/trunk/src/site/fr/rst/Todo.rst) =================================================================== --- lutinpluginutil/trunk/src/site/rst/Todo.rst (rev 0) +++ lutinpluginutil/trunk/src/site/rst/Todo.rst 2009-04-17 08:37:53 UTC (rev 1421) @@ -0,0 +1,2 @@ +TODO +==== Property changes on: lutinpluginutil/trunk/src/site/rst/Todo.rst ___________________________________________________________________ Name: svn:mergeinfo + Copied: lutinpluginutil/trunk/src/site/rst/index.rst (from rev 1400, lutinpluginutil/trunk/src/site/fr/rst/index.rst) =================================================================== --- lutinpluginutil/trunk/src/site/rst/index.rst (rev 0) +++ lutinpluginutil/trunk/src/site/rst/index.rst 2009-04-17 08:37:53 UTC (rev 1421) @@ -0,0 +1,20 @@ +LutinPluginUtil +=============== + +.. contents:: + + +Présentation +------------ + +Ensemble de classe Java permettant de simplifier le développement de plugin +maven en factorisant des besoins que l'on retrouve dans tous les développements... + +FileUpdater +----------- + +Mecanisme permettant de savoir si un fichier est a jour (utile pour les plugins de generation). + + +**Veuillez consulter la JavaDoc pour de plus ample details sur les differentes +librairies.** Property changes on: lutinpluginutil/trunk/src/site/rst/index.rst ___________________________________________________________________ Name: svn:mergeinfo +

1 0

[Lutinutil-commits] r1420 - lutinpluginutil/trunk/src/site
by tchemit＠users.labs.libre-entreprise.org 17 Apr '09

17 Apr '09

Author: tchemit Date: 2009-04-17 08:37:50 +0000 (Fri, 17 Apr 2009) New Revision: 1420 Removed: lutinpluginutil/trunk/src/site/fr/ Log: - use lutinproject 3.5.xx - use doxia-module-jrst instead on maven-jrst-plugin

1 0

[Lutinutil-commits] r1419 - lutinutil/trunk
by chatellier＠users.labs.libre-entreprise.org 09 Apr '09

09 Apr '09

Author: chatellier Date: 2009-04-09 12:37:28 +0000 (Thu, 09 Apr 2009) New Revision: 1419 Modified: lutinutil/trunk/pom.xml Log: Fix xsd location Modified: lutinutil/trunk/pom.xml =================================================================== --- lutinutil/trunk/pom.xml 2009-04-07 08:59:58 UTC (rev 1418) +++ lutinutil/trunk/pom.xml 2009-04-09 12:37:28 UTC (rev 1419) @@ -1,5 +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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>

1 0

[Lutinutil-commits] r1418 - in lutinutil/trunk/src/main: java/org/codelutin/util resources/i18n
by chatellier＠users.labs.libre-entreprise.org 07 Apr '09

07 Apr '09

Author: chatellier Date: 2009-04-07 08:59:58 +0000 (Tue, 07 Apr 2009) New Revision: 1418 Modified: lutinutil/trunk/src/main/java/org/codelutin/util/Resource.java lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties Log: Fix i18n Modified: lutinutil/trunk/src/main/java/org/codelutin/util/Resource.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/Resource.java 2009-04-06 15:34:47 UTC (rev 1417) +++ lutinutil/trunk/src/main/java/org/codelutin/util/Resource.java 2009-04-07 08:59:58 UTC (rev 1418) @@ -128,7 +128,7 @@ try { return file.toURI().toURL(); } catch (MalformedURLException eee) { - log.warn(_("lutinuitl.error.convert.file.to.url", file, eee.getMessage())); + log.warn(_("lutinutil.error.convert.file.to.url", file, eee.getMessage())); } } @@ -517,8 +517,7 @@ String name = file.getAbsolutePath(); if (log.isTraceEnabled()) { - log - .trace("directory: " + repository + " name: " + log.trace("directory: " + repository + " name: " + name); } @@ -543,7 +542,7 @@ } return urlList; } catch (MalformedURLException eee) { - throw new ResourceException(_("lutinuitl.error.convert.file.to.url", repository + " (pattern " + pattern + ") ", eee.getMessage())); + throw new ResourceException(_("lutinutil.error.convert.file.to.url", repository + " (pattern " + pattern + ") ", eee.getMessage())); //throw new ResourceException("Le fichier n'a pu être converti en URL", eee); } } Modified: lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties =================================================================== --- lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties 2009-04-06 15:34:47 UTC (rev 1417) +++ lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties 2009-04-07 08:59:58 UTC (rev 1418) @@ -1,18 +1,18 @@ hello\ you\ \!=hello you \! -lutinuitl.error.convert.file.to.url= lutinutil.debug.objectutil.create=Try to create %s with %s lutinutil.debug.objectutil.instantiate=Can't instantiate %s with params %s lutinutil.debug.objectutil.invoke=Invoke %s with %s -lutinutil.error.add.url.in.classloader= +lutinutil.error.add.url.in.classloader=Can't add url in classloader %1$s for reason %2$s lutinutil.error.applicationconfig.save=Can't save config in file %s +lutinutil.error.convert.file.to.url=Can't convert %s for reason %s lutinutil.error.convertor.noValue=No value specified for converter %s -lutinutil.error.get.url.from.zip= +lutinutil.error.get.url.from.zip=Error while reading %s : %s lutinutil.error.i18n.unformated.message=Message can't be formatted\: '%s' with arguments %s lutinutil.error.i18n.unfound.country=could not find country from '%s', use default country '%s' lutinutil.error.i18n.unfound.language=could not find language from '%s', use default language '%s' lutinutil.error.i18n.untranslated.message=Message can't be translated\: '%s' lutinutil.error.no.convertor=no convertor found for type %2$s and objet '%1$s' -lutinutil.error.resource.not.found= +lutinutil.error.resource.not.found=Can't find resource : %s lutinutil.error.unfound.month=could not found month from '%s', use default month '%s' lutinutil.error.unknown.url.type=could not treate unknown type of url %1$s lutinutil.error.url.convertor=a problem occurs while converting value '%s' with url convertor %s for reason %s Modified: lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties =================================================================== --- lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties 2009-04-06 15:34:47 UTC (rev 1417) +++ lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties 2009-04-07 08:59:58 UTC (rev 1418) @@ -1,11 +1,10 @@ hello\ you\ \!= -lutinuitl.error.convert.file.to.url=Le fichier '%1$s' n'a pas pu \u00EAtre converti en URL pour la raison suivante \: %2$S -lutinuitl.error.resource.not.found=La resource '%1$s' n'a pas \u00E9t\u00E9 trouv\u00E9e lutinutil.debug.objectutil.create=Essaye de cr\u00E9er %s avec %s lutinutil.debug.objectutil.instantiate=Ne peut pas instancier %s avec les param\u00EAtres %s lutinutil.debug.objectutil.invoke=Invocation de %s avec %s -lutinutil.error.add.url.in.classloader=Can't add url in classloader %1$s for reason %2$s +lutinutil.error.add.url.in.classloader=Impossible d'ajouter une url dans le classloader %s pour la raison : %s lutinutil.error.applicationconfig.save=Impossible de sauvegarder le fichier de configuration dans %s +lutinutil.error.convert.file.to.url=Le fichier '%1$s' n'a pas pu \u00EAtre converti en URL pour la raison suivante \: %2$S lutinutil.error.convertor.noValue=Aucune valeur \u00E0 convertir pour le convertisseur %s lutinutil.error.get.url.from.zip=Erreur lors de la lecture du fichier compress\u00E9 %1$s \: %2$s lutinutil.error.i18n.unformated.message=Le message suivant n''a pas pu \u00EAtre format\u00E9 \: '%s' avec les arguments %s @@ -13,7 +12,7 @@ lutinutil.error.i18n.unfound.language=n'a pas pu trouver la langue \u00E0 partir de '%s', utilise la langue par d\u00E9faut '%s' lutinutil.error.i18n.untranslated.message=Le message suivant n'a pas pu \u00EAtre traduit \: '%s' lutinutil.error.no.convertor=Aucun convertisseur trouv\u00E9 pour le type %2$s et l''objet '%1$s' -lutinutil.error.resource.not.found= +lutinutil.error.resource.not.found=Impossible de trouver la ressource : %s lutinutil.error.unfound.month=n'a pas pu trouv\u00E9 le mois \u00E0 partir de '%s', utilise le mois par d\u00E9faut '%s' lutinutil.error.unknown.url.type=could not treate unknown type of url %1$s lutinutil.error.url.convertor=Un probl\u00E8me est apparu lors de la convertion en url de '%s' avec le convertisseur %s pour la raison suivante \: %s

1 0

[Lutinutil-commits] r1417 - lutinutil/trunk/src/main/java/org/codelutin/log
by chatellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: chatellier Date: 2009-04-06 15:34:47 +0000 (Mon, 06 Apr 2009) New Revision: 1417 Modified: lutinutil/trunk/src/main/java/org/codelutin/log/UserLog.java Log: Comment class. Modified: lutinutil/trunk/src/main/java/org/codelutin/log/UserLog.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/log/UserLog.java 2009-03-30 12:13:39 UTC (rev 1416) +++ lutinutil/trunk/src/main/java/org/codelutin/log/UserLog.java 2009-04-06 15:34:47 UTC (rev 1417) @@ -1,5 +1,5 @@ /* *##% Lutin utilities library - * Copyright (C) 2004 - 2008 CodeLutin + * Copyright (C) 2004 - 2009 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 @@ -17,7 +17,6 @@ package org.codelutin.log; - import java.awt.GraphicsEnvironment; import javax.swing.JOptionPane; import org.apache.commons.logging.Log; @@ -40,27 +39,37 @@ public class UserLog { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(UserLog.class); + private static Log log = LogFactory.getLog(UserLog.class); - static public enum Level { + public static enum Level { DEBUG, INFO, WARN, ERROR, FATAL } - + protected static ListenerSet<Object> listeners = new ListenerSet<Object>(); protected static boolean graphicUI = true; public static void addListeners(ListenerSet<Object> l) { listeners.add(l); } + public static void removeListeners(ListenerSet<Object> l) { listeners.remove(l); } - - + + /** + * Enable/disable UI log display. + * + * @param graphicUI <tt>true</tt> to enable + */ public static void setGraphicUI(boolean graphicUI) { UserLog.graphicUI = graphicUI; } + /** + * Return true if UI login is enabled and available. + * + * @return graphicUI enable + */ public static boolean isGraphicUI() { return graphicUI && !GraphicsEnvironment.isHeadless(); } @@ -72,80 +81,153 @@ * * @param level le niveau du message * @param msg le message - * @param eee l'exception s'il y en a une + * @param cause l'exception s'il y en a une */ - protected static void show(Level level, String msg, Throwable eee) { + protected static void show(Level level, String msg, Throwable cause) { try { listeners.fire("setText", msg); - } catch (Exception zzz) { - log.warn("Can't call setText on listener", zzz); + } catch (Exception e) { + log.warn("Can't call setText on listener", e); } - + if (isGraphicUI()) { String title = level.name(); int type = JOptionPane.PLAIN_MESSAGE; switch (level) { - case DEBUG: - type = JOptionPane.PLAIN_MESSAGE; - break; - case INFO: - type = JOptionPane.INFORMATION_MESSAGE; - break; - case WARN: - type = JOptionPane.WARNING_MESSAGE; - break; - case ERROR: - case FATAL: - type = JOptionPane.ERROR_MESSAGE; - break; - } + case DEBUG: + type = JOptionPane.PLAIN_MESSAGE; + break; + case INFO: + type = JOptionPane.INFORMATION_MESSAGE; + break; + case WARN: + type = JOptionPane.WARNING_MESSAGE; + break; + case ERROR: + case FATAL: + type = JOptionPane.ERROR_MESSAGE; + break; + } JOptionPane.showMessageDialog(null, msg, title, type); } } + /** + * Log message using commons-logging and display message box if UI is + * available and non disabled. + * + * @param msg message to display + */ public static void debug(String msg) { - log.debug(msg); + if (log.isDebugEnabled()) { + log.debug(msg); + } show(Level.DEBUG, msg, null); } - public static void debug(String msg, Throwable eee) { - log.debug(msg, eee); - show(Level.DEBUG, msg, eee); + + /** + * Log message using commons-logging and display message box if UI is + * available and non disabled. + * + * @param msg message to display + * @param cause exception cause + */ + public static void debug(String msg, Throwable cause) { + if (log.isDebugEnabled()) { + log.debug(msg, cause); + } + show(Level.DEBUG, msg, cause); } + /** + * Log message using commons-logging and display message box if UI is + * available and non disabled. + * + * @param msg message to display + */ public static void info(String msg) { log.info(msg); show(Level.INFO, msg, null); } - public static void info(String msg, Throwable eee) { - log.info(msg, eee); - show(Level.INFO, msg, eee); + + /** + * Log message using commons-logging and display message box if UI is + * available and non disabled. + * + * @param msg message to display + * @param cause exception cause + */ + public static void info(String msg, Throwable cause) { + log.info(msg, cause); + show(Level.INFO, msg, cause); } + /** + * Log message using commons-logging and display message box if UI is + * available and non disabled. + * + * @param msg message to display + */ public static void warn(String msg) { log.warn(msg); show(Level.WARN, msg, null); } - public static void warn(String msg, Throwable eee) { - log.warn(msg, eee); - show(Level.WARN, msg, eee); + + /** + * Log message using commons-logging and display message box if UI is + * available and non disabled. + * + * @param msg message to display + * @param cause exception cause + */ + public static void warn(String msg, Throwable cause) { + log.warn(msg, cause); + show(Level.WARN, msg, cause); } + /** + * Log message using commons-logging and display message box if UI is + * available and non disabled. + * + * @param msg message to display + */ public static void error(String msg) { log.error(msg); show(Level.ERROR, msg, null); } - public static void error(String msg, Throwable eee) { - log.error(msg, eee); - show(Level.ERROR, msg, eee); + + /** + * Log message using commons-logging and display message box if UI is + * available and non disabled. + * + * @param msg message to display + * @param cause exception cause + */ + public static void error(String msg, Throwable cause) { + log.error(msg, cause); + show(Level.ERROR, msg, cause); } + /** + * Log message using commons-logging and display message box if UI is + * available and non disabled. + * + * @param msg message to display + */ public static void fatal(String msg) { log.fatal(msg); show(Level.FATAL, msg, null); } - public static void fatal(String msg, Throwable eee) { - log.fatal(msg, eee); - show(Level.FATAL, msg, eee); + + /** + * Log message using commons-logging and display message box if UI is + * available and non disabled. + * + * @param msg message to display + * @param cause exception cause + */ + public static void fatal(String msg, Throwable cause) { + log.fatal(msg, cause); + show(Level.FATAL, msg, cause); } - } Property changes on: lutinutil/trunk/src/main/java/org/codelutin/log/UserLog.java ___________________________________________________________________ Name: svn:keywords + Revision Date Author

1 0