You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ev...@apache.org on 2006/02/21 16:26:10 UTC
svn commit: r379489 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/
maven-project/src/main/java/org/apache/maven/profiles/
Author: evenisse
Date: Tue Feb 21 07:26:09 2006
New Revision: 379489
URL: http://svn.apache.org/viewcvs?rev=379489&view=rev
Log:
merge from branch rev.379486
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=379489&r1=379488&r2=379489&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 Tue Feb 21 07:26:09 2006
@@ -270,7 +270,7 @@
ProfileManager globalProfileManager = request.getGlobalProfileManager();
- loadSettingsProfiles( globalProfileManager, request.getSettings() );
+ globalProfileManager.loadSettingsProfiles( request.getSettings() );
getLogger().info( "Scanning for projects..." );
@@ -513,28 +513,6 @@
}
return projectBuilder.build( pom, localRepository, globalProfileManager );
- }
-
- private void loadSettingsProfiles( ProfileManager profileManager, Settings settings )
- {
- List settingsProfiles = settings.getProfiles();
-
- if ( settingsProfiles != null && !settingsProfiles.isEmpty() )
- {
- List settingsActiveProfileIds = settings.getActiveProfiles();
-
- profileManager.explicitlyActivate( settingsActiveProfileIds );
-
- for ( Iterator it = settings.getProfiles().iterator(); it.hasNext(); )
- {
- org.apache.maven.settings.Profile rawProfile = (org.apache.maven.settings.Profile) it.next();
-
- Profile profile = SettingsUtils.convertFromSettingsProfile( rawProfile );
-
- profileManager.addProfile( profile );
- }
- }
-
}
// ----------------------------------------------------------------------
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?rev=379489&r1=379488&r2=379489&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java Tue Feb 21 07:26:09 2006
@@ -252,7 +252,7 @@
return defaultIds;
}
- private void loadSettingsProfiles( Settings settings )
+ public void loadSettingsProfiles( Settings settings )
{
if ( settings == null )
{
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java?rev=379489&r1=379488&r2=379489&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java Tue Feb 21 07:26:09 2006
@@ -2,6 +2,7 @@
import org.apache.maven.model.Profile;
import org.apache.maven.profiles.activation.ProfileActivationException;
+import org.apache.maven.settings.Settings;
import java.util.List;
import java.util.Map;
@@ -18,7 +19,7 @@
void explicitlyDeactivate( String profileId );
void explicitlyDeactivate( List profileIds );
-
+
void activateAsDefault( String profileId );
List getActiveProfiles()
@@ -27,11 +28,12 @@
void addProfiles( List profiles );
Map getProfilesById();
-
+
List getExplicitlyActivatedIds();
-
+
List getExplicitlyDeactivatedIds();
-
+
List getIdsActivatedByDefault();
-
+
+ void loadSettingsProfiles( Settings settings )
}