Author: brett
Date: Thu Oct 13 20:48:39 2005
New Revision: 320990
URL: http://svn.apache.org/viewcvs?rev=320990&view=rev
Log:
- fix MojoFailureExceptionDiagnoser so that even under the reactor the long
message is shown
- remove long message from BuildFailureException as it was only there for that
reason, and caused dual diagnosis
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoser.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/MojoFailureExceptionDiagnoser.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java?rev=320990&r1=320989&r2=320990&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
Thu Oct 13 20:48:39 2005
@@ -25,27 +25,13 @@
public class BuildFailureException
extends Exception
{
- private String longMessage;
-
public BuildFailureException( String message )
{
super( message );
}
- public BuildFailureException( String message, String longMessage )
- {
- super( message );
- this.longMessage = longMessage;
- }
-
- public BuildFailureException( String message, String longMessage,
Throwable cause )
+ public BuildFailureException( String message, Throwable cause )
{
super( message, cause );
- this.longMessage = longMessage;
- }
-
- public String getLongMessage()
- {
- return longMessage;
}
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=320990&r1=320989&r2=320990&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Thu Oct 13 20:48:39 2005
@@ -659,13 +659,6 @@
logDiagnostics( e );
- if ( e.getLongMessage() != null )
- {
- getLogger().info( e.getLongMessage() );
-
- line();
- }
-
logTrace( e, showErrors );
if ( !showErrors )
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=320990&r1=320989&r2=320990&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Thu Oct 13 20:48:39 2005
@@ -454,7 +454,7 @@
}
catch ( PluginNotFoundException e )
{
- throw new BuildFailureException( "A required plugin was not
found", e.getMessage(), e );
+ throw new BuildFailureException( "A required plugin was not found:
" + e.getMessage(), e );
}
}
@@ -537,7 +537,7 @@
}
catch ( MojoFailureException e )
{
- throw new BuildFailureException( e.getMessage(),
e.getLongMessage(), e );
+ throw new BuildFailureException( e.getMessage(), e );
}
catch ( MojoExecutionException e )
{
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoser.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoser.java?rev=320990&r1=320989&r2=320990&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoser.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoser.java
Thu Oct 13 20:48:39 2005
@@ -36,39 +36,33 @@
StringBuffer message = new StringBuffer();
- message.append( "Error executing mojo" );
-
Object source = mee.getSource();
if ( source != null )
{
message.append( ": " ).append( mee.getSource() ).append( "\n" );
}
- else
- {
- message.append( ".\n" );
- }
- message.append( "\n" ).append( mee.getMessage() );
+ message.append( mee.getMessage() );
String longMessage = mee.getLongMessage();
if ( longMessage != null )
{
message.append( "\n\n" ).append( longMessage );
}
-
+
Throwable directCause = mee.getCause();
-
+
if ( directCause != null )
{
message.append( "\n" );
-
+
String directCauseMessage = directCause.getMessage();
-
+
if ( directCauseMessage != null && mee.getMessage().indexOf(
directCauseMessage ) < 0 )
{
message.append( "\nEmbedded error: " ).append(
directCauseMessage );
}
-
+
DiagnosisUtils.appendRootCauseIfPresentAndUnique( directCause,
message, false );
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/MojoFailureExceptionDiagnoser.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/MojoFailureExceptionDiagnoser.java?rev=320990&r1=320989&r2=320990&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/MojoFailureExceptionDiagnoser.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/usability/MojoFailureExceptionDiagnoser.java
Thu Oct 13 20:48:39 2005
@@ -26,7 +26,7 @@
public boolean canDiagnose( Throwable error )
{
- return DiagnosisUtils.containsInCausality( error,
MojoFailureExceptionDiagnoser.class );
+ return DiagnosisUtils.containsInCausality( error,
MojoFailureException.class );
}
public String diagnose( Throwable error )
@@ -41,12 +41,8 @@
{
message.append( ": " ).append( mfe.getSource() ).append( "\n" );
}
- else
- {
- message.append( ".\n" );
- }
- message.append( "\n" ).append( mfe.getMessage() );
+ message.append( mfe.getMessage() );
String longMessage = mfe.getLongMessage();
if ( longMessage != null )
