Author: bentmann
Date: Thu Oct 15 15:17:34 2009
New Revision: 825512
URL: http://svn.apache.org/viewvc?rev=825512&view=rev
Log:
o Widened exception type to allow handling of errors, too
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=825512&r1=825511&r2=825512&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Thu Oct 15 15:17:34 2009
@@ -269,7 +269,7 @@
return lifecycleListeners;
}
- private MavenExecutionResult processResult( MavenExecutionResult result,
Exception e )
+ private MavenExecutionResult processResult( MavenExecutionResult result,
Throwable e )
{
ExceptionHandler handler = new DefaultExceptionHandler();
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=825512&r1=825511&r2=825512&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
Thu Oct 15 15:17:34 2009
@@ -79,7 +79,7 @@
public class DefaultExceptionHandler
implements ExceptionHandler
{
- public ExceptionSummary handleException( Exception exception )
+ public ExceptionSummary handleException( Throwable exception )
{
String message;
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java?rev=825512&r1=825511&r2=825512&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java
Thu Oct 15 15:17:34 2009
@@ -21,5 +21,5 @@
public interface ExceptionHandler
{
- ExceptionSummary handleException( Exception e );
+ ExceptionSummary handleException( Throwable e );
}
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java?rev=825512&r1=825511&r2=825512&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java
Thu Oct 15 15:17:34 2009
@@ -28,20 +28,20 @@
public class ExceptionSummary
{
- private Exception exception;
+ private Throwable exception;
private String message;
private String reference;
- public ExceptionSummary( Exception exception, String message, String
reference )
+ public ExceptionSummary( Throwable exception, String message, String
reference )
{
this.exception = exception;
this.message = message;
this.reference = reference;
}
- public Exception getException()
+ public Throwable getException()
{
return exception;
}
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java?rev=825512&r1=825511&r2=825512&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
Thu Oct 15 15:17:34 2009
@@ -81,16 +81,16 @@
return this;
}
- public List getExceptions()
+ public List<Throwable> getExceptions()
{
- return exceptions == null ? Collections.EMPTY_LIST : exceptions;
+ return exceptions == null ? Collections.<Throwable> emptyList() :
exceptions;
}
public MavenExecutionResult addException( Throwable t )
{
if ( exceptions == null )
{
- exceptions = new ArrayList();
+ exceptions = new ArrayList<Throwable>();
}
exceptions.add( t );
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java?rev=825512&r1=825511&r2=825512&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
Thu Oct 15 15:17:34 2009
@@ -44,7 +44,7 @@
// - project building exception
// - invalid project model exception: list of markers
// - xmlpull parser exception
- List<Exception> getExceptions();
+ List<Throwable> getExceptions();
MavenExecutionResult addException( Throwable e );
