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

o removing the configuration from the populator 

Submitted by: Igor Fedorenko


git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777713 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-05-22 21:04:43 +00:00
parent 677a6b59d6
commit bc8ff5f600
2 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import org.apache.maven.Maven;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.MavenEmbedder;
import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.repository.RepositorySystem;
@ -55,20 +56,36 @@ public class DefaultMavenExecutionRequestPopulator
public MavenExecutionRequest populateDefaults( MavenExecutionRequest request, Configuration configuration )
throws MavenEmbedderException
{
pom( request, configuration );
// copy configuration to request
settings( request, configuration );
localRepository( request, configuration );
toolchains( request, configuration );
processSettings( request, configuration );
return request;
if ( configuration.getGlobalSettingsFile() != null )
{
request.setGlobalSettingsFile( configuration.getGlobalSettingsFile() );
}
private void pom( MavenExecutionRequest request, Configuration configuration )
if ( configuration.getUserSettingsFile() != null )
{
request.setUserSettingsFile( configuration.getUserSettingsFile() );
}
String localRepositoryPath = null;
if ( request.getLocalRepositoryPath() != null )
{
localRepositoryPath = request.getLocalRepositoryPath().getAbsolutePath();
}
if ( StringUtils.isEmpty( localRepositoryPath ) && ( configuration.getLocalRepository() != null ) )
{
localRepositoryPath = configuration.getLocalRepository().getAbsolutePath();
}
// populate the defaults
return populateDefaults( request );
}
private void pom( MavenExecutionRequest request )
{
// ------------------------------------------------------------------------
// POM
@ -100,7 +117,7 @@ public class DefaultMavenExecutionRequestPopulator
}
}
private void populateDefaultPluginGroups( MavenExecutionRequest request, Configuration configuration )
private void populateDefaultPluginGroups( MavenExecutionRequest request )
{
request.addPluginGroup( "org.apache.maven.plugins" );
request.addPluginGroup( "org.codehaus.mojo" );
@ -109,14 +126,14 @@ public class DefaultMavenExecutionRequestPopulator
// Process plugin groups
// Get profile models
// Get active profiles
private void processSettings( MavenExecutionRequest request, Configuration configuration )
private void processSettings( MavenExecutionRequest request )
throws MavenEmbedderException
{
Settings settings = request.getSettings();
request.addPluginGroups( settings.getPluginGroups() );
populateDefaultPluginGroups( request, configuration );
populateDefaultPluginGroups( request );
List<org.apache.maven.settings.Profile> settingsProfiles = settings.getProfiles();
@ -138,7 +155,7 @@ public class DefaultMavenExecutionRequestPopulator
injectDefaultRepositories( request );
processRepositoriesInSettings( request, configuration );
processRepositoriesInSettings( request );
}
private void injectDefaultRepositories( MavenExecutionRequest request )
@ -166,7 +183,7 @@ public class DefaultMavenExecutionRequestPopulator
}
}
private void processRepositoriesInSettings( MavenExecutionRequest request, Configuration configuration )
private void processRepositoriesInSettings( MavenExecutionRequest request )
throws MavenEmbedderException
{
Settings settings = request.getSettings();
@ -225,7 +242,7 @@ public class DefaultMavenExecutionRequestPopulator
// Settings
// ------------------------------------------------------------------------
private void settings( MavenExecutionRequest request, Configuration configuration )
private void settings( MavenExecutionRequest request )
{
// ------------------------------------------------------------------------
// Settings
@ -238,14 +255,14 @@ public class DefaultMavenExecutionRequestPopulator
if ( request.getSettings() == null )
{
if ( configuration.getGlobalSettingsFile() != null )
if ( request.getGlobalSettingsFile() == null )
{
request.setGlobalSettingsFile( configuration.getGlobalSettingsFile() );
request.setGlobalSettingsFile( MavenEmbedder.DEFAULT_GLOBAL_SETTINGS_FILE );
}
if ( configuration.getUserSettingsFile() != null )
if ( request.getUserSettingsFile() == null )
{
request.setUserSettingsFile( configuration.getUserSettingsFile() );
request.setUserSettingsFile( MavenEmbedder.DEFAULT_USER_SETTINGS_FILE );
}
try
@ -261,7 +278,7 @@ public class DefaultMavenExecutionRequestPopulator
}
}
private void localRepository( MavenExecutionRequest request, Configuration configuration )
private void localRepository( MavenExecutionRequest request )
throws MavenEmbedderException
{
// ------------------------------------------------------------------------
@ -274,7 +291,7 @@ public class DefaultMavenExecutionRequestPopulator
if ( request.getLocalRepository() == null )
{
request.setLocalRepository( createLocalRepository( request, request.getSettings(), configuration ) );
request.setLocalRepository( createLocalRepository( request, request.getSettings() ) );
}
if ( request.getLocalRepositoryPath() == null )
@ -287,7 +304,7 @@ public class DefaultMavenExecutionRequestPopulator
// Artifact Transfer Mechanism
// ------------------------------------------------------------------------
public ArtifactRepository createLocalRepository( MavenExecutionRequest request, Settings settings, Configuration configuration )
public ArtifactRepository createLocalRepository( MavenExecutionRequest request, Settings settings )
throws MavenEmbedderException
{
String localRepositoryPath = null;
@ -297,11 +314,6 @@ public class DefaultMavenExecutionRequestPopulator
localRepositoryPath = request.getLocalRepositoryPath().getAbsolutePath();
}
if ( StringUtils.isEmpty( localRepositoryPath ) && ( configuration.getLocalRepository() != null ) )
{
localRepositoryPath = configuration.getLocalRepository().getAbsolutePath();
}
if ( StringUtils.isEmpty( localRepositoryPath ) )
{
localRepositoryPath = settings.getLocalRepository();
@ -322,9 +334,25 @@ public class DefaultMavenExecutionRequestPopulator
}
}
private void toolchains( MavenExecutionRequest request, Configuration configuration )
private void toolchains( MavenExecutionRequest request )
{
// FIXME individual requests must not change global state
toolchainsBuilder.setUserToolchainsFile( request.getUserToolchainsFile() );
}
public MavenExecutionRequest populateDefaults( MavenExecutionRequest request )
throws MavenEmbedderException
{
pom( request );
settings( request );
localRepository( request );
toolchains( request );
processSettings( request );
return request;
}
}

4
maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestPopulator.java
View File

@ -29,4 +29,8 @@ public interface MavenExecutionRequestPopulator
MavenExecutionRequest populateDefaults( MavenExecutionRequest request, Configuration configuration )
throws MavenEmbedderException;
MavenExecutionRequest populateDefaults( MavenExecutionRequest request )
throws MavenEmbedderException;
}