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

o Fixed name inconsistencies 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780121 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-05-29 22:02:34 +00:00
parent 85205e0b57
commit 4d45d00881
5 changed files with 20 additions and 20 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

@ -100,7 +100,7 @@ public class DefaultMaven
//TODO: We really need to get rid of this requirement in here. If we know there is no project present //TODO: We really need to get rid of this requirement in here. If we know there is no project present
if ( projects.isEmpty() ) if ( projects.isEmpty() )
{ {
MavenProject project = projectBuilder.buildStandaloneSuperProject( request.getProjectBuilderRequest() ); MavenProject project = projectBuilder.buildStandaloneSuperProject( request.getProjectBuildingRequest() );
projects.put( ArtifactUtils.key( project.getGroupId(), project.getArtifactId(), project.getVersion() ), project ); projects.put( ArtifactUtils.key( project.getGroupId(), project.getArtifactId(), project.getVersion() ), project );
request.setProjectPresent( false ); request.setProjectPresent( false );
} }
@ -190,7 +190,7 @@ public class DefaultMaven
for ( File file : files ) for ( File file : files )
{ {
MavenProject project = projectBuilder.build( file, request.getProjectBuilderRequest() ); MavenProject project = projectBuilder.build( file, request.getProjectBuildingRequest() );
if ( ( project.getPrerequisites() != null ) && ( project.getPrerequisites().getMaven() != null ) ) if ( ( project.getPrerequisites() != null ) && ( project.getPrerequisites().getMaven() != null ) )
{ {

26
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
View File

@ -234,7 +234,7 @@ public class DefaultMavenExecutionRequest
public void setProjectBuildingConfiguration( ProjectBuildingRequest projectBuildingConfiguration ) public void setProjectBuildingConfiguration( ProjectBuildingRequest projectBuildingConfiguration )
{ {
this.projectBuilderRequest = projectBuildingConfiguration; this.projectBuildingRequest = projectBuildingConfiguration;
} }
public List<String> getActiveProfiles() public List<String> getActiveProfiles()
@ -617,7 +617,7 @@ public class DefaultMavenExecutionRequest
private Settings settings; private Settings settings;
// calculated from request attributes. // calculated from request attributes.
private ProjectBuildingRequest projectBuilderRequest; private ProjectBuildingRequest projectBuildingRequest;
public MavenExecutionRequest setSettings( Settings settings ) public MavenExecutionRequest setSettings( Settings settings )
{ {
@ -706,21 +706,21 @@ public class DefaultMavenExecutionRequest
} }
//TODO: this does not belong here. //TODO: this does not belong here.
public ProjectBuildingRequest getProjectBuilderRequest() public ProjectBuildingRequest getProjectBuildingRequest()
{ {
if ( projectBuilderRequest == null ) if ( projectBuildingRequest == null )
{ {
projectBuilderRequest = new DefaultProjectBuildingRequest(); projectBuildingRequest = new DefaultProjectBuildingRequest();
projectBuilderRequest.setLocalRepository( getLocalRepository() ); projectBuildingRequest.setLocalRepository( getLocalRepository() );
projectBuilderRequest.setExecutionProperties( getProperties() ); projectBuildingRequest.setExecutionProperties( getProperties() );
projectBuilderRequest.setRemoteRepositories( getRemoteRepositories() ); projectBuildingRequest.setRemoteRepositories( getRemoteRepositories() );
projectBuilderRequest.setActiveProfileIds( getActiveProfiles() ); projectBuildingRequest.setActiveProfileIds( getActiveProfiles() );
projectBuilderRequest.setInactiveProfileIds( getInactiveProfiles() ); projectBuildingRequest.setInactiveProfileIds( getInactiveProfiles() );
projectBuilderRequest.setProfiles( getProfiles() ); projectBuildingRequest.setProfiles( getProfiles() );
projectBuilderRequest.setProcessPlugins( true ); projectBuildingRequest.setProcessPlugins( true );
} }
return projectBuilderRequest; return projectBuildingRequest;
} }
public MavenExecutionRequest addProfile( Profile profile ) public MavenExecutionRequest addProfile( Profile profile )

2
maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
View File

@ -202,5 +202,5 @@ public interface MavenExecutionRequest
File getUserToolchainsFile(); File getUserToolchainsFile();
MavenExecutionRequest setUserToolchainsFile( File userToolchainsFile ); MavenExecutionRequest setUserToolchainsFile( File userToolchainsFile );
ProjectBuildingRequest getProjectBuilderRequest(); ProjectBuildingRequest getProjectBuildingRequest();
} }

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

@ -132,9 +132,9 @@ public class MavenSession
return currentProject; return currentProject;
} }
public ProjectBuildingRequest getProjectBuilderRequest() public ProjectBuildingRequest getProjectBuildingRequest()
{ {
return request.getProjectBuilderRequest(); return request.getProjectBuildingRequest();
} }
public List<String> getPluginGroups() public List<String> getPluginGroups()

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

@ -278,7 +278,7 @@ public class MavenEmbedder
{ {
getLogger().debug( "Building MavenProject instance: " + mavenProject ); getLogger().debug( "Building MavenProject instance: " + mavenProject );
return projectBuilder.build( mavenProject, request.getProjectBuilderRequest() ); return projectBuilder.build( mavenProject, request.getProjectBuildingRequest() );
} }
/** /**
@ -308,7 +308,7 @@ public class MavenEmbedder
try try
{ {
MavenProjectBuildingResult projectBuildingResult = projectBuilder.buildProjectWithDependencies( request.getPom(), request.getProjectBuilderRequest() ); MavenProjectBuildingResult projectBuildingResult = projectBuilder.buildProjectWithDependencies( request.getPom(), request.getProjectBuildingRequest() );
result.setProject( projectBuildingResult.getProject() ); result.setProject( projectBuildingResult.getProject() );