You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/05/15 20:45:48 UTC
svn commit: r775284 - in
/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven:
execution/ project/
Author: jvanzyl
Date: Fri May 15 18:45:48 2009
New Revision: 775284
URL: http://svn.apache.org/viewvc?rev=775284&view=rev
Log:
o pass the active profile ids and profiles pass into the request
o clean up constructors for project builder configuration
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=775284&r1=775283&r2=775284&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Fri May 15 18:45:48 2009
@@ -515,12 +515,12 @@
return this;
}
- public List getProfiles()
+ public List<Profile> getProfiles()
{
return profiles;
}
- public MavenExecutionRequest setProfiles( List profiles )
+ public MavenExecutionRequest setProfiles( List<Profile> profiles )
{
this.profiles = profiles;
@@ -651,6 +651,8 @@
projectBuildingConfiguration.setLocalRepository( getLocalRepository() );
projectBuildingConfiguration.setExecutionProperties( getProperties() );
projectBuildingConfiguration.setRemoteRepositories( getRemoteRepositories() );
+ projectBuildingConfiguration.setActiveProfileIds( getActiveProfiles() );
+ projectBuildingConfiguration.setProfiles( getProfiles() );
projectBuildingConfiguration.setProcessPlugins( true );
}
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=775284&r1=775283&r2=775284&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Fri May 15 18:45:48 2009
@@ -256,7 +256,11 @@
public MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
throws ProjectBuildingException
{
- return buildFromRepository( artifact, new DefaultProjectBuilderConfiguration( localRepository, remoteRepositories ) );
+ ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration()
+ .setLocalRepository( localRepository )
+ .setRemoteRepositories( remoteRepositories );
+
+ return buildFromRepository( artifact, configuration );
}
/**
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java?rev=775284&r1=775283&r2=775284&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java Fri May 15 18:45:48 2009
@@ -34,8 +34,7 @@
private List<ArtifactRepository> remoteRepositories;
- //jvz Find out who added this. It's wrong, the execution properties are what come from the embedder setup not system properties.
- private Properties executionProperties = System.getProperties();
+ private Properties executionProperties;
private List<ModelEventListener> listeners;
@@ -46,17 +45,7 @@
private List<String> activeProfileIds;
private List<Profile> profiles;
-
- public DefaultProjectBuilderConfiguration()
- {
- }
-
- public DefaultProjectBuilderConfiguration( ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
- {
- this.localRepository = localRepository;
- this.remoteRepositories = remoteRepositories;
- }
-
+
public MavenProject getTopLevelProjectFromReactor()
{
return topProject;
@@ -132,6 +121,11 @@
this.activeProfileIds = activeProfileIds;
}
+ public void setProfiles( List<Profile> profiles )
+ {
+ this.profiles = profiles;
+ }
+
public void addProfile( Profile profile )
{
if ( profiles == null )
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java?rev=775284&r1=775283&r2=775284&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java Fri May 15 18:45:48 2009
@@ -46,5 +46,7 @@
*/
void addProfile( Profile profile );
+ void setProfiles( List<Profile> profiles );
+
List<Profile> getProfiles();
}