svn commit: r613039 - in /maven/components/trunk/maven-embedder/src: main/java/org/apache/maven/cli/CLIReportingUtils.java test/java/org/apache/maven/error/ErrorReporterPointcutTest.java

[jdcasey]

Author: jdcasey
Date: Thu Jan 17 17:56:20 2008
New Revision: 613039

URL: http://svn.apache.org/viewvc?rev=613039&view=rev
Log:
Fix some problems with the CLI reporter when the reactor manager hasn't been 
created yet (in cases where reading the projects for the reactor failed, for 
instance).

Modified:
    
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
    
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java

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=613039&r1=613038&r2=613039&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
 Thu Jan 17 17:56:20 2008
@@ -1,16 +1,5 @@
 package org.apache.maven.cli;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.TimeZone;
-
 import org.apache.maven.embedder.MavenEmbedderConsoleLogger;
 import org.apache.maven.embedder.MavenEmbedderLogger;
 import org.apache.maven.errors.CoreErrorReporter;
@@ -22,9 +11,19 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.reactor.MavenExecutionException;
-
 import org.codehaus.plexus.util.Os;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.TimeZone;
+
 /**
  * Utility class used to report errors, statistics, application version info, 
etc.
  *
@@ -96,7 +95,7 @@
         logReactorSummary( reactorManager, logger );
 
         boolean printSuccess = true;
-        if ( ( reactorManager != null ) && reactorManager.hasBuildFailures() )
+        if ( ( reactorManager == null ) || reactorManager.hasBuildFailures() )
         {
             for ( Iterator i = result.getExceptions().iterator(); i.hasNext(); 
)
             {
@@ -112,7 +111,7 @@
                 line( logger );
             }
 
-            if ( !ReactorManager.FAIL_NEVER.equals( 
reactorManager.getFailureBehavior() ) )
+            if ( ( reactorManager != null ) && 
!ReactorManager.FAIL_NEVER.equals( reactorManager.getFailureBehavior() ) )
             {
                 logger.info( "BUILD FAILED" );
 

Modified: 
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java?rev=613039&r1=613038&r2=613039&view=diff
==============================================================================
--- 
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
 (original)
+++ 
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
 Thu Jan 17 17:56:20 2008
@@ -17,7 +17,6 @@
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.PluginManagerException;
 import org.apache.maven.settings.Settings;
-import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.easymock.MockControl;
@@ -578,7 +577,6 @@
 
         MavenExecutionRequest request = new 
DefaultMavenExecutionRequest().setBaseDirectory( project )
                                                                           
.setShowErrors( true )
-                                                                          
.setLoggingLevel( Logger.LEVEL_DEBUG )
                                                                           
.setSettings( settings )
                                                                           
.setErrorReporter( reporter )
                                                                           
.setGoals( Arrays.asList( new String[] {