Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java:1.7 maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java:1.8 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java:1.7 Sun Mar 23 23:48:46 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java Mon Mar 24 01:34:00 2008 @@ -19,6 +19,7 @@ import org.codelutin.option.Option; import org.codelutin.option.OptionParser; import org.codelutin.option.def.DefinitionParser; +import org.codelutin.option.def.MandatoryConfigProperty; import org.codelutin.option.def.DefinitionParserContexts.ConfigContext; import org.codelutin.option.def.DefinitionParserContexts.OptionContext; import org.codelutin.option.generate.util.AbstractGeneratorContext; @@ -250,6 +251,12 @@ // do parse definitions and return parser Map injects = new HashMap(); + injects.put(MandatoryConfigProperty.configFileName.name(),goal._configFileName); + injects.put(MandatoryConfigProperty.projectName.name(),goal._projectName); + injects.put(MandatoryConfigProperty.encoding.name(),goal._encoding); + injects.put(MandatoryConfigProperty.locale.name(),goal._locale); + injects.put(MandatoryConfigProperty.version.name(),goal._version.endsWith("-SNAPSHOT")?goal._version.substring(0,goal._version.indexOf("-SNAPSHOT")):goal._version); + parser = DefinitionParser.doParse(parserClass, source, injects); getLog().info(_("commandline.parser.result.info", parser.getClass().getSimpleName(), parser.getOptions().length, parser.getConfigs().length)); 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.26 maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.27 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.26 Sun Mar 23 23:48:46 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java Mon Mar 24 01:34:01 2008 @@ -112,25 +112,32 @@ /** * @description le nom du fichier de configuration dans la configuration genere - * @parameter expression="${commandline.configFileName}" default-value="${pom.artifactId}" + * @parameter expression="${commandline._configFileName}" default-value=".${project.artifactId}" * @required */ protected String _configFileName; + + /** + * @description le nom du fichier de configuration dans la configuration genere + * @parameter expression="${commandline._projectName}" default-value="${project.artifactId}" + * @required + */ + protected String _projectName; /** * @description l'encoding par default dans la configuration genere - * @parameter expression="${commandline.configFileName}" default-value="UTF-8" + * @parameter expression="${commandline._encoding}" default-value="UTF-8" * @required */ protected String _encoding; /** * @description la locale par default dans la configuration genere - * @parameter expression="${commandline.configFileName}" default-value="${pom.artifactId}" + * @parameter expression="${commandline._locale}" default-value="en_GB" * @required */ protected String _locale; /** * @description la version dans la configuration genere - * @parameter expression="${commandline.configFileName}" default-value="${project.version}" + * @parameter expression="${commandline._version}" default-value="${project.version}" * @required */ protected String _version;