From 4d45d00881fb568840e7c2825a8a9f1810d9af01 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 29 May 2009 22:02:34 +0000 Subject: [PATCH] o Fixed name inconsistencies git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780121 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/maven/DefaultMaven.java | 4 +-- .../DefaultMavenExecutionRequest.java | 26 +++++++++---------- .../execution/MavenExecutionRequest.java | 2 +- .../apache/maven/execution/MavenSession.java | 4 +-- .../apache/maven/embedder/MavenEmbedder.java | 4 +-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index a4704f7c11..f6f786772c 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -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 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 @@ public class DefaultMaven 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 ) ) { diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java index 3f156079e9..dcc4f2967b 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java @@ -234,7 +234,7 @@ public class DefaultMavenExecutionRequest public void setProjectBuildingConfiguration( ProjectBuildingRequest projectBuildingConfiguration ) { - this.projectBuilderRequest = projectBuildingConfiguration; + this.projectBuildingRequest = projectBuildingConfiguration; } public List getActiveProfiles() @@ -617,7 +617,7 @@ public class DefaultMavenExecutionRequest private Settings settings; // calculated from request attributes. - private ProjectBuildingRequest projectBuilderRequest; + private ProjectBuildingRequest projectBuildingRequest; public MavenExecutionRequest setSettings( Settings settings ) { @@ -706,21 +706,21 @@ public class DefaultMavenExecutionRequest } //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 ) diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java index c719f147ed..5a37e73944 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java @@ -202,5 +202,5 @@ public interface MavenExecutionRequest File getUserToolchainsFile(); MavenExecutionRequest setUserToolchainsFile( File userToolchainsFile ); - ProjectBuildingRequest getProjectBuilderRequest(); + ProjectBuildingRequest getProjectBuildingRequest(); } diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java index 996ac32468..d887f1ffcc 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java @@ -132,9 +132,9 @@ public class MavenSession return currentProject; } - public ProjectBuildingRequest getProjectBuilderRequest() + public ProjectBuildingRequest getProjectBuildingRequest() { - return request.getProjectBuilderRequest(); + return request.getProjectBuildingRequest(); } public List getPluginGroups() diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java index f67911f130..ffa6990f27 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java @@ -278,7 +278,7 @@ public class MavenEmbedder { 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 { - MavenProjectBuildingResult projectBuildingResult = projectBuilder.buildProjectWithDependencies( request.getPom(), request.getProjectBuilderRequest() ); + MavenProjectBuildingResult projectBuildingResult = projectBuilder.buildProjectWithDependencies( request.getPom(), request.getProjectBuildingRequest() ); result.setProject( projectBuildingResult.getProject() );