You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/02/28 18:26:57 UTC
svn commit: r748889 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/errors/
maven-core/src/main/java/org/apache/maven/execution/
maven-embedder/src/main/java/org/apache/maven/embedder/execution/
maven-project/src/main/java/org/a...
Author: sisbell
Date: Sat Feb 28 17:26:56 2009
New Revision: 748889
URL: http://svn.apache.org/viewvc?rev=748889&view=rev
Log:
Moved profile classes into main project package.
Added:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java (contents, props changed)
- copied, changed from r748870, 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/project/ProfileActivationContext.java (contents, props changed)
- copied, changed from r748870, maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java (contents, props changed)
- copied, changed from r748870, maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java (contents, props changed)
- copied, changed from r748870, maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
Removed:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
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/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java?rev=748889&r1=748888&r2=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java Sat Feb 28 17:26:56 2009
@@ -11,13 +11,9 @@
import org.apache.maven.model.Parent;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
-import org.apache.maven.profiles.activation.ProfileActivationException;
+import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.execution.DuplicateProjectException;
-import org.apache.maven.project.InvalidProjectModelException;
-import org.apache.maven.project.InvalidProjectVersionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilderConfiguration;
+import org.apache.maven.project.*;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java?rev=748889&r1=748888&r2=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java Sat Feb 28 17:26:56 2009
@@ -5,8 +5,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
-import org.apache.maven.profiles.activation.ProfileActivationException;
+import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectModelException;
import org.apache.maven.project.InvalidProjectVersionException;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java?rev=748889&r1=748888&r2=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java Sat Feb 28 17:26:56 2009
@@ -5,8 +5,6 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
import org.apache.maven.model.RepositoryBase;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
-import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectVersionException;
import org.apache.maven.project.MavenProject;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=748889&r1=748888&r2=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Sat Feb 28 17:26:56 2009
@@ -24,8 +24,8 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
+import org.apache.maven.project.ProfileManager;
+import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.realm.MavenRealmManager;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=748889&r1=748888&r2=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Sat Feb 28 17:26:56 2009
@@ -28,8 +28,8 @@
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
+import org.apache.maven.project.ProfileManager;
+import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.realm.MavenRealmManager;
import org.apache.maven.settings.Settings;
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=748889&r1=748888&r2=748889&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 Sat Feb 28 17:26:56 2009
@@ -38,9 +38,9 @@
import org.apache.maven.model.Repository;
import org.apache.maven.monitor.event.DefaultEventMonitor;
import org.apache.maven.monitor.event.EventMonitor;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
+import org.apache.maven.project.DefaultProfileManager;
+import org.apache.maven.project.ProfileManager;
+import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.realm.DefaultMavenRealmManager;
import org.apache.maven.repository.MavenRepositorySystem;
import org.apache.maven.settings.MavenSettingsBuilder;
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=748889&r1=748888&r2=748889&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 Sat Feb 28 17:26:56 2009
@@ -37,10 +37,10 @@
import org.apache.maven.model.Profile;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
-import org.apache.maven.profiles.activation.ProfileActivationException;
+import org.apache.maven.project.ProfileManager;
+import org.apache.maven.project.DefaultProfileManager;
+import org.apache.maven.project.ProfileActivationContext;
+import org.apache.maven.project.ProfileActivationException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.builder.*;
import org.apache.maven.project.builder.profile.ProfileContext;
Copied: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java (from r748870, 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/project/DefaultProfileManager.java?p2=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java&p1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java&r1=748870&r2=748889&rev=748889&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/project/DefaultProfileManager.java Sat Feb 28 17:26:56 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.profiles;
+package org.apache.maven.project;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,9 @@
import org.apache.maven.model.Profile;
import org.apache.maven.model.Parent;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
-import org.apache.maven.profiles.activation.ProfileActivationException;
+import org.apache.maven.project.ProfileActivationContext;
+import org.apache.maven.project.ProfileActivationException;
+import org.apache.maven.project.ProfileManager;
import org.apache.maven.shared.model.ModelContainer;
import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.ModelMarshaller;
@@ -105,7 +106,7 @@
}
/* (non-Javadoc)
- * @see org.apache.maven.profiles.ProfileManager#addProfile(org.apache.maven.model.Profile)
+ * @see org.apache.maven.project.ProfileManager#addProfile(org.apache.maven.model.Profile)
*/
public void addProfile( Profile profile )
{
@@ -129,7 +130,7 @@
}
/* (non-Javadoc)
- * @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.lang.String)
+ * @see org.apache.maven.project.ProfileManager#explicitlyActivate(java.lang.String)
*/
public void explicitlyActivate( String profileId )
{
@@ -143,7 +144,7 @@
}
/* (non-Javadoc)
- * @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.util.List)
+ * @see org.apache.maven.project.ProfileManager#explicitlyActivate(java.util.List)
*/
public void explicitlyActivate( List profileIds )
{
@@ -156,7 +157,7 @@
}
/* (non-Javadoc)
- * @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.lang.String)
+ * @see org.apache.maven.project.ProfileManager#explicitlyDeactivate(java.lang.String)
*/
public void explicitlyDeactivate( String profileId )
{
@@ -170,7 +171,7 @@
}
/* (non-Javadoc)
- * @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.util.List)
+ * @see org.apache.maven.project.ProfileManager#explicitlyDeactivate(java.util.List)
*/
public void explicitlyDeactivate( List profileIds )
{
@@ -341,7 +342,7 @@
}
/* (non-Javadoc)
- * @see org.apache.maven.profiles.ProfileManager#addProfiles(java.util.List)
+ * @see org.apache.maven.project.ProfileManager#addProfiles(java.util.List)
*/
public void addProfiles( List profiles )
{
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java?rev=748889&r1=748888&r2=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java Sat Feb 28 17:26:56 2009
@@ -24,7 +24,7 @@
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.project.ProfileManager;
import org.apache.maven.shared.model.ModelEventListener;
public class DefaultProjectBuilderConfiguration
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=748889&r1=748888&r2=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java Sat Feb 28 17:26:56 2009
@@ -17,7 +17,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.project.ProfileManager;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.model.Model;
Copied: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationContext.java (from r748870, maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationContext.java?p2=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationContext.java&p1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java&r1=748870&r2=748889&rev=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationContext.java Sat Feb 28 17:26:56 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.profiles.activation;
+package org.apache.maven.project;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationContext.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Feb 28 17:26:56 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:739385,741841,747468
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:738757-738972
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java:688587-696625,696644-699681
Copied: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java (from r748870, maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java?p2=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java&p1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java&r1=748870&r2=748889&rev=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java Sat Feb 28 17:26:56 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.profiles.activation;
+package org.apache.maven.project;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java (from r748870, 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/project/ProfileManager.java?p2=maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java&p1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java&r1=748870&r2=748889&rev=748889&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/project/ProfileManager.java Sat Feb 28 17:26:56 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.profiles;
+package org.apache.maven.project;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
-import org.apache.maven.profiles.activation.ProfileActivationException;
+import org.apache.maven.project.ProfileActivationContext;
+import org.apache.maven.project.ProfileActivationException;
import java.util.List;
import java.util.Map;
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProfileManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java?rev=748889&r1=748888&r2=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java Sat Feb 28 17:26:56 2009
@@ -1,9 +1,7 @@
package org.apache.maven.project;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.shared.model.ModelEventListener;
-import org.codehaus.plexus.PlexusContainer;
+import org.apache.maven.project.ProfileManager;
import java.util.Date;
import java.util.List;
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java?rev=748889&r1=748888&r2=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java Sat Feb 28 17:26:56 2009
@@ -4,7 +4,7 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.profiles.activation.ProfileActivationException;
+import org.apache.maven.project.ProfileActivationException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
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=748889&r1=748888&r2=748889&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 Sat Feb 28 17:26:56 2009
@@ -23,9 +23,9 @@
import org.apache.maven.model.ActivationOS;
import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
+import org.apache.maven.project.DefaultProfileManager;
+import org.apache.maven.project.ProfileManager;
+import org.apache.maven.project.ProfileActivationContext;
import org.codehaus.plexus.PlexusTestCase;
import java.util.List;
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=748889&r1=748888&r2=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java Sat Feb 28 17:26:56 2009
@@ -22,8 +22,8 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
+import org.apache.maven.project.DefaultProfileManager;
+import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.project.validation.ModelValidationResult;
import org.codehaus.plexus.PlexusTestCase;
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=748889&r1=748888&r2=748889&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Sat Feb 28 17:26:56 2009
@@ -24,8 +24,8 @@
import java.io.FileInputStream;
import java.util.*;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.activation.ProfileActivationContext;
+import org.apache.maven.project.DefaultProfileManager;
+import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.artifact.Artifact;