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

o trying to get a grasp of the entire profile mechanism, especially in relation to how they deal with repositories. 

here i am just collecting all the profile code into one place as it's scattered over several packages and is
  hard to determine what the profile system as a whole is doing. the first task i would like to do is decouple
  the profile system from the Settings. this can be done at the front-end i.e the profile information from Settings
  can be fed into the profile manager up front.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573325 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2007-09-06 17:09:36 +00:00
parent a2a9e392b2
commit 99bd5ac68f
28 changed files with 73 additions and 100 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.ProfileManager;
import org.apache.maven.profiles.manager.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.ProfileManager;
import org.apache.maven.profiles.manager.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.ProfileManager;
import org.apache.maven.profiles.manager.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.ProfileManager;
import org.apache.maven.profiles.manager.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.ProfileManager;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.activation.CustomActivatorAdvice;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;

4
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
View File

@ -54,8 +54,8 @@ import org.apache.maven.plugin.PluginNotFoundException;
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
import org.apache.maven.plugin.version.PluginVersionNotFoundException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.manager.DefaultProfileManager;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.MavenProjectBuildingResult;

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

@ -30,8 +30,8 @@ import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.monitor.event.DefaultEventMonitor;
import org.apache.maven.plugin.Mojo;
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.manager.DefaultProfileManager;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;

14
maven-embedder/src/test/projects/complex-project/maven-project/src/main/resources/META-INF/plexus/components.xml
View File

@ -53,9 +53,9 @@ under the License.
</component>
<component>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
<implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
<requirements>
<requirement>
<role>org.apache.maven.MavenTools</role>
@ -64,7 +64,7 @@ under the License.
<role>org.apache.maven.profiles.MavenProfilesBuilder</role>
</requirement>
<requirement>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
</requirement>
</requirements>
</component>
@ -78,7 +78,7 @@ under the License.
<implementation>org.apache.maven.project.build.model.DefaultModelLineageBuilder</implementation>
<requirements>
<requirement>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
<requirement>
@ -135,8 +135,8 @@ under the License.
|
-->
<component>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<implementation>org.apache.maven.project.injection.DefaultProfileInjector</implementation>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<implementation>org.apache.maven.profiles.injection.DefaultProfileInjector</implementation>
</component>
<!--
|
@ -152,7 +152,7 @@ under the License.
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
<requirement>

10
maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
View File

@ -34,14 +34,14 @@ under the License.
</component>
-->
<component>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<role-hint>test</role-hint>
<implementation>org.apache.maven.project.injection.TestProfileInjector</implementation>
</component>
<component>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
<implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
<requirements>
<requirement>
<role>org.apache.maven.MavenTools</role>
@ -50,7 +50,7 @@ under the License.
<role>org.apache.maven.profiles.MavenProfilesBuilder</role>
</requirement>
<requirement>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<role-hint>test</role-hint>
</requirement>
</requirements>
@ -85,7 +85,7 @@ under the License.
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
<requirement>

10
maven-embedder/src/test/projects/complex-project/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
View File

@ -34,7 +34,7 @@ under the License.
</component>
-->
<component>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<role-hint>test</role-hint>
<implementation>org.apache.maven.project.injection.TestProfileInjector</implementation>
</component>
@ -57,9 +57,9 @@ under the License.
</requirements>
</component>
<component>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
<implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
<requirements>
<requirement>
<role>org.apache.maven.MavenTools</role>
@ -68,7 +68,7 @@ under the License.
<role>org.apache.maven.profiles.MavenProfilesBuilder</role>
</requirement>
<requirement>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<role-hint>test</role-hint>
</requirement>
</requirements>
@ -83,7 +83,7 @@ under the License.
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
<requirement>

8
maven-project/src/main/java/org/apache/maven/project/build/profile/DefaultProfileAdvisor.java → maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project.build.profile;
package org.apache.maven.profiles.build;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -26,14 +26,14 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.manager.DefaultProfileManager;
import org.apache.maven.profiles.MavenProfilesBuilder;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.ProfilesConversionUtils;
import org.apache.maven.profiles.ProfilesRoot;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.injection.ProfileInjector;
import org.apache.maven.profiles.injection.ProfileInjector;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.context.Context;

