You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/09/02 02:01:31 UTC
svn commit: r571903 - in
/maven/components/trunk/maven-core/src/main/java/org/apache/maven:
DefaultMaven.java execution/DefaultMavenExecutionRequest.java
execution/MavenExecutionRequest.java
Author: jvanzyl
Date: Sat Sep 1 17:01:30 2007
New Revision: 571903
URL: http://svn.apache.org/viewvc?rev=571903&view=rev
Log:
o the profile manager creation now happens up front in the embedder
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
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
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=571903&r1=571902&r2=571903&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Sat Sep 1 17:01:30 2007
@@ -129,13 +129,6 @@
// old doExecute
- ProfileManager globalProfileManager = new DefaultProfileManager( container, request.getProperties() );
-
- globalProfileManager.loadSettingsProfiles( request.getSettings() );
-
- globalProfileManager.explicitlyActivate( request.getActiveProfiles() );
-
- globalProfileManager.explicitlyDeactivate( request.getInactiveProfiles() );
getLogger().info( "Scanning for projects..." );
@@ -145,7 +138,7 @@
try
{
- projects = getProjects( request, globalProfileManager );
+ projects = getProjects( request );
if ( projects.isEmpty() )
{
@@ -332,7 +325,7 @@
return superProject;
}
- private List getProjects( MavenExecutionRequest request, ProfileManager globalProfileManager )
+ private List getProjects( MavenExecutionRequest request )
throws MavenExecutionException, BuildFailureException
{
List projects;
@@ -351,7 +344,7 @@
// instances just-in-time.
try
{
- buildExtensionScanner.scanForBuildExtensions( files, request.getLocalRepository(), globalProfileManager );
+ buildExtensionScanner.scanForBuildExtensions( files, request.getLocalRepository(), request.getProfileManager() );
}
catch ( ExtensionScanningException e )
{
@@ -361,7 +354,7 @@
try
{
projects = collectProjects( files, request.getLocalRepository(), request.isRecursive(),
- request.getSettings(), globalProfileManager, !request.useReactor() );
+ request.getSettings(), request.getProfileManager(), !request.useReactor() );
}
catch ( ArtifactResolutionException e )
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?rev=571903&r1=571902&r2=571903&view=diff
==============================================================================
--- 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 Sat Sep 1 17:01:30 2007
@@ -21,6 +21,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.monitor.event.EventMonitor;
+import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
@@ -93,6 +94,8 @@
private boolean updateSnapshots = false;
+ private ProfileManager profileManager;
+
/**
* Suppress SNAPSHOT updates.
* @issue MNG-2681
@@ -501,5 +504,17 @@
public Settings getSettings()
{
return settings;
+ }
+
+ public ProfileManager getProfileManager()
+ {
+ return profileManager;
+ }
+
+ public MavenExecutionRequest setProfileManager( ProfileManager profileManager )
+ {
+ this.profileManager = profileManager;
+
+ return this;
}
}
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?rev=571903&r1=571902&r2=571903&view=diff
==============================================================================
--- 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 Sat Sep 1 17:01:30 2007
@@ -22,6 +22,7 @@
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.profiles.ProfileManager;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
import org.codehaus.plexus.logging.Logger;
@@ -182,4 +183,7 @@
// Setting
Settings getSettings();
MavenExecutionRequest setSettings( Settings settings );
+
+ ProfileManager getProfileManager();
+ MavenExecutionRequest setProfileManager( ProfileManager profileManager );
}