svn commit: r814890 - in /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin: DefaultBuildPluginManager.java PluginExecutionException.java

[bentmann]

Author: bentmann
Date: Mon Sep 14 22:28:01 2009
New Revision: 814890

URL: http://svn.apache.org/viewvc?rev=814890&view=rev
Log:
o Properly handled linkage errors during mojo execution

Modified:
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java?rev=814890&r1=814889&r2=814890&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
 Mon Sep 14 22:28:01 2009
@@ -15,6 +15,8 @@
  * the License.
  */
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -113,9 +115,13 @@
         }
         catch ( LinkageError e )
         {
-            pluginRealm.display();
+            ByteArrayOutputStream os = new ByteArrayOutputStream( 1024 );
+            PrintStream ps = new PrintStream( os );
+            ps.println( "A linkage error occured while executing " + 
mojoDescriptor.getId() );
+            ps.println( e );
+            pluginRealm.display( ps );
 
-            throw e;
+            throw new PluginExecutionException( mojoExecution, project, 
os.toString(), e );
         }
         finally
         {

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java?rev=814890&r1=814889&r2=814890&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
 Mon Sep 14 22:28:01 2009
@@ -34,6 +34,12 @@
         this.mojoExecution = mojoExecution;
     }
 
+    public PluginExecutionException( MojoExecution mojoExecution, MavenProject 
project, String message, Throwable cause )
+    {
+        super( mojoExecution.getMojoDescriptor(), project, message, cause );
+        this.mojoExecution = mojoExecution;
+    }
+
     public PluginExecutionException( MojoExecution mojoExecution, MavenProject 
project, Exception cause )
     {
         super( mojoExecution.getMojoDescriptor(), project, constructMessage( 
cause ), cause );