Author: sisbell
Date: Wed Apr 1 23:21:57 2009
New Revision: 761108
URL: http://svn.apache.org/viewvc?rev=761108&view=rev
Log:
Don't need model in signature for active profiles.
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=761108&r1=761107&r2=761108&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Wed Apr 1 23:21:57 2009
@@ -202,7 +202,7 @@
// We need to convert profile repositories to artifact repositories
try
{
- for ( Profile profile : profileManager.getActiveProfiles( new
Model() ) )
+ for ( Profile profile : profileManager.getActiveProfiles() )
{
for ( Repository r : profile.getRepositories() )
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?rev=761108&r1=761107&r2=761108&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
Wed Apr 1 23:21:57 2009
@@ -119,7 +119,10 @@
}
}
- // TODO: Portions of this logic are duplicated in
o.a.m.p.b.p.ProfileContext, something is wrong here
+ public List<Profile> getActiveProfiles() throws
ProfileActivationException {
+ return getActiveProfiles(null);
+ }
+
public List<Profile> getActiveProfiles( Model model )
throws ProfileActivationException
{
@@ -251,18 +254,4 @@
profileActivationContext.setActiveByDefault( profileId );
}
}
-
-
- public static String getGroupId( Model model )
- {
- Parent parent = model.getParent();
-
- String groupId = model.getGroupId();
- if ( ( parent != null ) && ( groupId == null ) )
- {
- groupId = parent.getGroupId();
- }
-
- return groupId;
- }
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java?rev=761108&r1=761107&r2=761108&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
Wed Apr 1 23:21:57 2009
@@ -35,6 +35,10 @@
Map<String, Profile> getProfilesById();
+ @Deprecated
List<Profile> getActiveProfiles( Model model )
throws ProfileActivationException;
+
+ List<Profile> getActiveProfiles( )
+ throws ProfileActivationException;
}
\ No newline at end of file
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=761108&r1=761107&r2=761108&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Wed Apr 1 23:21:57 2009
@@ -19,16 +19,12 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.io.Reader;
import java.io.Writer;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -44,7 +40,6 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
-import org.apache.maven.model.Repository;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.profiles.DefaultProfileManager;
@@ -57,7 +52,6 @@
import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.profiles.ProfileContext;
import org.apache.maven.project.processor.ProcessorContext;
-import org.apache.maven.project.processor.ProfilesProcessor;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
import org.apache.maven.repository.RepositorySystem;
@@ -65,7 +59,6 @@
import org.apache.maven.shared.model.DomainModel;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.shared.model.ModelEventListener;
-import org.apache.maven.shared.model.ModelProperty;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -74,7 +67,6 @@
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.WriterFactory;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
* @version $Id$
@@ -318,7 +310,7 @@
try
{
- projectProfiles.addAll(
externalProfileManager.getActiveProfiles( null ) );
+ projectProfiles.addAll(
externalProfileManager.getActiveProfiles() );
}
catch ( ProfileActivationException e )
{
@@ -333,7 +325,7 @@
try
{
//System.out.println("PROFILE POM - ACTIVE: COUNT = " +
profileManager.getActiveProfiles( model ).size() +"," + projectProfiles.size());
- projectProfiles.addAll( profileManager.getActiveProfiles( model )
);
+ projectProfiles.addAll( profileManager.getActiveProfiles() );
}
catch ( ProfileActivationException e )
{
@@ -363,10 +355,7 @@
throw new ProjectBuildingException(projectId, "",
projectDescriptor, e);
}
-
- // }
-
-
+
MavenProject project;
try
@@ -405,20 +394,6 @@
: new ArrayList<String>();
return buildModel( pomFile, new ProfileContextInfo(null,
activeProfileIds, inactiveProfileIds), localRepository, remoteRepositories );
-/*
- try
- {
- MavenProject mavenProject = new MavenProject(
convertFromInputStreamToModel( domainModel.getInputStream() ),
repositorySystem, this, projectBuilderConfiguration );
-
- mavenProject.setParentFile( domainModel.getParentFile() );
-
- return mavenProject;
- }
- catch ( InvalidRepositoryException e )
- {
- throw new IOException( e.getMessage() );
- }
-*/
}
private void validateModel( Model model, File pomFile )
@@ -536,8 +511,7 @@
}
PomClassicDomainModel transformedDomainModel = ProcessorContext.build(
profileModels, null );
-
//ProcessorContext.interpolateModelProperties(transformedDomainModel.getModelProperties(),
- // null, transformedDomainModel);
+
// Lineage count is inclusive to add the POM read in itself.
transformedDomainModel.setLineageCount( lineageCount + 1 );
transformedDomainModel.setParentFile( parentFile );
@@ -570,19 +544,6 @@
return new PomClassicDomainModel( new ByteArrayInputStream(
baos.toByteArray() ), isMostSpecialized );
}
- private static Model convertFromInputStreamToModel( InputStream
inputStream )
- throws IOException
- {
- try
- {
- return new MavenXpp3Reader().read( ReaderFactory.newXmlReader(
inputStream ) );
- }
- catch ( XmlPullParserException e )
- {
- throw new IOException( e.getMessage() );
- }
- }
-
/**
* Returns true if the relative path of the specified parent references a
pom, otherwise returns
* false.
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java?rev=761108&r1=761107&r2=761108&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
Wed Apr 1 23:21:57 2009
@@ -70,7 +70,7 @@
profileManager.addProfile( notActivated );
profileManager.addProfile( defaultActivated );
- List active = profileManager.getActiveProfiles( null );
+ List active = profileManager.getActiveProfiles();
assertNotNull( active );
assertEquals( 1, active.size() );
@@ -109,7 +109,7 @@
profileManager.addProfile( syspropActivated );
profileManager.addProfile( defaultActivated );
- List active = profileManager.getActiveProfiles( null );
+ List active = profileManager.getActiveProfiles();
assertNotNull( active );
assertEquals( 1, active.size() );
@@ -139,7 +139,7 @@
profileManager.addProfile( syspropActivated );
- List active = profileManager.getActiveProfiles( null );
+ List active = profileManager.getActiveProfiles();
assertNotNull( active );
assertEquals( 0, active.size() );
@@ -169,7 +169,7 @@
ctx.setActive( "syspropActivated" );
- List active = profileManager.getActiveProfiles( null );
+ List active = profileManager.getActiveProfiles();
assertNotNull( active );
assertEquals( 1, active.size() );
@@ -200,7 +200,7 @@
ctx.setInactive( "syspropActivated" );
- List active = profileManager.getActiveProfiles( null );
+ List active = profileManager.getActiveProfiles();
assertNotNull( active );
assertEquals( 0, active.size() );
