svn commit: r470194 - /geronimo/genesis/trunk/plugins/maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/InvokeMavenMojo.java

[jd...@apache.org]

Author: jdillon
Date: Wed Nov  1 18:29:07 2006
New Revision: 470194

URL: http://svn.apache.org/viewvc?view=rev&rev=470194
Log:
Use AntHelper instead of AntMojoSupport

Modified:
    geronimo/genesis/trunk/plugins/maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/InvokeMavenMojo.java

Modified: geronimo/genesis/trunk/plugins/maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/InvokeMavenMojo.java
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/plugins/maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/InvokeMavenMojo.java?view=diff&rev=470194&r1=470193&r2=470194
==============================================================================
--- geronimo/genesis/trunk/plugins/maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/InvokeMavenMojo.java (original)
+++ geronimo/genesis/trunk/plugins/maven-maven-plugin/src/main/java/org/apache/geronimo/genesis/plugins/maven/InvokeMavenMojo.java Wed Nov  1 18:29:07 2006
@@ -25,10 +25,12 @@
 import java.util.Map;
 import java.util.Iterator;
 
-import org.apache.geronimo.genesis.ant.AntMojoSupport;
+import org.apache.geronimo.genesis.MojoSupport;
+import org.apache.geronimo.genesis.ant.AntHelper;
 
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 
 import org.codehaus.plexus.util.Os;
 import org.codehaus.plexus.util.DirectoryScanner;
@@ -43,7 +45,7 @@
  * @version $Rev$ $Date$
  */
 public class InvokeMavenMojo
-    extends AntMojoSupport
+    extends MojoSupport
 {
     /**
      * Defines the set of pom.xml files to invoke.
@@ -81,6 +83,11 @@
      */
     private String[] goals = null;
 
+    /**
+     * @component
+     */
+    protected AntHelper ant;
+
     //
     // MojoSupport Hooks
     //
@@ -98,6 +105,12 @@
         return project;
     }
 
+    protected void init() throws MojoExecutionException, MojoFailureException {
+        super.init();
+
+        ant.setProject(getProject());
+    }
+
     protected void doExecute() throws Exception {
         fileset.addDefaultExcludes();
         fileset.scan();
@@ -120,7 +133,7 @@
 
         log.info("Invoking: " + pom);
         
-        ExecTask exec = (ExecTask)createTask("exec");
+        ExecTask exec = (ExecTask)ant.createTask("exec");
 
         exec.setExecutable(getMavenExecutable().getAbsolutePath());
         exec.setFailIfExecutionFails(true);