svn commit: r701228 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java

[jvanzyl]

Author: jvanzyl
Date: Thu Oct  2 12:52:53 2008
New Revision: 701228

URL: http://svn.apache.org/viewvc?rev=701228&view=rev
Log:
MNG-3637: making sure it says we fail when we fail


Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
    
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.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=701228&r1=701227&r2=701228&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  2 12:52:53 2008
@@ -85,8 +85,7 @@
     // artifact resolution
     // lifecycle execution
 
-    public ReactorManager createReactorManager( MavenExecutionRequest request,
-                                                MavenExecutionResult result )
+    public ReactorManager createReactorManager( MavenExecutionRequest request, 
MavenExecutionResult result )
     {
         List projects;
         try
@@ -115,16 +114,13 @@
 
         try
         {
-            reactorManager = new ReactorManager(
-                projects,
-                request.getReactorFailureBehavior() );
+            reactorManager = new ReactorManager( projects, 
request.getReactorFailureBehavior() );
 
             result.setReactorManager( reactorManager );
         }
         catch ( CycleDetectedException e )
         {
-            String message = "The projects in the reactor contain a cyclic 
reference: "
-                             + e.getMessage();
+            String message = "The projects in the reactor contain a cyclic 
reference: " + e.getMessage();
 
             ProjectCycleException error = new ProjectCycleException( projects, 
message, e );
 
@@ -148,9 +144,7 @@
 
         MavenExecutionResult result = new DefaultMavenExecutionResult();
 
-        ReactorManager reactorManager = createReactorManager(
-            request,
-            result );
+        ReactorManager reactorManager = createReactorManager( request, result 
);
 
         if ( result.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=701228&r1=701227&r2=701228&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 Oct  2 12:52:53 2008
@@ -122,7 +122,7 @@
                 line( logger );
             }
 
-            if ( ( reactorManager != null ) && 
!ReactorManager.FAIL_NEVER.equals( reactorManager.getFailureBehavior() ) )
+            if ( !ReactorManager.FAIL_NEVER.equals( 
request.getReactorFailureBehavior() ) )
             {
                 logger.info( "BUILD FAILED" );
 
@@ -131,6 +131,7 @@
                 stats( request.getStartTime(), logger );
 
                 line( logger );
+                
                 printSuccess = false;
             }
             else