Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o put the profile manager back into place as the project build is exposed in a ton of plugin. arrrg. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573718 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2007-09-07 21:29:08 +00:00
parent e9b6657f4c
commit d72b8bc88a
17 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -40,7 +40,7 @@ import org.apache.maven.lifecycle.TaskValidationResult;
import org.apache.maven.monitor.event.DefaultEventDispatcher;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;

2
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
View File

@ -21,7 +21,7 @@ package org.apache.maven.execution;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.monitor.event.EventMonitor;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;

2
maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
View File

@ -22,7 +22,7 @@ package org.apache.maven.execution;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.monitor.event.EventMonitor;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
import org.codehaus.plexus.logging.Logger;

2
maven-core/src/main/java/org/apache/maven/extension/BuildExtensionScanner.java
View File

@ -20,7 +20,7 @@ package org.apache.maven.extension;
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.ProfileManager;
import java.io.File;
import java.util.List;

2
maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
View File

@ -28,7 +28,7 @@ import org.apache.maven.model.Build;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.activation.CustomActivatorAdvice;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;

3
maven-core/src/main/resources/META-INF/plexus/components.xml
View File

@ -726,9 +726,6 @@ under the License.
<requirement>
<role>org.apache.maven.settings.validation.SettingsValidator</role>
</requirement>
<requirement>
<role>org.apache.maven.context.BuildContextManager</role>
</requirement>
</requirements>
</component>
</components>

8
maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
View File

@ -32,8 +32,8 @@ import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.model.Profile;
import org.apache.maven.monitor.event.DefaultEventMonitor;
import org.apache.maven.plugin.Mojo;
import org.apache.maven.profiles.manager.DefaultProfileManager;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
@ -110,9 +110,7 @@ public class DefaultMavenExecutionRequestPopulator
try
{
request.setSettings(
settingsBuilder.buildSettings(
configuration.getUserSettingsFile(),
configuration.getGlobalSettingsFile() ) );
settingsBuilder.buildSettings( request ) );
}
catch ( Exception e )
{

16
maven-project/src/main/java/org/apache/maven/profiles/manager/DefaultProfileManager.java → maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.profiles.manager;
package org.apache.maven.profiles;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -63,7 +63,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.manager.ProfileManager#addProfile(org.apache.maven.model.Profile)
* @see org.apache.maven.profiles.ProfileManager#addProfile(org.apache.maven.model.Profile)
*/
public void addProfile( Profile profile )
{
@ -87,7 +87,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.manager.ProfileManager#explicitlyActivate(java.lang.String)
* @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.lang.String)
*/
public void explicitlyActivate( String profileId )
{
@ -100,7 +100,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.manager.ProfileManager#explicitlyActivate(java.util.List)
* @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.util.List)
*/
public void explicitlyActivate( List profileIds )
{
@ -113,7 +113,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.manager.ProfileManager#explicitlyDeactivate(java.lang.String)
* @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.lang.String)
*/
public void explicitlyDeactivate( String profileId )
{
@ -126,7 +126,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.manager.ProfileManager#explicitlyDeactivate(java.util.List)
* @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.util.List)
*/
public void explicitlyDeactivate( List profileIds )
{
@ -139,7 +139,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.manager.ProfileManager#getActiveProfiles()
* @see org.apache.maven.profiles.ProfileManager#getActiveProfiles()
*/
public List getActiveProfiles()
throws ProfileActivationException
@ -247,7 +247,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.manager.ProfileManager#addProfiles(java.util.List)
* @see org.apache.maven.profiles.ProfileManager#addProfiles(java.util.List)
*/
public void addProfiles( List profiles )
{

2
maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java → maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.profiles.manager;
package org.apache.maven.profiles;
/*
* Licensed to the Apache Software Foundation (ASF) under one

4
maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
View File

@ -29,10 +29,10 @@ import org.apache.maven.model.Repository;
import org.apache.maven.profiles.MavenProfilesBuilder;
import org.apache.maven.profiles.ProfilesConversionUtils;
import org.apache.maven.profiles.ProfilesRoot;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.profiles.injection.ProfileInjector;
import org.apache.maven.profiles.manager.DefaultProfileManager;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.project.ProjectBuildingException;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;

2
maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java
View File

@ -20,7 +20,7 @@ package org.apache.maven.profiles.build;
*/
import org.apache.maven.model.Model;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.ProjectBuildingException;
import java.io.File;

2
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -50,7 +50,7 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.profiles.MavenProfilesBuilder;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.build.ProjectBuildCache;

2
maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
View File

@ -40,7 +40,7 @@ package org.apache.maven.project;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.wagon.events.TransferListener;
import java.io.File;

2
maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
View File

@ -31,7 +31,7 @@ import org.apache.maven.context.BuildContextManager;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.build.ProjectBuildCache;
import org.apache.maven.profiles.build.ProfileAdvisor;

2
maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java
View File

@ -20,7 +20,7 @@ package org.apache.maven.project.build.model;
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.ProjectBuildingException;
import java.io.File;

4
maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
View File

@ -27,8 +27,8 @@ import org.apache.maven.model.ActivationOS;
import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.manager.DefaultProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.DefaultProfileManager;
import org.codehaus.plexus.PlexusTestCase;
import java.util.List;

2
maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
View File

@ -22,7 +22,7 @@ package org.apache.maven.project;
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.manager.DefaultProfileManager;
import org.apache.maven.profiles.DefaultProfileManager;
import org.codehaus.plexus.PlexusTestCase;
import java.io.File;