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

Detangled profile activitation dependency on realm manager. Move org.apache.maven.realm package to maven-core project. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695332 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2008-09-15 02:54:31 +00:00
parent 180bf37d84
commit bc3660ec47
9 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java → maven-core/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java
View File

0
maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java → maven-core/src/main/java/org/apache/maven/realm/MavenRealmManager.java
View File

0
maven-project/src/main/java/org/apache/maven/realm/RealmManagementException.java → maven-core/src/main/java/org/apache/maven/realm/RealmManagementException.java
View File

0
maven-project/src/main/java/org/apache/maven/realm/RealmScanningUtils.java → maven-core/src/main/java/org/apache/maven/realm/RealmScanningUtils.java
View File

0
maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java → maven-core/src/main/java/org/apache/maven/realm/RealmUtils.java
View File

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

@ -742,8 +742,8 @@ private void profileManager( MavenExecutionRequest request,
ProfileActivationContext activationContext = request.getProfileActivationContext();
if ( activationContext == null )
{
activationContext = new DefaultProfileActivationContext( request.getRealmManager(),
request.getProperties(), false );
activationContext = new DefaultProfileActivationContext(
request.getProperties(), false );
}
activationContext.setExplicitlyActiveProfileIds( request.getActiveProfiles() );

24
maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
View File

@ -27,13 +27,9 @@
import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.profiles.activation.ProfileActivator;
import org.apache.maven.realm.DefaultMavenRealmManager;
import org.apache.maven.realm.MavenRealmManager;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
import java.util.ArrayList;
import java.util.Iterator;
@ -81,11 +77,8 @@ public DefaultProfileManager( PlexusContainer container )
private ProfileActivationContext createDefaultActivationContext()
{
// create the necessary bits to get a skeletal profile manager running.
Logger logger = container.getLoggerManager().getLoggerForComponent( DefaultProfileManager.class.getName() );
MavenRealmManager manager = new DefaultMavenRealmManager( container, logger );
return new DefaultProfileActivationContext( manager, System.getProperties(), false );
return new DefaultProfileActivationContext(System.getProperties(), false );
}
public ProfileActivationContext getProfileActivationContext()
@ -190,17 +183,6 @@ public List getActiveProfiles()
public List getActiveProfiles( Model model )
throws ProfileActivationException
{
MavenRealmManager realmManager = profileActivationContext.getRealmManager();
ClassRealm projectRealm = null;
ClassRealm oldLookupRealm = null;
if ( ( model != null ) && ( realmManager != null ) )
{
projectRealm = realmManager.getProjectRealm( getGroupId( model ), model.getArtifactId(),
getVersion( model ) );
oldLookupRealm = container.setLookupRealm( projectRealm );
}
try
{
@ -271,10 +253,6 @@ else if ( isActive( profile, profileActivationContext ) )
}
finally
{
if ( projectRealm != null )
{
container.setLookupRealm( oldLookupRealm );
}
}
}

17
maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java
View File

@ -19,7 +19,6 @@
* under the License.
*/
import org.apache.maven.realm.MavenRealmManager;
import java.util.ArrayList;
import java.util.Collections;
@ -38,21 +37,10 @@ public class DefaultProfileActivationContext
List explicitlyInactive;
private final MavenRealmManager realmManager;
private List activeByDefault;
public DefaultProfileActivationContext( MavenRealmManager realmManager, Properties executionProperties,
boolean isCustomActivatorFailureSuppressed )
{
this.realmManager = realmManager;
this.executionProperties = executionProperties;
this.isCustomActivatorFailureSuppressed = isCustomActivatorFailureSuppressed;
}
public DefaultProfileActivationContext( Properties executionProperties, boolean isCustomActivatorFailureSuppressed )
{
realmManager = null;
this.executionProperties = executionProperties;
this.isCustomActivatorFailureSuppressed = isCustomActivatorFailureSuppressed;
}
@ -102,11 +90,6 @@ public void setExplicitlyInactiveProfileIds( List inactive )
explicitlyInactive = inactive;
}
public MavenRealmManager getRealmManager()
{
return realmManager;
}
public void setActive( String profileId )
{
if ( explicitlyActive == null )

3
maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java
View File

@ -19,7 +19,6 @@
* under the License.
*/
import org.apache.maven.realm.MavenRealmManager;
import java.util.List;
import java.util.Properties;
@ -31,8 +30,6 @@ public interface ProfileActivationContext
List getExplicitlyInactiveProfileIds();
MavenRealmManager getRealmManager();
Properties getExecutionProperties();
boolean isCustomActivatorFailureSuppressed();