4
maven-project/src/main/java/org/apache/maven/project/build/profile/ProfileAdvisor.java → maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project.build.profile;
package org.apache.maven.profiles.build;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -20,7 +20,7 @@ package org.apache.maven.project.build.profile;
*/
import org.apache.maven.model.Model;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.project.ProjectBuildingException;
import java.io.File;

2
maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java → maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
View File

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

2
maven-project/src/main/java/org/apache/maven/project/injection/ProfileInjector.java → maven-project/src/main/java/org/apache/maven/profiles/injection/ProfileInjector.java
View File

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

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

@ -1,4 +1,4 @@
package org.apache.maven.profiles;
package org.apache.maven.profiles.manager;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -50,18 +50,6 @@ public class DefaultProfileManager
private Map profilesById = new LinkedHashMap();
// default fallback..
private Properties systemProperties = System.getProperties();
/**
* @deprecated without passing in the system properties, the SystemPropertiesProfileActivator will not work correctly
* in embedded envirnments.
*/
public DefaultProfileManager( PlexusContainer container )
{
this( container, (Settings)null);
}
/**
* the properties passed to the profile manager are the props that
* are passed to maven, possibly containing profile activator properties
@ -94,15 +82,6 @@ public class DefaultProfileManager
this.container = container;
loadSettingsProfiles( settings );
if ( props != null )
{
systemProperties = props;
}
}
public Properties getSystemProperties() {
return systemProperties;
}
public Map getProfilesById()
@ -111,7 +90,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#addProfile(org.apache.maven.model.Profile)
* @see org.apache.maven.profiles.manager.ProfileManager#addProfile(org.apache.maven.model.Profile)
*/
public void addProfile( Profile profile )
{
@ -135,7 +114,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.lang.String)
* @see org.apache.maven.profiles.manager.ProfileManager#explicitlyActivate(java.lang.String)
*/
public void explicitlyActivate( String profileId )
{
@ -148,7 +127,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.util.List)
* @see org.apache.maven.profiles.manager.ProfileManager#explicitlyActivate(java.util.List)
*/
public void explicitlyActivate( List profileIds )
{
@ -161,7 +140,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.lang.String)
* @see org.apache.maven.profiles.manager.ProfileManager#explicitlyDeactivate(java.lang.String)
*/
public void explicitlyDeactivate( String profileId )
{
@ -174,7 +153,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.util.List)
* @see org.apache.maven.profiles.manager.ProfileManager#explicitlyDeactivate(java.util.List)
*/
public void explicitlyDeactivate( List profileIds )
{
@ -187,7 +166,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#getActiveProfiles()
* @see org.apache.maven.profiles.manager.ProfileManager#getActiveProfiles()
*/
public List getActiveProfiles()
throws ProfileActivationException
@ -295,7 +274,7 @@ public class DefaultProfileManager
}
/* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#addProfiles(java.util.List)
* @see org.apache.maven.profiles.manager.ProfileManager#addProfiles(java.util.List)
*/
public void addProfiles( List profiles )
{

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

@ -1,4 +1,4 @@
package org.apache.maven.profiles;
package org.apache.maven.profiles.manager;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -28,7 +28,6 @@ import java.util.Map;
public interface ProfileManager
{
void addProfile( Profile profile );
void explicitlyActivate( String profileId );

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

@ -49,9 +49,8 @@ import org.apache.maven.model.Model;
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.DefaultProfileManager;
import org.apache.maven.profiles.MavenProfilesBuilder;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.build.ProjectBuildCache;
@ -60,7 +59,7 @@ import org.apache.maven.project.build.model.DefaultModelLineage;
import org.apache.maven.project.build.model.ModelLineage;
import org.apache.maven.project.build.model.ModelLineageBuilder;
import org.apache.maven.project.build.model.ModelLineageIterator;
import org.apache.maven.project.build.profile.ProfileAdvisor;
import org.apache.maven.profiles.build.ProfileAdvisor;
import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
import org.apache.maven.project.injection.ModelDefaultsInjector;
import org.apache.maven.project.interpolation.ModelInterpolationException;

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

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

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

@ -31,10 +31,10 @@ 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.ProfileManager;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.build.ProjectBuildCache;
import org.apache.maven.project.build.profile.ProfileAdvisor;
import org.apache.maven.profiles.build.ProfileAdvisor;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;

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.ProfileManager;
import org.apache.maven.profiles.manager.ProfileManager;
import org.apache.maven.project.ProjectBuildingException;
import java.io.File;

14
maven-project/src/main/resources/META-INF/plexus/components.xml
View File

@ -53,9 +53,9 @@ under the License.
</component>
<component>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
<implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
<requirements>
<requirement>
<role>org.apache.maven.MavenTools</role>
@ -64,7 +64,7 @@ under the License.
<role>org.apache.maven.profiles.MavenProfilesBuilder</role>
</requirement>
<requirement>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
</requirement>
</requirements>
</component>
@ -78,7 +78,7 @@ under the License.
<implementation>org.apache.maven.project.build.model.DefaultModelLineageBuilder</implementation>
<requirements>
<requirement>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
<requirement>
@ -135,8 +135,8 @@ under the License.
|
-->
<component>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<implementation>org.apache.maven.project.injection.DefaultProfileInjector</implementation>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<implementation>org.apache.maven.profiles.injection.DefaultProfileInjector</implementation>
</component>
<!--
|
@ -152,7 +152,7 @@ under the License.
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
<requirement>

3
maven-project/src/test/java/org/apache/maven/project/injection/DefaultProfileInjectorTest.java → maven-project/src/test/java/org/apache/maven/profiles/injection/DefaultProfileInjectorTest.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project.injection;
package org.apache.maven.profiles.injection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -28,6 +28,7 @@ import org.apache.maven.model.PluginContainer;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
import org.apache.maven.profiles.injection.DefaultProfileInjector;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.util.Collections;

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

@ -1,4 +1,4 @@
package org.apache.maven.profiles;
package org.apache.maven.profiles.manager;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -27,6 +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.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.DefaultProfileManager;
import org.apache.maven.profiles.manager.DefaultProfileManager;
import org.codehaus.plexus.PlexusTestCase;
import java.io.File;

6
maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
View File

@ -22,18 +22,12 @@ 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.model.Profile;
import org.apache.maven.model.Repository;
import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
public class DefaultMavenProjectBuilderTest
extends AbstractMavenProjectTestCase

1
maven-project/src/test/java/org/apache/maven/project/injection/TestProfileInjector.java
View File

@ -21,6 +21,7 @@ package org.apache.maven.project.injection;
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
import org.apache.maven.profiles.injection.ProfileInjector;
public class TestProfileInjector
implements ProfileInjector

10
maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
View File

@ -34,14 +34,14 @@ under the License.
</component>
-->
<component>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<role-hint>test</role-hint>
<implementation>org.apache.maven.project.injection.TestProfileInjector</implementation>
</component>
<component>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
<implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
<requirements>
<requirement>
<role>org.apache.maven.MavenTools</role>
@ -50,7 +50,7 @@ under the License.
<role>org.apache.maven.profiles.MavenProfilesBuilder</role>
</requirement>
<requirement>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<role-hint>test</role-hint>
</requirement>
</requirements>
@ -85,7 +85,7 @@ under the License.
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
<requirement>

10
maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
View File

@ -34,7 +34,7 @@ under the License.
</component>
-->
<component>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<role-hint>test</role-hint>
<implementation>org.apache.maven.project.injection.TestProfileInjector</implementation>
</component>
@ -57,9 +57,9 @@ under the License.
</requirements>
</component>
<component>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.project.build.profile.DefaultProfileAdvisor</implementation>
<implementation>org.apache.maven.profiles.build.DefaultProfileAdvisor</implementation>
<requirements>
<requirement>
<role>org.apache.maven.MavenTools</role>
@ -68,7 +68,7 @@ under the License.
<role>org.apache.maven.profiles.MavenProfilesBuilder</role>
</requirement>
<requirement>
<role>org.apache.maven.project.injection.ProfileInjector</role>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<role-hint>test</role-hint>
</requirement>
</requirements>
@ -83,7 +83,7 @@ under the License.
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.project.build.profile.ProfileAdvisor</role>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
<requirement>