svn commit: r512544 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java

[jv...@apache.org]

Author: jvanzyl
Date: Tue Feb 27 17:23:32 2007
New Revision: 512544

URL: http://svn.apache.org/viewvc?view=rev&rev=512544
Log:
o have very much simplified the use of settings use so the settings advice is not required as it is the job
  of the client using the embedder to decide the semantics of use. some uses may have only one settings file, some may have five and
  some may have none. trying to move away from hardwired usage patterns for the embedder. the cli is now responsible for dealing with what
  is now standard insofar as user and global settings.

Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?view=diff&rev=512544&r1=512543&r2=512544
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Tue Feb 27 17:23:32 2007
@@ -18,9 +18,8 @@
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 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.settings.Settings;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -35,14 +34,6 @@
 public class DefaultMavenExecutionRequest
     implements MavenExecutionRequest
 {
-    // ----------------------------------------------------------------------------
-    // Settings equivalents
-    // ----------------------------------------------------------------------------
-
-    private Settings settings;
-
-    private String settingsFile;
-
     private ArtifactRepository localRepository;
     
     private File localRepositoryPath;
@@ -108,24 +99,6 @@
      */
     private boolean noSnapshotUpdates;
 
-    private SettingsBuilderAdvice advice;
-
-    // ----------------------------------------------------------------------
-    //
-    // ----------------------------------------------------------------------
-
-    public String getSettingsFile()
-    {
-        return settingsFile;
-    }
-
-    public MavenExecutionRequest setSettingsFile( String settingsFile )
-    {
-        this.settingsFile = settingsFile;
-
-        return this;
-    }
-
     public String getBaseDirectory()
     {
         if ( basedir == null )
@@ -136,11 +109,6 @@
         return basedir.getAbsolutePath();
     }
 
-    public Settings getSettings()
-    {
-        return settings;
-    }
-
     public ArtifactRepository getLocalRepository()
     {
         return localRepository;
@@ -269,13 +237,6 @@
         return this;
     }
 
-    public MavenExecutionRequest setSettings( Settings settings )
-    {
-        this.settings = settings;
-
-        return this;
-    }
-
     public MavenExecutionRequest setGoals( List goals )
     {
         this.goals = goals;
@@ -514,8 +475,6 @@
         return this;
     }
 
-    //
-
     public MavenExecutionRequest setRecursive( boolean recursive )
     {
         this.recursive = recursive;
@@ -523,16 +482,17 @@
         return this;
     }
 
-    public SettingsBuilderAdvice getSettingsBuilderAdvice()
-    {
-        return advice;
-    }
+    private Settings settings;
 
-    public MavenExecutionRequest setSettingsBuilderAdvice( SettingsBuilderAdvice advice )
+    public MavenExecutionRequest setSettings( Settings settings )
     {
-        this.advice = advice;
-        
+        this.settings = settings;
+
         return this;
     }
 
+    public Settings getSettings()
+    {
+        return settings;
+    }
 }