You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/05/31 19:42:47 UTC
svn commit: r543190 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: jdcasey
Date: Thu May 31 10:42:47 2007
New Revision: 543190
URL: http://svn.apache.org/viewvc?view=rev&rev=543190
Log:
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).
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.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?view=diff&rev=543190&r1=543189&r2=543190
==============================================================================
--- 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 Thu May 31 10:42:47 2007
@@ -384,26 +384,11 @@
// 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 @@
// 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 )
{