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

Restore complete list of plugin artifacts in PluginDescriptor for use in ${plugin.artifacts}. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633239 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2008-03-03 19:18:37 +00:00
parent 80a6818f01
commit 19cfe737aa
3 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -284,7 +284,10 @@ public class DefaultPluginManager
{
try
{
pluginRealm = realmManager.createPluginRealm( projectPlugin, pluginArtifact, artifacts );
pluginRealm = realmManager.createPluginRealm( projectPlugin,
pluginArtifact,
artifacts,
coreArtifactFilterManager.getArtifactFilter() );
getLogger().debug( "Created realm: " + pluginRealm + " for plugin: " + projectPlugin.getKey() );
}
@ -425,6 +428,8 @@ public class DefaultPluginManager
repositories.addAll( project.getRemoteArtifactRepositories() );
ArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
ArtifactResolutionResult result = artifactResolver.resolveTransitively(
dependencies,
pluginArtifact,
@ -435,7 +440,7 @@ public class DefaultPluginManager
: new ArrayList(
repositories ),
artifactMetadataSource,
coreArtifactFilterManager.getArtifactFilter() );
filter );
Set resolved = new HashSet( result.getArtifacts() );

33
maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java
View File

@ -20,6 +20,7 @@ package org.apache.maven.realm;
*/
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Plugin;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
@ -130,7 +131,7 @@ public class DefaultMavenRealmManager
e );
}
populateRealm( id, realm, extensionArtifact, artifacts );
populateRealm( id, realm, extensionArtifact, artifacts, null );
return realm;
}
@ -267,7 +268,8 @@ public class DefaultMavenRealmManager
public ClassRealm createPluginRealm( Plugin plugin,
Artifact pluginArtifact,
Collection artifacts )
Collection artifacts,
ArtifactFilter coreArtifactFilter )
throws RealmManagementException
{
String id = RealmUtils.createPluginRealmId( plugin );
@ -286,7 +288,7 @@ public class DefaultMavenRealmManager
e );
}
populateRealm( id, realm, pluginArtifact, artifacts );
populateRealm( id, realm, pluginArtifact, artifacts, coreArtifactFilter );
logger.debug( "Saving artifacts:\n\n" + artifacts + "\n\nfor plugin: " + id );
pluginArtifacts.put( id, artifacts );
@ -297,7 +299,8 @@ public class DefaultMavenRealmManager
private void populateRealm( String id,
ClassRealm realm,
Artifact mainArtifact,
Collection artifacts )
Collection artifacts,
ArtifactFilter coreArtifactFilter )
throws RealmManagementException
{
if ( !artifacts.contains( mainArtifact ) )
@ -318,16 +321,24 @@ public class DefaultMavenRealmManager
for ( Iterator it = artifacts.iterator(); it.hasNext(); )
{
Artifact artifact = (Artifact) it.next();
try
if ( ( coreArtifactFilter == null ) || coreArtifactFilter.include( artifact ) )
{
realm.addURL( artifact.getFile().toURI().toURL() );
try
{
realm.addURL( artifact.getFile().toURI().toURL() );
}
catch ( MalformedURLException e )
{
throw new RealmManagementException( id, artifact, "Invalid URL for artifact file: "
+ artifact.getFile()
+ " to be used in realm: " + id
+ ".", e );
}
}
catch ( MalformedURLException e )
else
{
throw new RealmManagementException( id, artifact, "Invalid URL for artifact file: "
+ artifact.getFile()
+ " to be used in realm: " + id
+ ".", e );
logger.debug( "Excluding artifact: " + artifact.getArtifactId() + " from plugin realm; it's already included in Maven's core." );
}
}
}

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

@ -1,6 +1,7 @@
package org.apache.maven.realm;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Plugin;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
@ -34,7 +35,8 @@ public interface MavenRealmManager
ClassRealm createPluginRealm( Plugin plugin,
Artifact pluginArtifact,
Collection artifacts )
Collection artifacts,
ArtifactFilter coreArtifactFilter )
throws RealmManagementException;
void disposePluginRealm( Plugin plugin );