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.14 maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.15
--- maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.14	Sun Mar 23 00:23:01 2008
+++ maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java	Sun Mar 23 01:27:19 2008
@@ -20,8 +20,8 @@
 
 import org.codelutin.i18n.I18n;
 import static org.codelutin.i18n.I18n._;
-import org.codelutin.i18n.LanguageManager;
 import org.codelutin.i18n.I18nLoader;
+import org.codelutin.i18n.LanguageManager;
 import org.codelutin.i18n.bundle.I18nBundleManager;
 import org.codelutin.option.ConfigKey;
 import org.codelutin.option.ConfigPropertyKey;
@@ -93,18 +93,19 @@
         LanguageManager.reset();
 
         for (String bundle : getBundles()) {
+
             String pattern = getContext().getRstFilePath();
             String filename = getPrefix() + "Usage.rst";
 
-            File rstFilePath = new File(pattern.replace("@bundle@", bundle) + File.separator + filename);
-            if (!rstFilePath.getParentFile().exists()) {
-                rstFilePath.getParentFile().mkdirs();
-            }
-
             Writer w = null;
             try {
                 Locale langue = I18nLoader.newLocale(bundle);
 
+                File rstFilePath = new File(pattern.replace("@bundle@", langue.getLanguage()) + File.separator + filename);
+                if (!rstFilePath.getParentFile().exists()) {
+                    rstFilePath.getParentFile().mkdirs();
+                }
+
                 w = new BufferedWriter(new FileWriter(rstFilePath));
 
                 generateForBundle(w, rstFilePath, getPrefix(), optionKeys, configKeys, langue, urls);
@@ -120,7 +121,7 @@
     private void generateForBundle(Writer w, File rstFilePath, String prefix, List<OptionKey> optionKeys, List<ConfigKey> configKeys, Locale langue, URL[] urls) throws IOException {
 
         // init i18n with this
-        I18n.init(langue,getEncoding(), urls);
+        I18n.init(langue, getEncoding(), urls);
 
         toString(w,
                 _("commandline.generateRstFile.head", prefix),

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.4 maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java:1.5
--- maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java:1.4	Sun Mar 23 00:23:01 2008
+++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorContext.java	Sun Mar 23 01:27:19 2008
@@ -50,6 +50,8 @@
 
     protected String optionKeySimpleName;
 
+    protected Class<? extends DefinitionParser> parserClass;
+
     public String getActionPackageName() {
         return actionPackageName;
     }
@@ -166,7 +168,7 @@
         return goal.getSource();
     }
 
-    public Class<? extends DefinitionParser> getParserFQN() {
+    public String getParserFQN() {
         return goal.getParserFQN();
     }
 
@@ -238,8 +240,12 @@
         // init i18n for error explicit messages
         I18n.init();
 
+        checkInstanceOf(getParserFQN(), DefinitionParser.class);
+
+        parserClass = (Class<? extends DefinitionParser>) Class.forName(getParserFQN());
+
         // do parse definitions and return parser
-        parser = DefinitionParser.doParse(getParserFQN(), source);
+        parser = DefinitionParser.doParse(parserClass , source);
 
         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.4 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.4	Sun Mar 23 00:23:01 2008
+++ maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorContext.java	Sun Mar 23 01:27:19 2008
@@ -81,8 +81,8 @@
         contextClass = (Class<? extends AbstractContext>) Class.forName(contextFQN, true, loader);
 
 
-        if (goal.getBundles() == null) {
-            goal.setBundles(new String[]{"fr", "en"});
+        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.24 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.24	Sun Mar 23 00:23:01 2008
+++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java	Sun Mar 23 01:27:19 2008
@@ -21,7 +21,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.codelutin.option.Config;
 import org.codelutin.option.OptionAction;
-import org.codelutin.option.def.DefinitionParser;
 import org.codelutin.option.def.DefinitionParserContexts.ConfigContext;
 import org.codelutin.option.def.DefinitionParserContexts.OptionContext;
 import org.codelutin.option.generate.java.AbstractConfigJavaGenerator;
@@ -66,7 +65,8 @@
      * @description le parser a utiliser
      * @parameter expression="${commandline.parserFQN}" default-value="org.codelutin.option.def.DefinitionParserFromProperties"
      */
-    protected Class<? extends DefinitionParser> parserFQN;
+    protected String parserFQN;
+
 
     /**
      * @description flag to show errors of parsing.
@@ -226,7 +226,7 @@
         return source;
     }
 
-    public Class<? extends DefinitionParser> getParserFQN() {
+    public String getParserFQN() {
         return parserFQN;
     }
 
@@ -266,7 +266,8 @@
         this.out = out;
     }
 
-    public void setParserFQN(Class<? extends DefinitionParser> parserFQN) {
+    public void setParserFQN(String parserFQN) {
         this.parserFQN = parserFQN;
     }
+
 }
\ No newline at end of file