From 5e248c00779692c8cd3763de1de4707b7a6591a8 Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Tue, 1 Dec 2009 15:38:04 +0100
Subject: Fixed NAR-13

---
 .../apache/maven/plugin/nar/AbstractNarMojo.java   | 61 +++++++++++++++++++---
 1 file changed, 53 insertions(+), 8 deletions(-)

(limited to 'src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java')

diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
index 5c6bdc1..3725d71 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
@@ -41,6 +41,13 @@ public abstract class AbstractNarMojo
      */
     private boolean skip;
 
+    /**
+     * Ignore errors and failures.
+     * 
+     * @parameter expression="${nar.ignore}" default-value="false"
+     */
+    private boolean ignore;
+
     /**
      * The Architecture for the nar, Some choices are: "x86", "i386", "amd64", "ppc", "sparc", ... Defaults to a derived
      * value from ${os.arch}
@@ -98,10 +105,12 @@ public abstract class AbstractNarMojo
      * @required
      */
     private MavenProject mavenProject;
-    
+
     private AOL aolId;
 
-    protected final void validate() throws MojoFailureException, MojoExecutionException {
+    protected final void validate()
+        throws MojoFailureException, MojoExecutionException
+    {
         linker = NarUtil.getLinker( linker );
 
         architecture = NarUtil.getArchitecture( architecture );
@@ -113,14 +122,9 @@ public abstract class AbstractNarMojo
             targetDirectory = new File( mavenProject.getBuild().getDirectory(), "nar" );
         }
     }
-    
-    protected final boolean shouldSkip()
-    {
-        return skip;
-    }
 
     protected final String getArchitecture()
-    {       
+    {
         return architecture;
     }
 
@@ -159,4 +163,45 @@ public abstract class AbstractNarMojo
     {
         return mavenProject;
     }
+
+    public final void execute()
+        throws MojoExecutionException, MojoFailureException
+    {
+        if ( skip )
+        {
+            getLog().info( getClass().getName() + " skipped" );
+            return;
+        }
+
+        try
+        {
+            validate();
+            narExecute();
+        }
+        catch ( MojoFailureException mfe )
+        {
+            if ( ignore )
+            {
+                getLog().warn( "IGNORED: " + mfe.getMessage() );
+            }
+            else
+            {
+                throw mfe;
+            }
+        }
+        catch ( MojoExecutionException mee )
+        {
+            if ( ignore )
+            {
+                getLog().warn( "IGNORED: " + mee.getMessage() );
+            }
+            else
+            {
+                throw mee;
+            }
+        }
+    }
+
+    public abstract void narExecute()
+        throws MojoFailureException, MojoExecutionException;
 }
-- 
cgit v1.2.3