You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/09/20 12:35:45 UTC
svn commit: r998878 - in /maven/maven-3/trunk:
maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Author: bentmann
Date: Mon Sep 20 10:35:45 2010
New Revision: 998878
URL: http://svn.apache.org/viewvc?rev=998878&view=rev
Log:
[MNG-4824] multiple failures need additional whitespace
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java?rev=998878&r1=998877&r2=998878&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java Mon Sep 20 10:35:45 2010
@@ -139,8 +139,8 @@ public class DefaultExceptionHandler
}
String message =
- "The project " + result.getProjectId() + " (" + result.getPomFile() + ") has " + children.size() + " error"
- + ( children.size() == 1 ? "" : "s" );
+ "\nThe project " + result.getProjectId() + " (" + result.getPomFile() + ") has "
+ + children.size() + " error" + ( children.size() == 1 ? "" : "s" );
return new ExceptionSummary( null, message, null, children );
}
Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=998878&r1=998877&r2=998878&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Mon Sep 20 10:35:45 2010
@@ -526,7 +526,7 @@ public class MavenCli
}
}
- String msg = indent + summary.getMessage();
+ String msg = summary.getMessage();
if ( StringUtils.isNotEmpty( referenceKey ) )
{
@@ -536,17 +536,24 @@ public class MavenCli
}
else
{
- msg += '\n' + indent + "-> " + referenceKey;
+ msg += "\n-> " + referenceKey;
}
}
- if ( showErrors || ( summary.getException() instanceof InternalErrorException ) )
- {
- logger.error( msg, summary.getException() );
- }
- else
+ String[] lines = msg.split( "(\r\n)|(\r)|(\n)" );
+
+ for ( int i = 0; i < lines.length; i++ )
{
- logger.error( msg );
+ String line = indent + lines[i].trim();
+
+ if ( i == lines.length - 1 && ( showErrors || ( summary.getException() instanceof InternalErrorException ) ) )
+ {
+ logger.error( line, summary.getException() );
+ }
+ else
+ {
+ logger.error( line );
+ }
}
indent += " ";