From da10710224904e68427877522c1b4b42f06e66c4 Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Thu, 31 May 2007 17:42:47 +0000 Subject: [PATCH] it0114 worked for me on the last run. Seems I had an updating issue for the bootstrap, since my M2_HOME was pointing at a linked directory, not a real one (ant's delete task doesn't like that, apparently). git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543190 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/plugin/DefaultPluginManager.java | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index f31b94c7d4..f18d04e5bb 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -384,26 +384,11 @@ public class DefaultPluginManager // POM), we need to undo this somehow. ClassRealm pluginRealm = container.getComponentRealm( projectPlugin.getKey() ); - getLogger().debug( "Realm for " + projectPlugin.getKey() + " is: " + pluginRealm ); - if ( ( pluginRealm != null ) && ( pluginRealm != container.getContainerRealm() ) ) { getLogger().debug( "Realm already exists for: " + projectPlugin.getKey() + ". Skipping addition..." ); // we've already discovered this plugin, and configured it, so skip it this time. -// StringBuffer debugMessage = new StringBuffer(); -// debugMessage.append( "Realm for plugin: " ).append( projectPlugin.getKey() ); -// debugMessage.append( " with classpath:\n" ).append( String.valueOf( Arrays.asList( pluginRealm.getURLs() ) ).replace( ',', '\n' ) ); -// debugMessage.append( "\nClass realm is: " ) -// .append( pluginRealm.getId() ) -// .append( " with parent: " ) -// .append( pluginRealm.getParentRealm().getId() ); -// debugMessage.append( "\nParent classpath:\n" ) -// .append( -// String.valueOf( Arrays.asList( pluginRealm.getParentRealm().getURLs() ) ) -// .replace( ',', '\n' ) ); -// getLogger().debug( debugMessage.toString() ); - return; } @@ -433,19 +418,6 @@ public class DefaultPluginManager // adding for MNG-3012 to try to work around problems with Xpp3Dom (from plexus-utils) // spawning a ClassCastException when a mojo calls plugin.getConfiguration() from maven-model... componentRealm.importFrom( componentRealm.getParentRealm().getId(), Xpp3Dom.class.getName() ); - -// StringBuffer debugMessage = new StringBuffer(); -// debugMessage.append( "Creating realm for plugin: " ).append( projectPlugin.getKey() ); -// debugMessage.append( " with classpath:\n" ).append( String.valueOf( jars ).replace( ',', '\n' ) ); -// debugMessage.append( "\nClass realm is: " ) -// .append( componentRealm.getId() ) -// .append( " with parent: " ) -// .append( componentRealm.getParentRealm().getId() ); -// debugMessage.append( "\nParent classpath:\n" ) -// .append( -// String.valueOf( Arrays.asList( componentRealm.getParentRealm().getURLs() ) ) -// .replace( ',', '\n' ) ); -// getLogger().debug( debugMessage.toString() ); } catch ( PlexusContainerException e ) {