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/08/21 15:07:33 UTC
svn commit: r806538 - in /maven/components/trunk: ./ maven-compat/
maven-compat/src/main/java/org/apache/maven/profiles/
maven-compat/src/main/java/org/apache/maven/profiles/activation/
maven-compat/src/main/mdo/ maven-compat/src/test/java/org/apache/m...
Author: bentmann
Date: Fri Aug 21 13:07:32 2009
New Revision: 806538
URL: http://svn.apache.org/viewvc?rev=806538&view=rev
Log:
o Restored some more backward-compat
Added:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
- copied, changed from r801771, maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
- copied, changed from r801771, maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
- copied, changed from r801771, maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java
- copied, changed from r801771, maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
- copied, changed from r801771, maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/activation/
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java
- copied, changed from r806507, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfileActivationException.java
maven/components/trunk/maven-compat/src/main/mdo/profiles.mdo
- copied unchanged from r801771, maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/mdo/profiles.mdo
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/profiles/
- copied from r806507, maven/components/trunk/maven-core/src/test/java/org/apache/maven/profiles/
Removed:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfileActivationContext.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfileActivationException.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/profiles/
Modified:
maven/components/trunk/build.xml
maven/components/trunk/maven-compat/pom.xml
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
Modified: maven/components/trunk/build.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=806538&r1=806537&r2=806538&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Fri Aug 21 13:07:32 2009
@@ -184,6 +184,7 @@
<modello file="maven-core/src/main/mdo/settings.mdo" />
<modello file="maven-core/src/main/mdo/toolchains.mdo" />
<modello file="maven-compat/src/main/mdo/metadata.mdo" />
+ <modello file="maven-compat/src/main/mdo/profiles.mdo" />
</target>
<target name="compile-boot" depends="generate-sources" description="compiles the bootstrap sources">
Modified: maven/components/trunk/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=806538&r1=806537&r2=806538&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/pom.xml (original)
+++ maven/components/trunk/maven-compat/pom.xml Fri Aug 21 13:07:32 2009
@@ -77,6 +77,7 @@
<version>1.0.0</version>
<models>
<model>src/main/mdo/metadata.mdo</model>
+ <model>src/main/mdo/profiles.mdo</model>
</models>
</configuration>
</plugin>
@@ -90,4 +91,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java (from r801771, maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java&p1=maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java&r1=801771&r2=806538&rev=806538&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java Fri Aug 21 13:07:32 2009
@@ -20,6 +20,7 @@
*/
import org.apache.maven.profiles.io.xpp3.ProfilesXpp3Reader;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -33,6 +34,8 @@
import java.io.StringReader;
import java.io.StringWriter;
+@Deprecated
+@Component( role = MavenProfilesBuilder.class )
public class DefaultMavenProfilesBuilder
extends AbstractLogEnabled
implements MavenProfilesBuilder
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (from r801771, maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java&p1=maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java&r1=801771&r2=806538&rev=806538&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java Fri Aug 21 13:07:32 2009
@@ -21,13 +21,17 @@
import org.apache.maven.model.Activation;
import org.apache.maven.model.Profile;
+import org.apache.maven.model.building.ModelProblemCollector;
+import org.apache.maven.model.profile.DefaultProfileActivationContext;
+import org.apache.maven.model.profile.ProfileActivationContext;
+import org.apache.maven.model.profile.ProfileSelector;
import org.apache.maven.profiles.activation.ProfileActivationException;
-import org.apache.maven.profiles.activation.ProfileActivator;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.settings.SettingsUtils;
+import org.codehaus.plexus.MutablePlexusContainer;
import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.logging.Logger;
import java.util.ArrayList;
import java.util.Iterator;
@@ -35,12 +39,17 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.Map.Entry;
+@Deprecated
public class DefaultProfileManager
implements ProfileManager
{
- private PlexusContainer container;
+
+ @Requirement
+ private Logger logger;
+
+ @Requirement
+ private ProfileSelector profileSelector;
private List activatedIds = new ArrayList();
@@ -58,7 +67,7 @@
*/
public DefaultProfileManager( PlexusContainer container )
{
- this( container, (Settings)null);
+ this( container, null);
}
/**
@@ -68,36 +77,16 @@
*/
public DefaultProfileManager( PlexusContainer container, Properties props )
{
- this( container, (Settings)null, props );
-
- }
-
- /**
- * @deprecated without passing in the system properties, the SystemPropertiesProfileActivator will not work correctly
- * in embedded envirnments.
- */
- public DefaultProfileManager( PlexusContainer container, Settings settings )
- {
- this.container = container;
-
- loadSettingsProfiles( settings );
- }
-
- /**
- * the properties passed to the profile manager are the props that
- * are passed to maven, possibly containing profile activator properties
- *
- */
- public DefaultProfileManager( PlexusContainer container, Settings settings, Properties props )
- {
- this.container = container;
-
- loadSettingsProfiles( settings );
-
- if ( props != null )
+ try
{
- requestProperties = props;
+ this.profileSelector = container.lookup( ProfileSelector.class );
+ this.logger = ( (MutablePlexusContainer) container ).getLogger();
}
+ catch ( ComponentLookupException e )
+ {
+ throw new IllegalStateException( e );
+ }
+ this.requestProperties = props;
}
public Properties getRequestProperties() {
@@ -119,7 +108,7 @@
Profile existing = (Profile) profilesById.get( profileId );
if ( existing != null )
{
- container.getLogger().warn( "Overriding profile: \'" + profileId + "\' (source: " + existing.getSource() +
+ logger.warn( "Overriding profile: \'" + profileId + "\' (source: " + existing.getSource() +
") with new instance from source: " + profile.getSource() );
}
@@ -140,7 +129,7 @@
{
if ( !activatedIds.contains( profileId ) )
{
- container.getLogger().debug( "Profile with id: \'" + profileId + "\' has been explicitly activated." );
+ logger.debug( "Profile with id: \'" + profileId + "\' has been explicitly activated." );
activatedIds.add( profileId );
}
@@ -166,7 +155,7 @@
{
if ( !deactivatedIds.contains( profileId ) )
{
- container.getLogger().debug( "Profile with id: \'" + profileId + "\' has been explicitly deactivated." );
+ logger.debug( "Profile with id: \'" + profileId + "\' has been explicitly deactivated." );
deactivatedIds.add( profileId );
}
@@ -191,113 +180,45 @@
public List getActiveProfiles()
throws ProfileActivationException
{
- List activeFromPom = new ArrayList();
- List activeExternal = new ArrayList();
-
- for ( Iterator it = profilesById.entrySet().iterator(); it.hasNext(); )
- {
- Map.Entry entry = (Entry) it.next();
+ ProfileActivationContext context = new DefaultProfileActivationContext();
+ context.setActiveProfileIds( activatedIds );
+ context.setInactiveProfileIds( deactivatedIds );
+ context.setSystemProperties( System.getProperties() );
+ context.setUserProperties( requestProperties );
- String profileId = (String) entry.getKey();
- Profile profile = (Profile) entry.getValue();
+ final List<ProfileActivationException> errors = new ArrayList<ProfileActivationException>();
- boolean shouldAdd = false;
- if ( activatedIds.contains( profileId ) )
- {
- shouldAdd = true;
- }
- else if ( isActive( profile ) )
+ List<Profile> profiles =
+ profileSelector.getActiveProfiles( profilesById.values(), context, new ModelProblemCollector()
{
- shouldAdd = true;
- }
- if ( !deactivatedIds.contains( profileId ) && shouldAdd )
- {
- if ( "pom".equals( profile.getSource() ) )
+ public void addWarning( String message, Exception cause )
{
- activeFromPom.add( profile );
+ // ignored
}
- else
+
+ public void addWarning( String message )
{
- activeExternal.add( profile );
+ // ignored
}
- }
- }
- if ( activeFromPom.isEmpty() )
- {
- for ( Iterator it = defaultIds.iterator(); it.hasNext(); )
- {
- String profileId = (String) it.next();
-
- if ( deactivatedIds.contains( profileId ) )
+ public void addError( String message, Exception cause )
{
- continue;
+ errors.add( new ProfileActivationException( message, cause ) );
}
-
- Profile profile = (Profile) profilesById.get( profileId );
-
- activeFromPom.add( profile );
- }
- }
-
- List allActive = new ArrayList( activeFromPom.size() + activeExternal.size() );
- allActive.addAll( activeExternal );
- allActive.addAll( activeFromPom );
-
- return allActive;
- }
-
- private boolean isActive( Profile profile )
- throws ProfileActivationException
- {
- List activators = null;
- Properties systemProperties = new Properties( System.getProperties() );
- if ( requestProperties != null )
- {
- systemProperties.putAll( requestProperties );
- }
-
- container.addContextValue("SystemProperties", systemProperties);
- try
- {
- activators = container.lookupList( ProfileActivator.ROLE );
-
- for ( Iterator activatorIterator = activators.iterator(); activatorIterator.hasNext(); )
- {
- ProfileActivator activator = (ProfileActivator) activatorIterator.next();
-
- if ( activator.canDetermineActivation( profile ) )
+ public void addError( String message )
{
- if ( activator.isActive( profile ) )
- {
- return true;
- }
+ errors.add( new ProfileActivationException( message ) );
}
- }
+ } );
- return false;
- }
- catch ( ComponentLookupException e )
- {
- throw new ProfileActivationException( "Cannot retrieve list of profile activators.", e );
- }
- finally
+ if ( !errors.isEmpty() )
{
- container.getContext().put("SystemProperties", null);
- if ( activators != null )
- {
- try
- {
- container.releaseAll( activators );
- }
- catch ( ComponentLifecycleException e )
- {
- container.getLogger().debug( "Error releasing profile activators - ignoring.", e );
- }
- }
+ throw errors.get( 0 );
}
+
+ return profiles;
}
/* (non-Javadoc)
@@ -336,29 +257,4 @@
return defaultIds;
}
- public void loadSettingsProfiles( Settings settings )
- {
- if ( settings == null )
- {
- return;
- }
-
- List settingsProfiles = settings.getProfiles();
-
- List settingsActiveProfileIds = settings.getActiveProfiles();
-
- explicitlyActivate( settingsActiveProfileIds );
-
- if ( settingsProfiles != null && !settingsProfiles.isEmpty() )
- {
- for ( Iterator it = settings.getProfiles().iterator(); it.hasNext(); )
- {
- org.apache.maven.settings.Profile rawProfile = (org.apache.maven.settings.Profile) it.next();
-
- Profile profile = SettingsUtils.convertFromSettingsProfile( rawProfile );
-
- addProfile( profile );
- }
- }
- }
}
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java (from r801771, maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java&p1=maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java&r1=801771&r2=806538&rev=806538&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java Fri Aug 21 13:07:32 2009
@@ -28,6 +28,7 @@
* @author jdcasey
* @version $Id$
*/
+@Deprecated
public interface MavenProfilesBuilder
{
String ROLE = MavenProfilesBuilder.class.getName();
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java (from r801771, maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java&p1=maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java&r1=801771&r2=806538&rev=806538&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java Fri Aug 21 13:07:32 2009
@@ -21,12 +21,12 @@
import org.apache.maven.model.Profile;
import org.apache.maven.profiles.activation.ProfileActivationException;
-import org.apache.maven.settings.Settings;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+@Deprecated
public interface ProfileManager
{
@@ -40,8 +40,6 @@
void explicitlyDeactivate( List profileIds );
- void activateAsDefault( String profileId );
-
List getActiveProfiles()
throws ProfileActivationException;
@@ -55,8 +53,6 @@
List getIdsActivatedByDefault();
- void loadSettingsProfiles( Settings settings );
-
Properties getRequestProperties();
-}
\ No newline at end of file
+}
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java (from r801771, maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java&p1=maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java&r1=801771&r2=806538&rev=806538&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java Fri Aug 21 13:07:32 2009
@@ -28,6 +28,7 @@
import java.util.Iterator;
import java.util.List;
+@Deprecated
public class ProfilesConversionUtils
{
private ProfilesConversionUtils()
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java (from r806507, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfileActivationException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfileActivationException.java&r1=806507&r2=806538&rev=806538&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/ProfileActivationException.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java Fri Aug 21 13:07:32 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.profiles;
+package org.apache.maven.profiles.activation;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java?rev=806538&r1=806507&r2=806538&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java Fri Aug 21 13:07:32 2009
@@ -26,7 +26,6 @@
import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.ProfileActivationContext;
import org.apache.maven.profiles.ProfileManager;
import org.codehaus.plexus.PlexusTestCase;
@@ -62,9 +61,8 @@
defaultActivated.setActivation( defaultActivation );
Properties props = System.getProperties();
- ProfileActivationContext ctx = new ProfileActivationContext( props, false );
- ProfileManager profileManager = new DefaultProfileManager( ctx );
+ ProfileManager profileManager = new DefaultProfileManager( getContainer(), props );
profileManager.addProfile( notActivated );
profileManager.addProfile( defaultActivated );
@@ -101,9 +99,8 @@
defaultActivated.setActivation( defaultActivation );
Properties props = System.getProperties();
- ProfileActivationContext ctx = new ProfileActivationContext( props, false );
- ProfileManager profileManager = new DefaultProfileManager( ctx );
+ ProfileManager profileManager = new DefaultProfileManager( getContainer(), props );
profileManager.addProfile( syspropActivated );
profileManager.addProfile( defaultActivated );
@@ -132,9 +129,8 @@
syspropActivated.setActivation( syspropActivation );
Properties props = System.getProperties();
- ProfileActivationContext ctx = new ProfileActivationContext( props, false );
- ProfileManager profileManager = new DefaultProfileManager( ctx );
+ ProfileManager profileManager = new DefaultProfileManager( getContainer(), props );
profileManager.addProfile( syspropActivated );
@@ -160,13 +156,12 @@
syspropActivated.setActivation( syspropActivation );
Properties props = System.getProperties();
- ProfileActivationContext ctx = new ProfileActivationContext( props, false );
- ProfileManager profileManager = new DefaultProfileManager( ctx );
+ ProfileManager profileManager = new DefaultProfileManager( getContainer(), props );
profileManager.addProfile( syspropActivated );
- ctx.setActive( "syspropActivated" );
+ profileManager.explicitlyActivate( "syspropActivated" );
List active = profileManager.getActiveProfiles();
@@ -191,13 +186,12 @@
syspropActivated.setActivation( syspropActivation );
Properties props = System.getProperties();
- ProfileActivationContext ctx = new ProfileActivationContext( props, false );
- ProfileManager profileManager = new DefaultProfileManager( ctx );
+ ProfileManager profileManager = new DefaultProfileManager( getContainer(), props );
profileManager.addProfile( syspropActivated );
- ctx.setInactive( "syspropActivated" );
+ profileManager.explicitlyDeactivate( "syspropActivated" );
List active = profileManager.getActiveProfiles();
@@ -224,7 +218,7 @@
Properties props = System.getProperties();
ProfileActivationContext ctx = new ProfileActivationContext( props, false );
- ProfileManager profileManager = new DefaultProfileManager( getContainer(), ctx );
+ ProfileManager profileManager = new DefaultProfileManager( getContainer(), props );
profileManager.addProfile( osActivated );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java?rev=806538&r1=806537&r2=806538&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java Fri Aug 21 13:07:32 2009
@@ -11,7 +11,7 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.building.ModelProblem;
-import org.apache.maven.profiles.ProfileActivationException;
+import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;