You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/11/19 03:31:49 UTC
svn commit: r718845 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java
Author: jvanzyl
Date: Tue Nov 18 18:31:49 2008
New Revision: 718845
URL: http://svn.apache.org/viewvc?rev=718845&view=rev
Log:
o adding some patches for changes in plexus
submitted by: Dain Sundstrom
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=718845&r1=718844&r2=718845&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Tue Nov 18 18:31:49 2008
@@ -813,6 +813,11 @@
// lookups that occur in contextualize calls in line with the right realm.
container.setLookupRealm( pluginRealm );
+ ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader( pluginRealm );
+ try
+ {
+
getLogger().debug(
"Looking up mojo " + mojoDescriptor.getRoleHint() + " in realm "
+ pluginRealm.getId() + " - descRealmId="
@@ -900,6 +905,10 @@
populatePluginFields( mojo, mojoDescriptor, extractedMojoConfiguration, expressionEvaluator );
return mojo;
+
+ } finally {
+ Thread.currentThread().setContextClassLoader( oldClassLoader );
+ }
}
private void checkDeprecatedParameters( MojoDescriptor mojoDescriptor,
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java?rev=718845&r1=718844&r2=718845&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java Tue Nov 18 18:31:49 2008
@@ -66,7 +66,7 @@
public void testComponentOverride()
throws ComponentLookupException
{
- ArtifactFactory factory = (ArtifactFactory) container.lookup( ArtifactFactory.class );
+ ArtifactFactory factory = container.lookup( ArtifactFactory.class );
assertNotNull( factory );