You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/05/30 00:02:34 UTC
svn commit: r780121 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/
maven-core/src/main/java/org/apache/maven/execution/
maven-embedder/src/main/java/org/apache/maven/embedder/
Author: bentmann
Date: Fri May 29 22:02:34 2009
New Revision: 780121
URL: http://svn.apache.org/viewvc?rev=780121&view=rev
Log:
o Fixed name inconsistencies
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-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=780121&r1=780120&r2=780121&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 22:02:34 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.getProjectBuilderRequest() );
+ MavenProject project = projectBuilder.buildStandaloneSuperProject( request.getProjectBuildingRequest() );
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.getProjectBuilderRequest() );
+ MavenProject project = projectBuilder.build( file, request.getProjectBuildingRequest() );
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=780121&r1=780120&r2=780121&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 22:02:34 2009
@@ -234,7 +234,7 @@
public void setProjectBuildingConfiguration( ProjectBuildingRequest projectBuildingConfiguration )
{
- this.projectBuilderRequest = projectBuildingConfiguration;
+ this.projectBuildingRequest = projectBuildingConfiguration;
}
public List<String> getActiveProfiles()
@@ -617,7 +617,7 @@
private Settings settings;
// calculated from request attributes.
- private ProjectBuildingRequest projectBuilderRequest;
+ private ProjectBuildingRequest projectBuildingRequest;
public MavenExecutionRequest setSettings( Settings settings )
{
@@ -706,21 +706,21 @@
}
//TODO: this does not belong here.
- public ProjectBuildingRequest getProjectBuilderRequest()
+ public ProjectBuildingRequest getProjectBuildingRequest()
{
- if ( projectBuilderRequest == null )
+ if ( projectBuildingRequest == null )
{
- projectBuilderRequest = new DefaultProjectBuildingRequest();
- projectBuilderRequest.setLocalRepository( getLocalRepository() );
- projectBuilderRequest.setExecutionProperties( getProperties() );
- projectBuilderRequest.setRemoteRepositories( getRemoteRepositories() );
- projectBuilderRequest.setActiveProfileIds( getActiveProfiles() );
- projectBuilderRequest.setInactiveProfileIds( getInactiveProfiles() );
- projectBuilderRequest.setProfiles( getProfiles() );
- projectBuilderRequest.setProcessPlugins( true );
+ projectBuildingRequest = new DefaultProjectBuildingRequest();
+ projectBuildingRequest.setLocalRepository( getLocalRepository() );
+ projectBuildingRequest.setExecutionProperties( getProperties() );
+ projectBuildingRequest.setRemoteRepositories( getRemoteRepositories() );
+ projectBuildingRequest.setActiveProfileIds( getActiveProfiles() );
+ projectBuildingRequest.setInactiveProfileIds( getInactiveProfiles() );
+ projectBuildingRequest.setProfiles( getProfiles() );
+ projectBuildingRequest.setProcessPlugins( true );
}
- return projectBuilderRequest;
+ return projectBuildingRequest;
}
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=780121&r1=780120&r2=780121&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 22:02:34 2009
@@ -202,5 +202,5 @@
File getUserToolchainsFile();
MavenExecutionRequest setUserToolchainsFile( File userToolchainsFile );
- ProjectBuildingRequest getProjectBuilderRequest();
+ ProjectBuildingRequest getProjectBuildingRequest();
}
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=780121&r1=780120&r2=780121&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 22:02:34 2009
@@ -132,9 +132,9 @@
return currentProject;
}
- public ProjectBuildingRequest getProjectBuilderRequest()
+ public ProjectBuildingRequest getProjectBuildingRequest()
{
- return request.getProjectBuilderRequest();
+ return request.getProjectBuildingRequest();
}
public List<String> getPluginGroups()
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=780121&r1=780120&r2=780121&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 22:02:34 2009
@@ -278,7 +278,7 @@
{
getLogger().debug( "Building MavenProject instance: " + mavenProject );
- return projectBuilder.build( mavenProject, request.getProjectBuilderRequest() );
+ return projectBuilder.build( mavenProject, request.getProjectBuildingRequest() );
}
/**
@@ -308,7 +308,7 @@
try
{
- MavenProjectBuildingResult projectBuildingResult = projectBuilder.buildProjectWithDependencies( request.getPom(), request.getProjectBuilderRequest() );
+ MavenProjectBuildingResult projectBuildingResult = projectBuilder.buildProjectWithDependencies( request.getPom(), request.getProjectBuildingRequest() );
result.setProject( projectBuildingResult.getProject() );