geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r419836 - in /geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin: pom.xml src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
Date Fri, 07 Jul 2006 07:59:34 GMT
Author: jdillon
Date: Fri Jul  7 00:59:34 2006
New Revision: 419836

URL: http://svn.apache.org/viewvc?rev=419836&view=rev
Log:
Use MojoSupport from plugin-support module

Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml?rev=419836&r1=419835&r2=419836&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml Fri
Jul  7 00:59:34 2006
@@ -36,7 +36,13 @@
     <packaging>maven-plugin</packaging>
     
     <dependencies>
-    
+        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>plugin-support</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java?rev=419836&r1=419835&r2=419836&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
Fri Jul  7 00:59:34 2006
@@ -16,48 +16,17 @@
 
 package org.apache.geronimo.plugin.packaging;
 
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
+import org.apache.geronimo.plugin.MojoSupport;
 
 /**
- * ???
+ * Support for <em>packaging</em> Mojo implementations.
  *
  * @version $Id$
  */
 public abstract class AbstractPackagingMojo
-    extends AbstractMojo
+    extends MojoSupport
 {
-    protected Log log;
-
-    protected void init() {
-        log = getLog();
-    }
-
-    /**
-     * @throws MojoExecutionException
-     */
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        init();
-
-        try {
-            doExecute();
-        }
-        catch (Exception e) {
-            if (e instanceof MojoExecutionException) {
-                throw (MojoExecutionException)e;
-            }
-            else if (e instanceof MojoFailureException) {
-                throw (MojoFailureException)e;
-            }
-            else {
-                throw new MojoExecutionException(e.getMessage(), e);
-            }
-        }
-    }
-
-    protected void doExecute() throws Exception {
-        // Sub-class should override
-    }
+    //
+    // NOTE: Nothing specific to the packaging plugin (yet)
+    //
 }



Mime
View raw message