Author: jdcasey
Date: Sun Dec 16 16:15:21 2007
New Revision: 604750
URL: http://svn.apache.org/viewvc?rev=604750&view=rev
Log:
Cleaning up reporting some more.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=604750&r1=604749&r2=604750&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
Sun Dec 16 16:15:21 2007
@@ -112,12 +112,12 @@
}
catch ( ProjectBuildingException e )
{
- result.addProjectBuildingException( e );
+ result.addException( e );
return null;
}
catch ( MavenExecutionException e )
{
- result.addMavenExecutionException( e );
+ result.addException( e );
return null;
}
@@ -138,13 +138,13 @@
ProjectCycleException error = new ProjectCycleException( projects,
message, e );
- result.addBuildFailureException( error );
+ result.addException( error );
return null;
}
catch ( DuplicateProjectException e )
{
- result.addDuplicateProjectException( e );
+ result.addException( e );
return null;
}
@@ -194,7 +194,7 @@
if ( !tvr.isTaskValid() )
{
- result.addBuildFailureException(
tvr.generateInvalidTaskException() );
+ result.addException( tvr.generateInvalidTaskException() );
return result;
}
@@ -223,12 +223,12 @@
}
catch ( LifecycleExecutionException e )
{
- result.addLifecycleExecutionException( e );
+ result.addException( e );
return result;
}
catch ( BuildFailureException e )
{
- result.addBuildFailureException( e );
+ result.addException( e );
return result;
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java?rev=604750&r1=604749&r2=604750&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
Sun Dec 16 16:15:21 2007
@@ -19,14 +19,8 @@
* under the License.
*/
-import org.apache.maven.BuildFailureException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.extension.ExtensionScanningException;
-import org.apache.maven.lifecycle.LifecycleExecutionException;
-import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.reactor.MavenExecutionException;
import java.util.ArrayList;
import java.util.Collections;
@@ -87,56 +81,7 @@
return exceptions == null ? Collections.EMPTY_LIST : exceptions;
}
- public MavenExecutionResult addExtensionScanningException(
ExtensionScanningException e )
- {
- addException( e );
-
- return this;
- }
-
- public MavenExecutionResult addProjectBuildingException(
ProjectBuildingException e )
- {
- addException( e );
-
- return this;
- }
-
- public MavenExecutionResult addMavenExecutionException(
MavenExecutionException e )
- {
- addException( e );
-
- return this;
- }
-
- public MavenExecutionResult addBuildFailureException(
BuildFailureException e )
- {
- addException( e );
-
- return this;
- }
-
- public MavenExecutionResult addDuplicateProjectException(
DuplicateProjectException e )
- {
- addException( e );
-
- return this;
- }
-
- public MavenExecutionResult addLifecycleExecutionException(
LifecycleExecutionException e )
- {
- addException( e );
-
- return this;
- }
-
- public MavenExecutionResult addUnknownException( Throwable t )
- {
- addException( t );
-
- return this;
- }
-
- private void addException( Throwable t )
+ public MavenExecutionResult addException( Throwable t )
{
if ( exceptions == null )
{
@@ -144,6 +89,8 @@
}
exceptions.add( t );
+
+ return this;
}
public boolean hasExceptions()
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java?rev=604750&r1=604749&r2=604750&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
Sun Dec 16 16:15:21 2007
@@ -19,14 +19,8 @@
* under the License.
*/
-import org.apache.maven.BuildFailureException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.extension.ExtensionScanningException;
-import org.apache.maven.lifecycle.LifecycleExecutionException;
-import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.reactor.MavenExecutionException;
import java.util.List;
@@ -54,13 +48,7 @@
// - xmlpull parser exception
List getExceptions();
- MavenExecutionResult addLifecycleExecutionException(
LifecycleExecutionException e );
- MavenExecutionResult addDuplicateProjectException(
DuplicateProjectException duplicateProjectException );
- MavenExecutionResult addBuildFailureException( BuildFailureException
buildFailureException );
- MavenExecutionResult addMavenExecutionException( MavenExecutionException e
);
- MavenExecutionResult addProjectBuildingException (ProjectBuildingException
e );
- MavenExecutionResult addExtensionScanningException(
ExtensionScanningException e );
- MavenExecutionResult addUnknownException( Throwable t );
+ MavenExecutionResult addException( Throwable e );
boolean hasExceptions();
}
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java?rev=604750&r1=604749&r2=604750&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
Sun Dec 16 16:15:21 2007
@@ -4,7 +4,6 @@
import org.apache.maven.embedder.MavenEmbedderLogger;
import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.errors.DefaultCoreErrorReporter;
-import org.apache.maven.execution.BuildFailure;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.execution.ReactorManager;
@@ -102,9 +101,22 @@
logReactorSummary( reactorManager, logger );
+ boolean printSuccess = true;
if ( ( reactorManager != null ) && reactorManager.hasBuildFailures() )
{
- logErrors( reactorManager, request.isShowErrors(), logger );
+ for ( Iterator i = result.getExceptions().iterator(); i.hasNext();
)
+ {
+ Exception e = (Exception) i.next();
+
+ showError( e, request.isShowErrors(),
request.getErrorReporter(), logger );
+ }
+
+ line( logger );
+ if ( !request.isShowErrors() )
+ {
+ logger.info( "For more information, run with the -e flag" );
+ line( logger );
+ }
if ( !ReactorManager.FAIL_NEVER.equals(
reactorManager.getFailureBehavior() ) )
{
@@ -115,6 +127,7 @@
stats( request.getStartTime(), logger );
line( logger );
+ printSuccess = false;
}
else
{
@@ -122,16 +135,7 @@
}
}
- if ( result.hasExceptions() )
- {
- for ( Iterator i = result.getExceptions().iterator(); i.hasNext();
)
- {
- Exception e = (Exception) i.next();
-
- showError( e, request.isShowErrors(),
request.getErrorReporter(), logger );
- }
- }
- else
+ if ( printSuccess )
{
line( logger );
@@ -147,41 +151,21 @@
logger.close();
}
- private static void logErrors( ReactorManager rm,
- boolean showErrors,
- MavenEmbedderLogger logger )
+ static void showError( String message,
+ Exception e,
+ boolean showErrors )
{
- for ( Iterator it = rm.getSortedProjects().iterator(); it.hasNext(); )
- {
- MavenProject project = (MavenProject) it.next();
-
- if ( rm.hasBuildFailure( project ) )
- {
- BuildFailure buildFailure = rm.getBuildFailure( project );
+ MavenEmbedderLogger logger = new MavenEmbedderConsoleLogger();
- logger.info( "Error for project: " + project.getName() + "
(during "
- + buildFailure.getTask() + ")" );
-
- line( logger );
- }
- }
+ showError( message, e, showErrors, new DefaultCoreErrorReporter(),
logger );
if ( !showErrors )
{
- logger.info( "For more information, run Maven with the -e switch"
);
-
- line( logger );
+ logger.info( "For more information, run with the -e flag" );
}
}
- static void showError( String message,
- Exception e,
- boolean showErrors )
- {
- showError( message, e, showErrors, new DefaultCoreErrorReporter(), new
MavenEmbedderConsoleLogger() );
- }
-
- static void showError( Exception e,
+ private static void showError( Exception e,
boolean show,
CoreErrorReporter reporter,
MavenEmbedderLogger logger )
@@ -196,7 +180,7 @@
* @param showStackTraces
* @param logger
*/
- public static void showError( String message,
+ static void showError( String message,
Exception e,
boolean showStackTraces,
CoreErrorReporter reporter,
@@ -222,10 +206,6 @@
writer.write( NEWLINE );
e.printStackTrace( new PrintWriter( writer ) );
- }
- else
- {
- writer.write( "For more information, run with the -e flag" );
}
logger.error( writer.toString() );
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=604750&r1=604749&r2=604750&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Sun Dec 16 16:15:21 2007
@@ -395,15 +395,15 @@
}
catch ( MavenEmbedderException e )
{
- return result.addUnknownException( e );
+ return result.addException( e );
}
catch ( ProjectBuildingException e )
{
- return result.addProjectBuildingException( e );
+ return result.addException( e );
}
catch ( ExtensionScanningException e )
{
- return result.addExtensionScanningException( e );
+ return result.addException( e );
}
ReactorManager reactorManager = maven.createReactorManager( request,
result );
@@ -424,7 +424,7 @@
}
catch ( ProjectBuildingException e )
{
- return result.addProjectBuildingException( e );
+ return result.addException( e );
}
if ( reactorManager.hasMultipleProjects() )
@@ -803,7 +803,7 @@
{
MavenExecutionResult result = new
DefaultMavenExecutionResult();
- result.addUnknownException( e );
+ result.addException( e );
return result;
}
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=604750&r1=604749&r2=604750&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Sun Dec 16 16:15:21 2007
@@ -110,7 +110,8 @@
snapshotPolicy( request, configuration );
- localRepository( request, configuration );
+ // TODO: Can we remove this second call?
+// localRepository( request, configuration );
checksumPolicy( request, configuration );
