Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/AbstractGeneratorGoal.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/AbstractGeneratorGoal.java:1.8 maven-commandline-plugin/src/java/org/codelutin/option/generate/AbstractGeneratorGoal.java:1.9 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/AbstractGeneratorGoal.java:1.8 Thu Feb 7 17:06:03 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/AbstractGeneratorGoal.java Wed Feb 20 21:11:06 2008 @@ -24,7 +24,6 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import static org.codelutin.i18n.I18n._; import org.codelutin.log.LutinLogFactory; @@ -48,8 +47,6 @@ System.setProperty("org.apache.commons.logging.LogFactory", LutinLogFactory.class.getName()); } - protected Log log = getLog(); - /** * @description Dépendance du projet. * @parameter default-value="${project}" @@ -126,7 +123,7 @@ } catch (Exception e) { throw new MojoExecutionException(e.getMessage(), e); } finally { - log.info("total time " + StringUtil.convertTime(System.nanoTime() - t0)); + getLog().info("total time " + StringUtil.convertTime(System.nanoTime() - t0)); } } Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.4 maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.5 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.4 Thu Jan 3 05:47:42 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java Wed Feb 20 21:11:06 2008 @@ -68,7 +68,7 @@ @SuppressWarnings({"unchecked"}) protected void initAction() throws ClassNotFoundException, MalformedURLException { - log.info("projectCP:" + out); + getLog().info("projectCP:" + out); // add i18n location as classpath Resource.addDefaultClassLoader(new File(i18nCP).toURI().toURL()); Resource.addDefaultClassLoader(out.toURI().toURL()); @@ -99,7 +99,7 @@ _("commandline.generateRstFile.options.head", prefix), _("commandline.generateRstFile.configs.head", prefix) ); - log.info(_("commandline.generateRstFile.info", rstFilePath)); + getLog().info(_("commandline.generateRstFile.info", rstFilePath)); } finally { if (w != null) { w.close(); Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.6 maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.7 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.6 Fri Jan 4 09:47:10 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java Wed Feb 20 21:11:06 2008 @@ -159,7 +159,7 @@ protected void initAction() throws Exception { // init i18n - I18n.initISO88591(); + I18n.initISO88591(System.getProperty("user.language"), System.getProperty("user.country")); checkInstanceOf(parserSuperClass, OptionParser.class); checkInstanceOf(optionSuperClass, Option.class); @@ -220,7 +220,7 @@ // do parse definitions and return parser parser = DefinitionParser.doParse(typeP, source); - log.info(_("commandline.parser.result.info", parser, parser.getOptions().length, parser.getConfigs().length)); + getLog().info(_("commandline.parser.result.info", parser, parser.getOptions().length, parser.getConfigs().length)); // show errors if (showErrors) { @@ -229,13 +229,13 @@ parser.printErrors(writer); String lines = writer.toString(); for (String s : lines.split("\n")) { - log.info(_("commandline.showErrors.info") + ' ' + s); + getLog().info(_("commandline.showErrors.info") + ' ' + s); } writer.flush(); writer.close(); } else { - log.info(_("commandline.showErrors.no.error.info")); + getLog().info(_("commandline.showErrors.no.error.info")); } }