Author: jvanzyl
Date: Fri Dec 12 19:17:35 2008
New Revision: 726164
URL: http://svn.apache.org/viewvc?rev=726164&view=rev
Log:
o get rid of more Settings references beyond the embedder
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=726164&r1=726163&r2=726164&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
Fri Dec 12 19:17:35 2008
@@ -293,5 +293,14 @@
{
return request.getProjectBuildingConfiguration();
}
-
+
+ public List<String> getPluginGroups()
+ {
+ return request.getPluginGroups();
+ }
+
+ public boolean isOffline()
+ {
+ return request.isOffline();
+ }
}
\ No newline at end of file
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=726164&r1=726163&r2=726164&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Fri Dec 12 19:17:35 2008
@@ -19,6 +19,12 @@
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Stack;
+
import org.apache.maven.AggregatedBuildFailureException;
import org.apache.maven.BuildFailureException;
import org.apache.maven.NoGoalsSpecifiedException;
@@ -48,23 +54,13 @@
import org.apache.maven.plugin.loader.PluginLoaderException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-
/**
* Responsible for orchestrating the process of building the ordered list of
* steps required to achieve the specified set of tasks passed into Maven, then
@@ -110,9 +106,7 @@
/**
* {...@inheritdoc}
*/
- public void execute( final MavenSession session,
- final ReactorManager reactorManager,
- final EventDispatcher dispatcher )
+ public void execute( MavenSession session, ReactorManager reactorManager,
EventDispatcher dispatcher )
throws BuildFailureException, LifecycleExecutionException
{
// TODO: This is dangerous, particularly when it's just a collection
of loose-leaf projects being built
@@ -219,27 +213,15 @@
{
if ( !reactorManager.isBlackListed( project ) )
{
-// line();
-//
-// getLogger().info( "Building " + project.getName() );
-//
-// getLogger().info( " " + segment );
-//
-// line();
-
String target = project.getName() + "\nId: " + project.getId() +
"\n" + segment;
getLogger().debug( "Constructing build plan for " + target );
- // !! This is ripe for refactoring to an aspect.
- // Event monitoring.
String event = MavenEvents.PROJECT_EXECUTION;
long buildStartTime = System.currentTimeMillis();
- dispatcher.dispatchStart(
- event,
- target );
+ dispatcher.dispatchStart( event, target );
ClassRealm oldLookupRealm = setProjectLookupRealm( session,
project );
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=726164&r1=726163&r2=726164&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Fri Dec 12 19:17:35 2008
@@ -168,7 +168,7 @@
{
// TODO: since this is only used in the lifecycle executor, maybe it
should be moved there? There is no other
// use for the mapping manager in here
- return pluginMappingManager.getByPrefix( prefix,
session.getSettings().getPluginGroups(),
+ return pluginMappingManager.getByPrefix( prefix,
session.getPluginGroups(),
project.getRemoteArtifactRepositories(),
session.getLocalRepository()
);
}
@@ -505,7 +505,7 @@
+ ". It requires
a project with an existing pom.xml, but the build is not using one." );
}
- if ( mojoDescriptor.isOnlineRequired() &&
session.getSettings().isOffline() )
+ if ( mojoDescriptor.isOnlineRequired() && session.isOffline() )
{
// TODO: Should we error out, or simply warn and skip??
throw new PluginExecutionException( mojoExecution, project,
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java?rev=726164&r1=726163&r2=726164&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginPrefixLoader.java
Fri Dec 12 19:17:35 2008
@@ -7,7 +7,7 @@
import org.apache.maven.plugin.PluginMappingManager;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Settings;
+//import org.apache.maven.settings.Settings;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.LogEnabled;
@@ -160,10 +160,8 @@
MavenSession session )
throws PluginLoaderException
{
- Settings settings = session.getSettings();
-
Plugin plugin = pluginMappingManager.getByPrefix( prefix,
-
settings.getPluginGroups(),
+
session.getPluginGroups(),
project.getRemoteArtifactRepositories(),
session.getLocalRepository() );
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=726164&r1=726163&r2=726164&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
Fri Dec 12 19:17:35 2008
@@ -344,18 +344,13 @@
throws CycleDetectedException, DuplicateProjectException
{
MavenExecutionRequest request = new DefaultMavenExecutionRequest()
- .setSettings( new Settings() )
.setProperties( new Properties() )
.setStartTime( new Date() )
.setGoals( Collections.EMPTY_LIST )
.setBaseDirectory( new File( "" ) )
.setLocalRepository( repo );
-// return new MavenSession( container, request, new
DefaultEventDispatcher(),
-// new ReactorManager( Collections.EMPTY_LIST,
ReactorManager.FAIL_FAST ), Collections.EMPTY_MAP );
-
- return new MavenSession( container, request, new
DefaultEventDispatcher(),
- new ReactorManager( Collections.EMPTY_LIST,
ReactorManager.FAIL_FAST ) );
+ return new MavenSession( container, request, new
DefaultEventDispatcher(), new ReactorManager( Collections.EMPTY_LIST,
ReactorManager.FAIL_FAST ) );
}
public void testLocalRepositoryExtraction()
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java?rev=726164&r1=726163&r2=726164&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java
Fri Dec 12 19:17:35 2008
@@ -5,13 +5,11 @@
import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusTestCase;
public class DefaultMavenExecutionRequestPopulatorTest
extends PlexusTestCase
{
-
private MavenExecutionRequestPopulator populator;
private WagonManager wagonManager;
@@ -28,10 +26,7 @@
public void testWagonManagerOfflineFlagIsPopulatedFromSettings()
throws MavenEmbedderException
{
- Settings settings = new Settings();
- settings.setOffline( true );
-
- MavenExecutionRequest req = new
DefaultMavenExecutionRequest().setSettings( settings );
+ MavenExecutionRequest req = new
DefaultMavenExecutionRequest().setOffline( true );
assertTrue( wagonManager.isOnline() );
