continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r380255 - /maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
Date Thu, 23 Feb 2006 22:36:04 GMT
Author: evenisse
Date: Thu Feb 23 14:36:00 2006
New Revision: 380255

URL: http://svn.apache.org/viewcvs?rev=380255&view=rev
Log:
Use new settings loader mechanism

Modified:
    maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java

Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=380255&r1=380254&r2=380255&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
Thu Feb 23 14:36:00 2006
@@ -293,9 +293,7 @@
                 writeSettings( settings );
             }
 
-            ProfileManager profileManager = new DefaultProfileManager( container );
-
-            loadSettingsProfiles( profileManager, settings );
+            ProfileManager profileManager = new DefaultProfileManager( container, settings
);
 
             project = projectBuilder.build( file, getRepository( settings ), profileManager,
false );
 
@@ -465,27 +463,6 @@
 
         return artifactRepositoryFactory.createArtifactRepository( "local", "file://" + localRepo,
repositoryLayout,
                                                                    null, null );
-    }
-
-    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 );
-            }
-        }
     }
 
     private void writeSettings( Settings settings )



Mime
View raw message