svn commit: r512545 - in /maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution: ExecutionBuildContext.java MavenExecutionRequest.java

[jvanzyl]

Author: jvanzyl
Date: Tue Feb 27 17:24:26 2007
New Revision: 512545

URL: http://svn.apache.org/viewvc?view=rev&rev=512545
Log:
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.

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

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java?view=diff&rev=512545&r1=512544&r2=512545
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionBuildContext.java
 Tue Feb 27 17:24:26 2007
@@ -138,11 +138,6 @@
         return request.getSettings();
     }
 
-    public String getSettingsFile()
-    {
-        return request.getSettingsFile();
-    }
-
     public Date getStartTime()
     {
         return request.getStartTime();

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?view=diff&rev=512545&r1=512544&r2=512545
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
 Tue Feb 27 17:24:26 2007
@@ -16,12 +16,11 @@
  * 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 @@
     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 @@
     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 @@
     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 );
 }