You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/02/24 01:57:01 UTC
svn commit: r511175 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/execution/
maven-embedder/src/main/java/org/apache/maven/embedder/execution/
Author: jdcasey
Date: Fri Feb 23 16:57:00 2007
New Revision: 511175
URL: http://svn.apache.org/viewvc?view=rev&rev=511175
Log:
adding SettingsBuilderAdvice configuration the MavenExecutionRequest.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.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=511175&r1=511174&r2=511175
==============================================================================
--- 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 Fri Feb 23 16:57:00 2007
@@ -19,6 +19,7 @@
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 java.io.File;
@@ -107,6 +108,8 @@
*/
private boolean noSnapshotUpdates;
+ private SettingsBuilderAdvice advice;
+
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -518,6 +521,16 @@
this.recursive = recursive;
return this;
+ }
+
+ public SettingsBuilderAdvice getSettingsBuilderAdvice()
+ {
+ return advice;
+ }
+
+ public void setSettingsBuilderAdvice( SettingsBuilderAdvice advice )
+ {
+ this.advice = advice;
}
}
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=511175&r1=511174&r2=511175
==============================================================================
--- 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 Fri Feb 23 16:57:00 2007
@@ -18,6 +18,7 @@
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;
@@ -190,4 +191,7 @@
boolean isUsePluginUpdateOverride();
MavenExecutionRequest setUsePluginUpdateOverride( boolean usePluginUpdateOverride );
+
+ SettingsBuilderAdvice getSettingsBuilderAdvice();
+ void setSettingsBuilderAdvice( SettingsBuilderAdvice advice );
}
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java?view=diff&rev=511175&r1=511174&r2=511175
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java Fri Feb 23 16:57:00 2007
@@ -23,7 +23,6 @@
import org.apache.maven.SettingsConfigurationException;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.embedder.MavenEmbedder;
import org.apache.maven.embedder.MavenEmbedderConfiguration;
import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -84,23 +83,25 @@
}
}
- File userSettingsPath = mavenTools.getUserSettingsPath( userSettingsLocation );
+ File userSettingsPath = null; //mavenTools.getUserSettingsPath( userSettingsLocation );
+ if ( userSettingsLocation != null )
+ {
+ userSettingsPath = new File( userSettingsLocation );
+ }
- File globalSettingsFile = mavenTools.getGlobalSettingsPath();
- if ( globalSettingsFile.equals( MavenEmbedder.DEFAULT_GLOBAL_SETTINGS_FILE ) )
+ File globalSettingsFile = null; //mavenTools.getGlobalSettingsPath();
+
+ File configGlobalSettings = embedderConfiguration.getGlobalSettingsFile();
+ if ( configGlobalSettings != null )
{
- File configGlobalSettings = embedderConfiguration.getGlobalSettingsFile();
- if ( configGlobalSettings != null )
- {
- globalSettingsFile = configGlobalSettings;
- }
+ globalSettingsFile = configGlobalSettings;
}
try
{
request.setSettings( mavenTools.buildSettings( userSettingsPath, globalSettingsFile, request
.isInteractiveMode(), request.isOffline(), request.isUsePluginRegistry(), request
- .isUsePluginUpdateOverride() ) );
+ .isUsePluginUpdateOverride(), request.getSettingsBuilderAdvice() ) );
}
catch ( SettingsConfigurationException e )
{