From f17c4fefe467c3adb95420d96874353468b5e6ac Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Wed, 28 Feb 2007 01:24:26 +0000
Subject: [PATCH] o don't need settings in here anymore, as we'll move toward
 session and request level configuration and eventually have a single source
 passing through   the core.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512545 13f79535-47bb-0310-9956-ffa450edef68
---
 .../execution/ExecutionBuildContext.java      |  5 ----
 .../execution/MavenExecutionRequest.java      | 27 ++++++-------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java b/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
index c9c2c2bbc6..451c0e48a7 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
@@ -138,11 +138,6 @@ public class ExecutionBuildContext
         return request.getSettings();
     }
 
-    public String getSettingsFile()
-    {
-        return request.getSettingsFile();
-    }
-
     public Date getStartTime()
     {
         return request.getStartTime();
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
index 408771c8f1..26b196d8d0 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
@@ -16,12 +16,11 @@ package org.apache.maven.execution;
  * limitations under the License.
  */
 
-import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.settings.SettingsBuilderAdvice;
-import org.apache.maven.wagon.events.TransferListener;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.monitor.event.EventMonitor;
+import org.apache.maven.wagon.events.TransferListener;
+import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.logging.Logger;
 
 import java.io.File;
@@ -77,10 +76,6 @@ public interface MavenExecutionRequest
     MavenExecutionRequest setBaseDirectory( File basedir );
     String getBaseDirectory();
 
-    // Settings
-    MavenExecutionRequest setSettings( Settings settings );
-    Settings getSettings();
-
     // Timing (remove this)
     MavenExecutionRequest setStartTime( Date start );
     Date getStartTime();
@@ -135,14 +130,6 @@ public interface MavenExecutionRequest
     MavenExecutionRequest setGlobalChecksumPolicy( String globalChecksumPolicy );
     String getGlobalChecksumPolicy();
 
-    // ----------------------------------------------------------------------------
-    // Settings equivalents
-    // ----------------------------------------------------------------------------
-
-    // Settings
-    MavenExecutionRequest setSettingsFile( String settingsFile );
-    String getSettingsFile();
-
     // Local repository
     MavenExecutionRequest setLocalRepositoryPath( String localRepository );
     MavenExecutionRequest setLocalRepositoryPath( File localRepository );
@@ -185,13 +172,15 @@ public interface MavenExecutionRequest
     List getPluginGroups();
     MavenExecutionRequest setPluginGroups( List pluginGroups );
 
+    //PLXAPI: should go away
     // Plugin registry
     boolean isUsePluginRegistry();
     MavenExecutionRequest setUsePluginRegistry( boolean usePluginRegistry );
 
     boolean isUsePluginUpdateOverride();
     MavenExecutionRequest setUsePluginUpdateOverride( boolean usePluginUpdateOverride );
-    
-    SettingsBuilderAdvice getSettingsBuilderAdvice();
-    MavenExecutionRequest setSettingsBuilderAdvice( SettingsBuilderAdvice advice );
+
+    // Setting
+    Settings getSettings();
+    MavenExecutionRequest setSettings( Settings settings );
 }