From 98487def26fee84e0f02367f81e936b55ca72300 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Mon, 1 Jan 2007 05:11:48 +0000 Subject: [PATCH] o reactor failure mode is validated elsewhere git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@491534 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/maven/DefaultMaven.java | 9 +-------- .../apache/maven/execution/ReactorManager.java | 18 +++--------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index 8eaee1be58..e8106328ef 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -235,14 +235,7 @@ private MavenExecutionResult doExecute( MavenExecutionRequest request, try { - rm = new ReactorManager( projects ); - - String requestFailureBehavior = request.getReactorFailureBehavior(); - - if ( requestFailureBehavior != null ) - { - rm.setFailureBehavior( requestFailureBehavior ); - } + rm = new ReactorManager( projects, request.getReactorFailureBehavior() ); } catch ( CycleDetectedException e ) { diff --git a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java index 03571e04eb..d7b4facb63 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java +++ b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java @@ -50,10 +50,12 @@ public class ReactorManager private Map buildSuccessesByProject = new HashMap(); - public ReactorManager( List projects ) + public ReactorManager( List projects, String failureBehavior ) throws CycleDetectedException, DuplicateProjectException { this.sorter = new ProjectSorter( projects ); + + this.failureBehavior = failureBehavior; } public Map getPluginContext( PluginDescriptor plugin, MavenProject project ) @@ -78,20 +80,6 @@ public Map getPluginContext( PluginDescriptor plugin, MavenProject project ) return pluginContext; } - public void setFailureBehavior( String failureBehavior ) - { - if ( FAIL_FAST.equals( failureBehavior ) || FAIL_AT_END.equals( failureBehavior ) || - FAIL_NEVER.equals( failureBehavior ) ) - { - this.failureBehavior = failureBehavior; - } - else - { - throw new IllegalArgumentException( "Invalid failure behavior (must be one of: \'" + FAIL_FAST + "\', \'" + - FAIL_AT_END + "\', \'" + FAIL_NEVER + "\')." ); - } - } - public String getFailureBehavior() { return failureBehavior;