Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o fixinga bunch of embedder tests, 8 left to fix 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774768 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-05-14 13:52:03 +00:00
parent 060c6d9784
commit 7ccc3d878e
6 changed files with 52 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -126,7 +126,7 @@ public MavenExecutionResult execute( MavenExecutionRequest request )
try
{
ProjectSorter projectSorter = new ProjectSorter( projects.values() );
session = new MavenSession( container, request, result, projectSorter.getSortedProjects() );
}
catch ( CycleDetectedException e )
@ -163,7 +163,7 @@ public MavenExecutionResult execute( MavenExecutionRequest request )
}
result.setTopologicallySortedProjects( session.getProjects() );
result.setProject( session.getTopLevelProject() );
return result;

3
maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
View File

@ -71,8 +71,9 @@ public MavenSession( PlexusContainer container, MavenExecutionRequest request, M
if ( projects.size() > 0 )
{
this.currentProject = projects.get( 0 );
this.topLevelProject = projects.get( 0 );
}
this.projects = projects;
this.projects = projects;
}
@Deprecated

2
maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -106,7 +106,7 @@ public class DefaultMavenProjectBuilder
public MavenProject build( File pomFile, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException
{
{
MavenProject project = projectCache.get( pomFile.getAbsolutePath() );
if ( project != null )

26
maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
View File

@ -24,22 +24,24 @@
public interface MavenProjectBuilder
{
// site
MavenProject build( File project, ArtifactRepository localRepository, ProfileManager profileManager )
throws ProjectBuildingException;
// remote-resources-plugin
MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
throws ProjectBuildingException;
MavenProject build( File project, ProjectBuilderConfiguration configuration )
MavenProject build( File projectFile, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException;
MavenProject buildFromRepository( Artifact projectArtifact, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException;
//TODO maven-site-plugin
MavenProject build( File project, ArtifactRepository localRepository, ProfileManager profileManager )
throws ProjectBuildingException;
//TODO remote-resources-plugin
MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
throws ProjectBuildingException;
// TODO: This also doesn't really belong here as it's a mix of project builder and artifact resolution and belongs
// in an integration component like the embedder.
MavenProjectBuildingResult buildProjectWithDependencies( File project, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException;
MavenProject buildFromRepository( Artifact artifact, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException;
// TODO: this is only to provide a project for plugins that don't need a project to execute but need some
// of the values from a MavenProject. Ideally this should be something internal and nothing outside Maven

5
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
View File

@ -514,7 +514,6 @@ public Configuration getConfiguration()
public boolean isOffline( MavenExecutionRequest request )
throws MavenEmbedderException
{
// first, grab defaults including settings, in case <offline>true</offline> is set.
request = populator.populateDefaults( request, configuration );
return request.isOffline();
@ -525,9 +524,7 @@ public MavenExecutionResult execute( MavenExecutionRequest request )
LoggerManager loggerManager = container.getLoggerManager();
int oldThreshold = loggerManager.getThreshold();
try
{
loggerManager.setThresholds( request.getLoggingLevel() );

33
maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
View File

@ -22,6 +22,7 @@
import java.util.Properties;
import java.util.Set;
import org.apache.maven.Maven;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.embedder.Configuration;
@ -72,6 +73,8 @@ public MavenExecutionRequest populateDefaults( MavenExecutionRequest request, Co
{
executionProperties( request, configuration );
pom( request, configuration );
settings( request, configuration );
localRepository( request, configuration );
@ -81,7 +84,7 @@ public MavenExecutionRequest populateDefaults( MavenExecutionRequest request, Co
profileManager( request, configuration );
processSettings( request, configuration );
return request;
}
@ -113,6 +116,34 @@ private void executionProperties( MavenExecutionRequest request, Configuration c
}
}
}
private void pom( MavenExecutionRequest request, Configuration configuration )
{
// ------------------------------------------------------------------------
// POM
//
// If we are not given a specific POM file, but passed a base directory
// then we will use a release POM in the directory provide, or and then
// look for the standard POM.
// ------------------------------------------------------------------------
if ( ( request.getPom() != null ) && ( request.getPom().getParentFile() != null ) )
{
request.setBaseDirectory( request.getPom().getParentFile() );
}
else if ( ( request.getPom() == null ) && ( request.getBaseDirectory() != null ) )
{
File pom = new File( request.getBaseDirectory(), Maven.POMv4 );
request.setPom( pom );
}
// TODO: Is this correct?
else if ( request.getBaseDirectory() == null )
{
request.setBaseDirectory( new File( System.getProperty( "user.dir" ) ) );
}
}
private void processSettings( MavenExecutionRequest request, Configuration configuration )
throws MavenEmbedderException