Author: bentmann
Date: Fri May 29 21:28:45 2009
New Revision: 780115
URL: http://svn.apache.org/viewvc?rev=780115&view=rev
Log:
o Made ProjectBuilder use ProjectBuildingRequest for naming consistency within
API
Added:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
- copied, changed from r780099,
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
- copied, changed from r780104,
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
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/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Fri May 29 21:28:45 2009
@@ -100,7 +100,7 @@
//TODO: We really need to get rid of this requirement in here. If
we know there is no project present
if ( projects.isEmpty() )
{
- MavenProject project =
projectBuilder.buildStandaloneSuperProject(
request.getProjectBuildingConfiguration() );
+ MavenProject project =
projectBuilder.buildStandaloneSuperProject( request.getProjectBuilderRequest()
);
projects.put( ArtifactUtils.key( project.getGroupId(),
project.getArtifactId(), project.getVersion() ), project );
request.setProjectPresent( false );
}
@@ -190,7 +190,7 @@
for ( File file : files )
{
- MavenProject project = projectBuilder.build( file,
request.getProjectBuildingConfiguration() );
+ MavenProject project = projectBuilder.build( file,
request.getProjectBuilderRequest() );
if ( ( project.getPrerequisites() != null ) && (
project.getPrerequisites().getMaven() != null ) )
{
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Fri May 29 21:28:45 2009
@@ -23,8 +23,8 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Profile;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
-import org.apache.maven.project.ProjectBuilderConfiguration;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
+import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
@@ -232,9 +232,9 @@
return this;
}
- public void setProjectBuildingConfiguration( ProjectBuilderConfiguration
projectBuildingConfiguration )
+ public void setProjectBuildingConfiguration( ProjectBuildingRequest
projectBuildingConfiguration )
{
- this.projectBuildingConfiguration = projectBuildingConfiguration;
+ this.projectBuilderRequest = projectBuildingConfiguration;
}
public List<String> getActiveProfiles()
@@ -617,7 +617,7 @@
private Settings settings;
// calculated from request attributes.
- private ProjectBuilderConfiguration projectBuildingConfiguration;
+ private ProjectBuildingRequest projectBuilderRequest;
public MavenExecutionRequest setSettings( Settings settings )
{
@@ -706,21 +706,21 @@
}
//TODO: this does not belong here.
- public ProjectBuilderConfiguration getProjectBuildingConfiguration()
+ public ProjectBuildingRequest getProjectBuilderRequest()
{
- if ( projectBuildingConfiguration == null )
+ if ( projectBuilderRequest == null )
{
- projectBuildingConfiguration = new
DefaultProjectBuilderConfiguration();
- projectBuildingConfiguration.setLocalRepository(
getLocalRepository() );
- projectBuildingConfiguration.setExecutionProperties(
getProperties() );
- projectBuildingConfiguration.setRemoteRepositories(
getRemoteRepositories() );
- projectBuildingConfiguration.setActiveProfileIds(
getActiveProfiles() );
- projectBuildingConfiguration.setInactiveProfileIds(
getInactiveProfiles() );
- projectBuildingConfiguration.setProfiles( getProfiles() );
- projectBuildingConfiguration.setProcessPlugins( true );
+ projectBuilderRequest = new DefaultProjectBuildingRequest();
+ projectBuilderRequest.setLocalRepository( getLocalRepository() );
+ projectBuilderRequest.setExecutionProperties( getProperties() );
+ projectBuilderRequest.setRemoteRepositories(
getRemoteRepositories() );
+ projectBuilderRequest.setActiveProfileIds( getActiveProfiles() );
+ projectBuilderRequest.setInactiveProfileIds( getInactiveProfiles()
);
+ projectBuilderRequest.setProfiles( getProfiles() );
+ projectBuilderRequest.setProcessPlugins( true );
}
- return projectBuildingConfiguration;
+ return projectBuilderRequest;
}
public MavenExecutionRequest addProfile( Profile profile )
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Fri May 29 21:28:45 2009
@@ -27,7 +27,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.model.Profile;
-import org.apache.maven.project.ProjectBuilderConfiguration;
+import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
import org.codehaus.plexus.logging.Logger;
@@ -202,5 +202,5 @@
File getUserToolchainsFile();
MavenExecutionRequest setUserToolchainsFile( File userToolchainsFile );
- ProjectBuilderConfiguration getProjectBuildingConfiguration();
+ ProjectBuildingRequest getProjectBuilderRequest();
}
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=780115&r1=780114&r2=780115&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 May 29 21:28:45 2009
@@ -28,7 +28,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilderConfiguration;
+import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.util.dag.CycleDetectedException;
@@ -132,9 +132,9 @@
return currentProject;
}
- public ProjectBuilderConfiguration getProjectBuilderConfiguration()
+ public ProjectBuildingRequest getProjectBuilderRequest()
{
- return request.getProjectBuildingConfiguration();
+ return request.getProjectBuilderRequest();
}
public List<String> getPluginGroups()
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Fri May 29 21:28:45 2009
@@ -19,16 +19,10 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.project.artifact.ProjectArtifact;
-import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.StringUtils;
/**
* @version $Id$
@@ -41,9 +35,6 @@
@Requirement
private ProjectBuilder projectBuilder;
- @Requirement
- private RepositorySystem repositorySystem;
-
// ----------------------------------------------------------------------
// MavenProjectBuilder Implementation
// ----------------------------------------------------------------------
@@ -101,50 +92,7 @@
public MavenProjectBuildingResult buildProjectWithDependencies( File
pomFile, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException
{
- MavenProject project = projectBuilder.build( pomFile, configuration );
-
- Artifact artifact = new ProjectArtifact( project );
-
- ArtifactResolutionRequest request = new ArtifactResolutionRequest()
- .setArtifact( artifact )
- .setResolveRoot( false )
- .setResolveTransitively( true )
- .setLocalRepository( configuration.getLocalRepository() )
- .setRemoteRepostories( project.getRemoteArtifactRepositories() )
- .setManagedVersionMap( project.getManagedVersionMap() );
-
- ArtifactResolutionResult result = repositorySystem.resolve( request );
-
- if ( result.hasExceptions() )
- {
- Exception e = result.getExceptions().get( 0 );
-
- throw new ProjectBuildingException( safeVersionlessKey(
project.getGroupId(), project.getArtifactId() ), "Unable to build project due
to an invalid dependency version: " + e.getMessage(),
- pomFile, e );
- }
-
- project.setArtifacts( result.getArtifacts() );
-
- return new MavenProjectBuildingResult( project, result );
- }
-
- private static String safeVersionlessKey( String groupId, String
artifactId )
- {
- String gid = groupId;
-
- if ( StringUtils.isEmpty( gid ) )
- {
- gid = "unknown";
- }
-
- String aid = artifactId;
-
- if ( StringUtils.isEmpty( aid ) )
- {
- aid = "unknown";
- }
-
- return ArtifactUtils.versionlessKey( gid, aid );
+ return projectBuilder.buildProjectWithDependencies( pomFile,
configuration );
}
}
\ No newline at end of file
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Fri May 29 21:28:45 2009
@@ -50,6 +50,7 @@
import org.apache.maven.model.profile.ProfileSelector;
import org.apache.maven.model.validation.ModelValidationResult;
import org.apache.maven.model.validation.ModelValidator;
+import org.apache.maven.project.artifact.ProjectArtifact;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -114,13 +115,13 @@
// MavenProjectBuilder Implementation
// ----------------------------------------------------------------------
- public MavenProject build( File pomFile, ProjectBuilderConfiguration
configuration )
+ public MavenProject build( File pomFile, ProjectBuildingRequest
configuration )
throws ProjectBuildingException
{
return build( pomFile, pomFile.getParentFile(), configuration );
}
- private MavenProject build( File pomFile, File projectDirectory,
ProjectBuilderConfiguration configuration )
+ private MavenProject build( File pomFile, File projectDirectory,
ProjectBuildingRequest configuration )
throws ProjectBuildingException
{
String cacheKey = getCacheKey( pomFile, configuration );
@@ -225,7 +226,7 @@
return project;
}
- private String getCacheKey( File pomFile, ProjectBuilderConfiguration
configuration )
+ private String getCacheKey( File pomFile, ProjectBuildingRequest
configuration )
{
StringBuilder buffer = new StringBuilder( 256 );
buffer.append( pomFile.getAbsolutePath() );
@@ -233,7 +234,7 @@
return buffer.toString();
}
- public MavenProject build( Artifact artifact, ProjectBuilderConfiguration
configuration )
+ public MavenProject build( Artifact artifact, ProjectBuildingRequest
configuration )
throws ProjectBuildingException
{
if ( !artifact.getType().equals( "pom" ) )
@@ -266,7 +267,7 @@
* I am taking out the profile handling and the interpolation of the base
directory until we
* spec this out properly.
*/
- public MavenProject buildStandaloneSuperProject(
ProjectBuilderConfiguration config )
+ public MavenProject buildStandaloneSuperProject( ProjectBuildingRequest
config )
throws ProjectBuildingException
{
if ( superProject != null )
@@ -290,7 +291,37 @@
return superProject;
}
- private Model interpolateModel( Model model, ProjectBuilderConfiguration
config, File projectDescriptor )
+ public MavenProjectBuildingResult buildProjectWithDependencies( File
pomFile, ProjectBuildingRequest request )
+ throws ProjectBuildingException
+ {
+ MavenProject project = build( pomFile, request );
+
+ Artifact artifact = new ProjectArtifact( project );
+
+ ArtifactResolutionRequest artifactRequest = new
ArtifactResolutionRequest()
+ .setArtifact( artifact )
+ .setResolveRoot( false )
+ .setResolveTransitively( true )
+ .setLocalRepository( request.getLocalRepository() )
+ .setRemoteRepostories( project.getRemoteArtifactRepositories() )
+ .setManagedVersionMap( project.getManagedVersionMap() );
+
+ ArtifactResolutionResult result = repositorySystem.resolve(
artifactRequest );
+
+ if ( result.hasExceptions() )
+ {
+ Exception e = result.getExceptions().get( 0 );
+
+ throw new ProjectBuildingException( safeVersionlessKey(
project.getGroupId(), project.getArtifactId() ), "Unable to build project due
to an invalid dependency version: " + e.getMessage(),
+ pomFile, e );
+ }
+
+ project.setArtifacts( result.getArtifacts() );
+
+ return new MavenProjectBuildingResult( project, result );
+ }
+
+ private Model interpolateModel( Model model, ProjectBuildingRequest
config, File projectDescriptor )
throws ProjectBuildingException
{
try
@@ -306,7 +337,7 @@
return model;
}
- private MavenProject fromModelToMavenProject( Model model, File
parentFile, ProjectBuilderConfiguration config, File projectDescriptor )
+ private MavenProject fromModelToMavenProject( Model model, File
parentFile, ProjectBuildingRequest config, File projectDescriptor )
throws InvalidProjectModelException, IOException
{
MavenProject project;
@@ -329,7 +360,7 @@
return project;
}
- private List<Model> build( String projectId, File pomFile,
ProjectBuilderConfiguration projectBuilderConfiguration )
+ private List<Model> build( String projectId, File pomFile,
ProjectBuildingRequest projectBuilderConfiguration )
throws ProjectBuildingException, IOException
{
Model mainModel = readModel( projectId, pomFile,
!projectBuilderConfiguration.istLenientValidation() );
@@ -564,7 +595,7 @@
* @throws ProjectBuildingException
*/
private List<Model> getDomainModelParentsFromLocalPath( Model model,
ArtifactRepository localRepository, List<ArtifactRepository>
remoteRepositories, File projectDirectory,
-
ProjectBuilderConfiguration projectBuilderConfiguration )
+
ProjectBuildingRequest projectBuilderConfiguration )
throws IOException, ProjectBuildingException
{
List<Model> models = new ArrayList<Model>();
Copied:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
(from r780099,
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java&r1=780099&r2=780115&rev=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
Fri May 29 21:28:45 2009
@@ -27,8 +27,8 @@
import org.apache.maven.model.ModelEventListener;
import org.apache.maven.model.Profile;
-public class DefaultProjectBuilderConfiguration
- implements ProjectBuilderConfiguration
+public class DefaultProjectBuildingRequest
+ implements ProjectBuildingRequest
{
private ArtifactRepository localRepository;
@@ -60,7 +60,7 @@
this.topProject = mavenProject;
}
- public ProjectBuilderConfiguration setLocalRepository( ArtifactRepository
localRepository )
+ public ProjectBuildingRequest setLocalRepository( ArtifactRepository
localRepository )
{
this.localRepository = localRepository;
return this;
@@ -80,7 +80,7 @@
return remoteRepositories;
}
- public ProjectBuilderConfiguration setRemoteRepositories(
List<ArtifactRepository> remoteRepositories )
+ public ProjectBuildingRequest setRemoteRepositories(
List<ArtifactRepository> remoteRepositories )
{
this.remoteRepositories = remoteRepositories;
return this;
@@ -95,7 +95,7 @@
return executionProperties;
}
- public ProjectBuilderConfiguration setExecutionProperties( Properties
executionProperties )
+ public ProjectBuildingRequest setExecutionProperties( Properties
executionProperties )
{
this.executionProperties = executionProperties;
return this;
@@ -106,7 +106,7 @@
return listeners;
}
- public ProjectBuilderConfiguration setModelEventListeners(
List<ModelEventListener> listeners )
+ public ProjectBuildingRequest setModelEventListeners(
List<ModelEventListener> listeners )
{
this.listeners = listeners;
return this;
@@ -117,13 +117,13 @@
return processPlugins;
}
- public ProjectBuilderConfiguration setProcessPlugins( boolean
processPlugins )
+ public ProjectBuildingRequest setProcessPlugins( boolean processPlugins )
{
this.processPlugins = processPlugins;
return this;
}
- public ProjectBuilderConfiguration setLenientValidation( boolean
lenientValidation )
+ public ProjectBuildingRequest setLenientValidation( boolean
lenientValidation )
{
this.lenientValidation = lenientValidation;
return this;
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Fri May 29 21:28:45 2009
@@ -153,7 +153,7 @@
private ProjectBuilder mavenProjectBuilder;
- private ProjectBuilderConfiguration projectBuilderConfiguration;
+ private ProjectBuildingRequest projectBuilderConfiguration;
private RepositorySystem repositorySystem;
//
@@ -212,7 +212,7 @@
* @param projectBuilderConfiguration
* @throws InvalidRepositoryException
*/
- public MavenProject( Model model, RepositorySystem repositorySystem,
ProjectBuilder mavenProjectBuilder, ProjectBuilderConfiguration
projectBuilderConfiguration )
+ public MavenProject( Model model, RepositorySystem repositorySystem,
ProjectBuilder mavenProjectBuilder, ProjectBuildingRequest
projectBuilderConfiguration )
throws InvalidRepositoryException
{
if ( model == null )
@@ -291,7 +291,7 @@
{
for ( Iterator<String> it = modules.iterator(); it.hasNext(); )
{
- String modulePath = (String) it.next();
+ String modulePath = it.next();
String moduleName = modulePath;
if ( moduleName.endsWith( "/" ) || moduleName.endsWith(
"\\" ) )
@@ -319,7 +319,7 @@
}
}
- return (String) moduleAdjustments.get( module );
+ return moduleAdjustments.get( module );
}
// ----------------------------------------------------------------------
@@ -1672,7 +1672,7 @@
public Plugin getPlugin( String pluginKey )
{
- return (Plugin) getBuild().getPluginsAsMap().get( pluginKey );
+ return getBuild().getPluginsAsMap().get( pluginKey );
}
/**
@@ -1904,7 +1904,7 @@
else
{
String refId = getProjectReferenceId( a.getGroupId(),
a.getArtifactId(), a.getVersion() );
- MavenProject project = (MavenProject) projectReferences.get( refId
);
+ MavenProject project = projectReferences.get( refId );
boolean projectDirFound = false;
if ( project != null )
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
Fri May 29 21:28:45 2009
@@ -22,16 +22,22 @@
public interface ProjectBuilder
{
- MavenProject build( File projectFile, ProjectBuilderConfiguration
configuration )
+ MavenProject build( File projectFile, ProjectBuildingRequest request )
throws ProjectBuildingException;
- MavenProject build( Artifact projectArtifact, ProjectBuilderConfiguration
configuration )
+ MavenProject build( Artifact projectArtifact, ProjectBuildingRequest
request )
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
// would ever need this so it should not be exposed in a public API
- MavenProject buildStandaloneSuperProject( ProjectBuilderConfiguration
configuration )
+ MavenProject buildStandaloneSuperProject( ProjectBuildingRequest request )
+ 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.
+ @Deprecated
+ MavenProjectBuildingResult buildProjectWithDependencies( File project,
ProjectBuildingRequest request )
throws ProjectBuildingException;
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
Fri May 29 21:28:45 2009
@@ -5,10 +5,9 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Profile;
-import org.apache.maven.model.profile.ProfileActivationContext;
public interface ProjectBuilderConfiguration
- extends ProfileActivationContext
+ extends ProjectBuildingRequest
{
ProjectBuilderConfiguration setLocalRepository( ArtifactRepository
localRepository );
Copied:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
(from r780104,
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java&r1=780104&r2=780115&rev=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
Fri May 29 21:28:45 2009
@@ -7,18 +7,18 @@
import org.apache.maven.model.Profile;
import org.apache.maven.model.profile.ProfileActivationContext;
-public interface ProjectBuilderConfiguration
+public interface ProjectBuildingRequest
extends ProfileActivationContext
{
- ProjectBuilderConfiguration setLocalRepository( ArtifactRepository
localRepository );
+ ProjectBuildingRequest setLocalRepository( ArtifactRepository
localRepository );
ArtifactRepository getLocalRepository();
- ProjectBuilderConfiguration setRemoteRepositories(
List<ArtifactRepository> remoteRepositories );
+ ProjectBuildingRequest setRemoteRepositories( List<ArtifactRepository>
remoteRepositories );
List<ArtifactRepository> getRemoteRepositories();
- ProjectBuilderConfiguration setExecutionProperties( Properties
executionProperties );
+ ProjectBuildingRequest setExecutionProperties( Properties
executionProperties );
Properties getExecutionProperties();
@@ -26,7 +26,7 @@
MavenProject getTopLevelProjectFromReactor();
- ProjectBuilderConfiguration setProcessPlugins( boolean processPlugins );
+ ProjectBuildingRequest setProcessPlugins( boolean processPlugins );
boolean isProcessPlugins();
@@ -38,7 +38,7 @@
* during artifact resolution, lenient validation should be
used to account for models of poor quality.
* @return This configuration, never {...@code null}.
*/
- ProjectBuilderConfiguration setLenientValidation( boolean
lenientValidation );
+ ProjectBuildingRequest setLenientValidation( boolean lenientValidation );
/**
* Gets the level of validation to perform on processed models.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Fri May 29 21:28:45 2009
@@ -37,10 +37,10 @@
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.model.Dependency;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.project.ProjectBuilderConfiguration;
+import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingException;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
@@ -107,7 +107,7 @@
pomArtifact.setFile( artifact.getFile() );
}
- ProjectBuilderConfiguration configuration = new
DefaultProjectBuilderConfiguration();
+ ProjectBuildingRequest configuration = new
DefaultProjectBuildingRequest();
configuration.setLocalRepository( localRepository );
configuration.setRemoteRepositories( remoteRepositories );
configuration.setLenientValidation( true );
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
Fri May 29 21:28:45 2009
@@ -18,9 +18,9 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.PluginManager;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilderConfiguration;
+import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusTestCase;
@@ -103,7 +103,7 @@
{
MavenExecutionRequest request = createMavenExecutionRequest( pom );
- ProjectBuilderConfiguration configuration = new
DefaultProjectBuilderConfiguration()
+ ProjectBuildingRequest configuration = new
DefaultProjectBuildingRequest()
.setLocalRepository( request.getLocalRepository() )
.setRemoteRepositories( request.getRemoteRepositories() );
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
Fri May 29 21:28:45 2009
@@ -1480,7 +1480,7 @@
pomFile = new File( pomFile, "pom.xml" );
}
- ProjectBuilderConfiguration config = new
DefaultProjectBuilderConfiguration();
+ ProjectBuildingRequest config = new DefaultProjectBuildingRequest();
String localRepoUrl = System.getProperty( "maven.repo.local",
System.getProperty( "user.home" ) + "/.m2/repository" );
localRepoUrl = "file://" + localRepoUrl;
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
Fri May 29 21:28:45 2009
@@ -8,9 +8,9 @@
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.model.Profile;
import org.apache.maven.project.DefaultProjectBuilder;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.project.ProjectBuilderConfiguration;
+import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.harness.PomTestWrapper;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.codehaus.plexus.PlexusTestCase;
@@ -73,7 +73,7 @@
File settingsFile = new File( testDirectory + File.separator +
pomPath, "settings.xml" );
Settings settings = readSettingsFile(settingsFile);
- ProjectBuilderConfiguration config = new
DefaultProjectBuilderConfiguration();
+ ProjectBuildingRequest config = new DefaultProjectBuildingRequest();
for ( org.apache.maven.settings.Profile rawProfile :
settings.getProfiles() )
{
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=780115&r1=780114&r2=780115&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Fri May 29 21:28:45 2009
@@ -34,14 +34,13 @@
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
-import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.ModelReader;
import org.apache.maven.model.io.ModelWriter;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.MavenProjectBuildingResult;
+import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.settings.Settings;
@@ -97,9 +96,7 @@
private Maven maven;
- private PluginManager pluginManager;
-
- private MavenProjectBuilder mavenProjectBuilder;
+ private ProjectBuilder projectBuilder;
private ModelReader modelReader;
@@ -124,8 +121,6 @@
private Configuration configuration;
private MavenExecutionRequest request;
-
- private LifecycleExecutor lifecycleExecutor;
//
----------------------------------------------------------------------------
// Constructors
@@ -283,7 +278,7 @@
{
getLogger().debug( "Building MavenProject instance: " + mavenProject );
- return mavenProjectBuilder.build( mavenProject,
request.getProjectBuildingConfiguration() );
+ return projectBuilder.build( mavenProject,
request.getProjectBuilderRequest() );
}
/**
@@ -313,7 +308,7 @@
try
{
- MavenProjectBuildingResult projectBuildingResult =
mavenProjectBuilder.buildProjectWithDependencies( request.getPom(),
request.getProjectBuildingConfiguration() );
+ MavenProjectBuildingResult projectBuildingResult =
projectBuilder.buildProjectWithDependencies( request.getPom(),
request.getProjectBuilderRequest() );
result.setProject( projectBuildingResult.getProject() );
@@ -398,14 +393,12 @@
maven = container.lookup( Maven.class );
- mavenProjectBuilder = container.lookup( MavenProjectBuilder.class
);
+ projectBuilder = container.lookup( ProjectBuilder.class );
populator = container.lookup( MavenExecutionRequestPopulator.class
);
container.lookup( RepositorySystem.class );
- lifecycleExecutor = container.lookup( LifecycleExecutor.class );
-
// This is temporary as we can probably cache a single request and
use it for default values and
// simply cascade values in from requests used for individual
executions.
request = new DefaultMavenExecutionRequest();
