Author: jvanzyl
Date: Tue Mar 31 04:59:06 2009
New Revision: 760333
URL: http://svn.apache.org/viewvc?rev=760333&view=rev
Log:
o the session has no lookup or access to the container now
Modified:
maven/components/branches/MNG-2766/maven-core/pom.xml
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Modified: maven/components/branches/MNG-2766/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/pom.xml?rev=760333&r1=760332&r2=760333&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-core/pom.xml Tue Mar 31 04:59:06
2009
@@ -41,11 +41,13 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-project-builder</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+ -->
<!-- Plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=760333&r1=760332&r2=760333&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
Tue Mar 31 04:59:06 2009
@@ -36,7 +36,7 @@
implements ArtifactFilterManager
{
- private static final Set DEFAULT_EXCLUSIONS;
+ private static final Set<String> DEFAULT_EXCLUSIONS;
static
{
@@ -78,7 +78,7 @@
DEFAULT_EXCLUSIONS = artifacts;
}
- protected Set excludedArtifacts = new HashSet( DEFAULT_EXCLUSIONS );
+ protected Set<String> excludedArtifacts = new HashSet<String>(
DEFAULT_EXCLUSIONS );
/**
* @deprecated Use this class as a component instead, and then use
getArtifactFilter().
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=760333&r1=760332&r2=760333&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Tue Mar 31 04:59:06 2009
@@ -144,7 +144,7 @@
try
{
- session = new MavenSession( container, request, projects );
+ session = new MavenSession( request, projects );
result.setReactorManager( session.getReactorManager() );
}
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=760333&r1=760332&r2=760333&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Tue Mar 31 04:59:06 2009
@@ -676,6 +676,7 @@
return this;
}
+ //TODO: this does not belong here.
public ProjectBuilderConfiguration getProjectBuildingConfiguration()
{
if ( projectBuildingConfiguration == null )
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=760333&r1=760332&r2=760333&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
Tue Mar 31 04:59:06 2009
@@ -29,7 +29,6 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.settings.Settings;
-import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.util.dag.CycleDetectedException;
/**
@@ -38,8 +37,6 @@
*/
public class MavenSession
{
- private PlexusContainer container;
-
private ReactorManager reactorManager;
private MavenExecutionRequest request;
@@ -47,22 +44,20 @@
private MavenProject currentProject;
// Used by the embedder to verifyPlugin
- public MavenSession( PlexusContainer container, MavenExecutionRequest
request )
+ public MavenSession( MavenExecutionRequest request )
{
- this.container = container;
this.request = request;
}
- public MavenSession( PlexusContainer container, MavenExecutionRequest
request, MavenProject project )
+ public MavenSession( MavenExecutionRequest request, MavenProject project )
throws CycleDetectedException, DuplicateProjectException
{
- this( container, request, Arrays.asList( new MavenProject[]{ project }
) );
+ this( request, Arrays.asList( new MavenProject[]{ project } ) );
}
- public MavenSession( PlexusContainer container, MavenExecutionRequest
request, List<MavenProject> projects )
+ public MavenSession( MavenExecutionRequest request, List<MavenProject>
projects )
throws CycleDetectedException, DuplicateProjectException
{
- this.container = container;
this.request = request;
this.reactorManager = new ReactorManager( projects,
request.getReactorFailureBehavior() );
this.currentProject = projects.get( 0 );
@@ -77,11 +72,6 @@
return reactorManager.getPluginContext( pluginDescriptor, project );
}
-
- public PlexusContainer getContainer()
- {
- return container;
- }
public ArtifactRepository getLocalRepository()
{
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java?rev=760333&r1=760332&r2=760333&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTest.java
Tue Mar 31 04:59:06 2009
@@ -99,7 +99,7 @@
// We just need to use the configuration, and get the POM from that.
MavenProject project = projectBuilder.build( pom, configuration );
- MavenSession session = new MavenSession( getContainer(), request,
project );
+ MavenSession session = new MavenSession( request, project );
return session;
}
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java?rev=760333&r1=760332&r2=760333&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
Tue Mar 31 04:59:06 2009
@@ -70,7 +70,7 @@
ReactorManager rm = new ReactorManager( Collections.singletonList(
project ), ReactorManager.FAIL_FAST );
MavenExecutionRequest request = new DefaultMavenExecutionRequest();
request.setLocalRepositoryPath( new File( System.getProperty(
"user.home" ), ".m2/repository" ) );
- MavenSession session = new MavenSession( getContainer(), request );
+ MavenSession session = new MavenSession( request );
return session;
}
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=760333&r1=760332&r2=760333&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
Tue Mar 31 04:59:06 2009
@@ -348,7 +348,7 @@
.setBaseDirectory( new File( "" ) )
.setLocalRepository( repo );
- return new MavenSession( container, request );
+ return new MavenSession( request );
}
public void testLocalRepositoryExtraction()
@@ -465,7 +465,7 @@
ReactorManager rm = new ReactorManager( Collections.singletonList(
project ), ReactorManager.FAIL_FAST );
MockControl mockMavenExecutionRequest = MockControl.createControl(
MavenExecutionRequest.class );
MavenExecutionRequest req = (MavenExecutionRequest)
mockMavenExecutionRequest.getMock();
- MavenSession session = new MavenSession( getContainer(), req );
+ MavenSession session = new MavenSession( req );
return session;
}
Modified:
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=760333&r1=760332&r2=760333&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Tue Mar 31 04:59:06 2009
@@ -89,6 +89,7 @@
//
//
----------------------------------------------------------------------------
+ //TODO: this needs to be the standard container
private MutablePlexusContainer container;
// ----------------------------------------------------------------------
@@ -274,7 +275,7 @@
protected void verifyPlugin( Plugin plugin, MavenProject project )
throws ComponentLookupException, PluginLoaderException
{
- MavenSession session = new MavenSession( container, request );
+ MavenSession session = new MavenSession( request );
pluginManager.loadPlugin( plugin, project, session );
}
