Author: bentmann
Date: Thu May 21 20:34:33 2009
New Revision: 777246
URL: http://svn.apache.org/viewvc?rev=777246&view=rev
Log:
o Fixed explicit profile deactivation
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=777246&r1=777245&r2=777246&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
Thu May 21 20:34:33 2009
@@ -715,6 +715,7 @@
projectBuildingConfiguration.setExecutionProperties(
getProperties() );
projectBuildingConfiguration.setRemoteRepositories(
getRemoteRepositories() );
projectBuildingConfiguration.setActiveProfileIds(
getActiveProfiles() );
+ projectBuildingConfiguration.setInactiveProfileIds(
getInactiveProfiles() );
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=777246&r1=777245&r2=777246&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
Thu May 21 20:34:33 2009
@@ -120,10 +120,8 @@
ProfileActivationContext profileActivationContext = new
ProfileActivationContext( configuration.getExecutionProperties(), true );
profileActivationContext.setExplicitlyActiveProfileIds(
configuration.getActiveProfileIds() );
- if (configuration.getExecutionProperties() != null )
- {
- profileActivationContext.getExecutionProperties().putAll(
configuration.getExecutionProperties() );
- }
+ profileActivationContext.setExplicitlyInactiveProfileIds(
configuration.getInactiveProfileIds() );
+
ProfileManager profileManager = new DefaultProfileManager(
profileActivationContext );
try
@@ -483,7 +481,7 @@
if ( validationResult.getMessageCount() > 0 )
{
- for ( String s : (List<String>) validationResult.getMessages() )
+ for ( String s : validationResult.getMessages() )
{
logger.error( s );
}
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=777246&r1=777245&r2=777246&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
Thu May 21 20:34:33 2009
@@ -44,6 +44,8 @@
private List<String> activeProfileIds;
+ private List<String> inactiveProfileIds;
+
private List<Profile> profiles;
public MavenProject getTopLevelProjectFromReactor()
@@ -121,6 +123,16 @@
this.activeProfileIds = activeProfileIds;
}
+ public List<String> getInactiveProfileIds()
+ {
+ return inactiveProfileIds;
+ }
+
+ public void setInactiveProfileIds( List<String> inactiveProfileIds )
+ {
+ this.inactiveProfileIds = inactiveProfileIds;
+ }
+
public void setProfiles( List<Profile> profiles )
{
this.profiles = profiles;
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=777246&r1=777245&r2=777246&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
Thu May 21 20:34:33 2009
@@ -37,6 +37,10 @@
void setActiveProfileIds( List<String> activeProfileIds );
List<String> getActiveProfileIds();
+
+ void setInactiveProfileIds( List<String> inactiveProfileIds );
+
+ List<String> getInactiveProfileIds();
/**
* Add a {...@link org.apache.maven.model.Profile} that has come from an
external source. This may be from a custom configuration
