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

[MNG-4787] Allow class realm manager delegates to alter public part of Maven core realm 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@991347 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-08-31 21:49:55 +00:00
parent 8c541435f5
commit fc2a9f9a26
2 changed files with 89 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java
View File

@ -29,9 +29,30 @@ import java.util.List;
public interface ClassRealmRequest
{
/**
* The type of a class realm.
*/
enum RealmType
{
Project, Extension, Plugin,
/**
* The class realm for the public API of the Maven core.
*/
Core,
/**
* A class realm for a project to aggregates its build extensions.
*/
Project,
/**
* A class realm for a build extension.
*/
Extension,
/**
* A class realm for a plugin.
*/
Plugin,
}
/**
@ -49,7 +70,7 @@ public interface ClassRealmRequest
ClassLoader getParent();
/**
* Gets the packages/types to import from the parent realm
* Gets the packages/types to import from the parent realm.
*
* @return The modifiable list of packages/types to import from the parent realm, never {@code null}.
*/

96
maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
View File

@ -105,8 +105,26 @@ public class DefaultClassRealmManager
if ( mavenRealm == null )
{
mavenRealm = newRealm( "maven.api" );
importMavenApi( mavenRealm );
mavenRealm.setParentClassLoader( ClassLoader.getSystemClassLoader() );
List<ClassRealmManagerDelegate> delegates = getDelegates();
if ( !delegates.isEmpty() )
{
List<ClassRealmConstituent> constituents = new ArrayList<ClassRealmConstituent>();
ClassRealmRequest request =
new DefaultClassRealmRequest( RealmType.Core, null, new ArrayList<String>(), constituents );
for ( ClassRealmManagerDelegate delegate : delegates )
{
delegate.setupRealm( mavenRealm, request );
}
populateRealm( mavenRealm, constituents );
}
}
return mavenRealm;
}
@ -150,8 +168,6 @@ public class DefaultClassRealmManager
imports = new ArrayList<String>();
}
ClassRealmRequest request = new DefaultClassRealmRequest( type, parent, imports, constituents );
ClassRealm classRealm = newRealm( baseRealmId );
if ( parent != null )
@ -163,9 +179,15 @@ public class DefaultClassRealmManager
classRealm.setParentRealm( getMavenRealm() );
}
for ( ClassRealmManagerDelegate delegate : getDelegates() )
List<ClassRealmManagerDelegate> delegates = getDelegates();
if ( !delegates.isEmpty() )
{
delegate.setupRealm( classRealm, request );
ClassRealmRequest request = new DefaultClassRealmRequest( type, parent, imports, constituents );
for ( ClassRealmManagerDelegate delegate : delegates )
{
delegate.setupRealm( classRealm, request );
}
}
if ( importXpp3Dom )
@ -193,35 +215,12 @@ public class DefaultClassRealmManager
}
}
if ( logger.isDebugEnabled() )
{
logger.debug( "Populating class realm " + classRealm.getId() );
}
for ( ClassRealmConstituent constituent : constituents )
{
File file = constituent.getFile();
String id = getId( constituent );
artifactIds.remove( id );
if ( logger.isDebugEnabled() )
{
logger.debug( " Included: " + id );
}
try
{
classRealm.addURL( file.toURI().toURL() );
}
catch ( MalformedURLException e )
{
// Not going to happen
}
}
Set<String> includedIds = populateRealm( classRealm, constituents );
if ( logger.isDebugEnabled() )
{
artifactIds.removeAll( includedIds );
for ( String id : artifactIds )
{
logger.debug( " Excluded: " + id );
@ -362,8 +361,45 @@ public class DefaultClassRealmManager
}
catch ( ComponentLookupException e )
{
logger.error( "Failed to lookup class realm delegates: " + e.getMessage(), e );
return Collections.emptyList();
}
}
private Set<String> populateRealm( ClassRealm classRealm, List<ClassRealmConstituent> constituents )
{
Set<String> includedIds = new LinkedHashSet<String>();
if ( logger.isDebugEnabled() )
{
logger.debug( "Populating class realm " + classRealm.getId() );
}
for ( ClassRealmConstituent constituent : constituents )
{
File file = constituent.getFile();
String id = getId( constituent );
includedIds.add( id );
if ( logger.isDebugEnabled() )
{
logger.debug( " Included: " + id );
}
try
{
classRealm.addURL( file.toURI().toURL() );
}
catch ( MalformedURLException e )
{
// Not going to happen
logger.error( e.getMessage(), e );
}
}
return includedIds;
}
}