Index: maven-commandline-plugin/src/test/org/codelutin/option/generate/GenerateJavaTest.java
diff -u maven-commandline-plugin/src/test/org/codelutin/option/generate/GenerateJavaTest.java:1.10 maven-commandline-plugin/src/test/org/codelutin/option/generate/GenerateJavaTest.java:1.11
--- maven-commandline-plugin/src/test/org/codelutin/option/generate/GenerateJavaTest.java:1.10	Wed Mar 19 20:21:52 2008
+++ maven-commandline-plugin/src/test/org/codelutin/option/generate/GenerateJavaTest.java	Thu Mar 20 01:30:55 2008
@@ -24,6 +24,8 @@
 import org.codelutin.option.OptionAction;
 import org.codelutin.option.OptionParser;
 import org.codelutin.option.def.DefaultOptionAction;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.io.File;
 
@@ -39,6 +41,8 @@
     private static final String HERE = new File("").getAbsolutePath();
     private static final String OUT_PATH = new File(HERE, "target/gen/java").getAbsolutePath();
 
+    protected final Log log = LogFactory.getLog(getClass());
+
     JavaGeneratorGoal goal;
 
     protected void setUp() throws Exception {
@@ -49,47 +53,35 @@
 
     public void testGenerate() throws Exception {
         goal = new JavaGeneratorGoal();
-        goal.getContext().setPrefix("Test");
-        goal.getContext().setVerbose(false);
-        goal.source = new File(HERE + "/src/test/testOptions.properties");
-        goal.parserPackageName = "org.codelutin.option.test.init";
-        goal.optionPackageName = "org.codelutin.option.test.init";
-        goal.configPackageName = "org.codelutin.option.test.init";
-        goal.actionPackageName = "org.codelutin.option.test.init";
-        goal.parserSimpleName = "TestOptionParser";
-        goal.optionSimpleName = "Option";
-        goal.configSimpleName = "Config";
-        goal.actionSimpleName = "AbstractOptionAction";
-        goal.parserSuperClass = OptionParser.class.getName();
-        goal.optionSuperClass = Option.class.getName();
-        goal.actionSuperClass = OptionAction.class.getName();
-        goal.configSuperClass = Config.class.getName();
-        goal.getContext().setOut(new File(OUT_PATH));
-        goal.typeSource = "properties";
-        goal.showErrors = true;
+        goal.setPrefix("Test");
+        goal.setVerbose(false);
+        goal.setSource(new File(HERE + "/src/test/testOptions.properties"));
+        
+        goal.setPackageName("org.codelutin.option.test1");
+
+        goal.setParserSuperClass(OptionParser.class.getName());
+        goal.setOptionSuperClass(Option.class.getName());
+        goal.setActionSuperClass(OptionAction.class.getName());
+        goal.setConfigSuperClass(Config.class.getName());
+        goal.setOut(new File(OUT_PATH));
+        goal.setTypeSource("properties");
+        goal.setShowErrors(true);
         goal.execute();
     }
 
     public void testGenerate2() throws Exception {
         goal = new JavaGeneratorGoal();
-        goal.getContext().setPrefix("Test2");
-        goal.getContext().setVerbose(false);
-        goal.source = new File(HERE + "/src/test/testOptions2.properties");
-        goal.parserPackageName = "org.codelutin.option.test2.init";
-        goal.optionPackageName = "org.codelutin.option.test2.init.option";
-        goal.configPackageName = "org.codelutin.option.test2.init.config";
-        goal.actionPackageName = "org.codelutin.option.test2.init.action";
-        goal.parserSimpleName = "Test2OptionParser";
-        goal.optionSimpleName = "Option";
-        goal.configSimpleName = "Config";
-        goal.actionSimpleName = "AbstractOptionAction";
-        goal.parserSuperClass = OptionParser.class.getName();
-        goal.optionSuperClass = Option.class.getName();
-        goal.actionSuperClass = OptionAction.class.getName();
-        goal.configSuperClass = Config.class.getName();
-        goal.getContext().setOut(new File(OUT_PATH));
-        goal.typeSource = "properties";
-        goal.showErrors = true;
+        goal.setPrefix("Test2");
+        goal.setVerbose(false);
+        goal.setSource(new File(HERE + "/src/test/testOptions2.properties"));
+        goal.setPackageName("org.codelutin.option.test2");
+        goal.setParserSuperClass(OptionParser.class.getName());
+        goal.setOptionSuperClass(Option.class.getName());
+        goal.setActionSuperClass(OptionAction.class.getName());
+        goal.setConfigSuperClass(Config.class.getName());
+        goal.setOut(new File(OUT_PATH));
+        goal.setTypeSource("properties");
+        goal.setShowErrors(true);
         goal.execute();
     }