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.6 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.6 Sun Mar 23 20:46:14 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java Sun Mar 23 23:48:46 2008 @@ -24,9 +24,10 @@ import org.codelutin.option.generate.util.AbstractGeneratorContext; import java.io.File; -import java.io.IOException; import java.io.StringWriter; import java.io.Writer; +import java.util.HashMap; +import java.util.Map; /** @author chemit */ public class JavaGeneratorContext extends AbstractGeneratorContext { @@ -190,7 +191,7 @@ @SuppressWarnings({"unchecked"}) @Override - public void init(JavaGeneratorGoal goal) throws IOException, ClassNotFoundException, IllegalAccessException, InstantiationException { + public void init(JavaGeneratorGoal goal) throws Exception { super.init(goal); @@ -247,7 +248,9 @@ parserClass = (Class) Class.forName(getParserFQN()); // do parse definitions and return parser - parser = DefinitionParser.doParse(parserClass , source); + Map injects = new HashMap(); + + 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/RstGeneratorContext.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorContext.java:1.5 maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorContext.java:1.6 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorContext.java:1.5 Sun Mar 23 01:27:19 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorContext.java Sun Mar 23 23:48:46 2008 @@ -63,7 +63,7 @@ } @SuppressWarnings({"unchecked"}) - public void init(RstGeneratorGoal goal) throws IOException, ClassNotFoundException, IllegalAccessException, InstantiationException { + public void init(RstGeneratorGoal goal) throws Exception { super.init(goal); @@ -81,7 +81,7 @@ contextClass = (Class) Class.forName(contextFQN, true, loader); - if (goal.getBundles() == null|| goal.getBundles().length==0) { + if (goal.getBundles() == null || goal.getBundles().length == 0) { goal.setBundles(new String[]{"fr_FR", "en_GB"}); } } 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.25 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.25 Sun Mar 23 01:27:19 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java Sun Mar 23 23:48:46 2008 @@ -105,11 +105,35 @@ protected String contextSuperClass; /** - * @description prefix du nom des config a generer + * @description flag pour indique si les configs generes sont concrete ou abstraites * @parameter expression="${commandline.concreteConfig}" default-value="false" */ protected boolean concreteConfig; + /** + * @description le nom du fichier de configuration dans la configuration genere + * @parameter expression="${commandline.configFileName}" default-value="${pom.artifactId}" + * @required + */ + protected String _configFileName; + /** + * @description l'encoding par default dans la configuration genere + * @parameter expression="${commandline.configFileName}" 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}" + * @required + */ + protected String _locale; + /** + * @description la version dans la configuration genere + * @parameter expression="${commandline.configFileName}" default-value="${project.version}" + * @required + */ + protected String _version; public JavaGeneratorGoal() { super(JavaGeneratorContext.class);