svn commit: r757129 - /maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

[jvanzyl]

Author: jvanzyl
Date: Sun Mar 22 04:56:10 2009
New Revision: 757129

URL: http://svn.apache.org/viewvc?rev=757129&view=rev
Log:
o remove Settings from the lifecycle executor

Modified:
    
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=757129&r1=757128&r2=757129&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 Sun Mar 22 04:56:10 2009
@@ -53,7 +53,6 @@
 import org.apache.maven.plugin.lifecycle.Phase;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.MavenReport;
-import org.apache.maven.settings.Settings;
 import org.codehaus.plexus.component.annotations.Requirement;
 import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -856,7 +855,7 @@
 
                             MojoDescriptor desc = getMojoDescriptor( 
lifecyclePluginDescriptor, lifecycleGoal );
                             MojoExecution mojoExecution = new MojoExecution( 
desc, configuration );
-                            addToLifecycleMappings( lifecycleMappings, 
phase.getId(), mojoExecution, session.getSettings() );
+                            addToLifecycleMappings( lifecycleMappings, 
phase.getId(), mojoExecution, session );
                         }
                     }
 
@@ -1006,7 +1005,7 @@
                         throw new LifecycleExecutionException( "Mojo: \'" + 
goal + "\' requires direct invocation. It cannot be used as part of lifecycle: 
\'" + project.getPackaging() + "\'." );
                     }
 
-                    addToLifecycleMappings( lifecycleMappings, phase, new 
MojoExecution( mojoDescriptor ), session.getSettings() );
+                    addToLifecycleMappings( lifecycleMappings, phase, new 
MojoExecution( mojoDescriptor ), session );
                 }
             }
 
@@ -1106,8 +1105,6 @@
     private void bindPluginToLifecycle( Plugin plugin, MavenSession session, 
Map phaseMap, MavenProject project )
         throws LifecycleExecutionException
     {
-        Settings settings = session.getSettings();
-
         PluginDescriptor pluginDescriptor = loadPlugin( plugin, project, 
session );
 
         if ( pluginDescriptor.getMojos() != null && 
!pluginDescriptor.getMojos().isEmpty() )
@@ -1128,14 +1125,14 @@
                     {
                         PluginExecution execution = (PluginExecution) 
it.next();
 
-                        bindExecutionToLifecycle( pluginDescriptor, phaseMap, 
execution, settings );
+                        bindExecutionToLifecycle( pluginDescriptor, phaseMap, 
execution, session );
                     }
                 }
             }
         }
     }
 
-    private void bindExecutionToLifecycle( PluginDescriptor pluginDescriptor, 
Map phaseMap, PluginExecution execution, Settings settings )
+    private void bindExecutionToLifecycle( PluginDescriptor pluginDescriptor, 
Map phaseMap, PluginExecution execution, MavenSession session )
         throws LifecycleExecutionException
     {
         for ( Iterator i = execution.getGoals().iterator(); i.hasNext(); )
@@ -1168,13 +1165,13 @@
                         throw new LifecycleExecutionException( "Mojo: \'" + 
goal + "\' requires direct invocation. It cannot be used as part of the 
lifecycle (it was included via the POM)." );
                     }
 
-                    addToLifecycleMappings( phaseMap, phase, mojoExecution, 
settings );
+                    addToLifecycleMappings( phaseMap, phase, mojoExecution, 
session );
                 }
             }
         }
     }
 
-    private void addToLifecycleMappings( Map lifecycleMappings, String phase, 
MojoExecution mojoExecution, Settings settings )
+    private void addToLifecycleMappings( Map lifecycleMappings, String phase, 
MojoExecution mojoExecution, MavenSession session )
     {
         List goals = (List) lifecycleMappings.get( phase );
 
@@ -1185,7 +1182,7 @@
         }
 
         MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-        if ( settings.isOffline() && mojoDescriptor.isOnlineRequired() )
+        if ( session.isOffline() && mojoDescriptor.isOnlineRequired() )
         {
             String goal = mojoDescriptor.getGoal();
             getLogger().warn( goal + " requires online mode, but maven is 
currently offline. Disabling " + goal + "." );