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

[bentmann]

Author: bentmann
Date: Tue Nov 17 14:41:17 2009
New Revision: 881305

URL: http://svn.apache.org/viewvc?rev=881305&view=rev
Log:
o Polished error reporting

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=881305&r1=881304&r2=881305&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
 Tue Nov 17 14:41:17 2009
@@ -114,7 +114,7 @@
                 throw new PluginExecutionException( mojoExecution, project, e 
);
             }
         }
-        catch ( PluginManagerException e )
+        catch ( PluginContainerException e )
         {
             throw new PluginExecutionException( mojoExecution, project, e );
         }

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=881305&r1=881304&r2=881305&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
 Tue Nov 17 14:41:17 2009
@@ -21,6 +21,7 @@
 
 import org.apache.maven.project.DuplicateArtifactAttachmentException;
 import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.StringUtils;
 
 public class PluginExecutionException
     extends PluginManagerException
@@ -72,9 +73,9 @@
             message = "Mojo execution failed";
         }
 
-        if ( cause != null )
+        if ( cause != null && StringUtils.isNotEmpty( cause.getMessage() ) )
         {
-            message = ": " + cause.getMessage();
+            message += ": " + cause.getMessage();
         }
         else
         {