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 2009/05/01 00:30:10 UTC
svn commit: r770474 -
/maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
Author: jdcasey
Date: Thu Apr 30 22:30:10 2009
New Revision: 770474
URL: http://svn.apache.org/viewvc?rev=770474&view=rev
Log:
Revert "[MNG-4133] Improve the error feedback for problems loading wagons from build extensions. Delay loading the actual wagons until they're needed, to prevent bringing down the whole build with an unloadable wagon that isn't going to be used."
This reverts commit b089f8c61b83743556f15fc26ae9daf538608f2e.
Modified:
maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
Modified: maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=770474&r1=770473&r2=770474&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java (original)
+++ maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java Thu Apr 30 22:30:10 2009
@@ -45,7 +45,6 @@
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
-import org.codehaus.plexus.component.repository.ComponentDescriptor;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
@@ -262,15 +261,21 @@
return child;
}
- @SuppressWarnings("unchecked")
public void registerWagons()
{
if ( extensionContainer != null )
{
- Map<String, ComponentDescriptor> wagons = extensionContainer.getComponentDescriptorMap( Wagon.ROLE );
-
- getLogger().debug( "Wagons to register: " + wagons.keySet() );
- wagonManager.registerWagons( wagons.keySet(), extensionContainer );
+ try
+ {
+ Map wagons = extensionContainer.lookupMap( Wagon.ROLE );
+ getLogger().debug( "Wagons to register: " + wagons.keySet() );
+ wagonManager.registerWagons( wagons.keySet(), extensionContainer );
+ }
+ catch ( ComponentLookupException e )
+ {
+ // no wagons found in the extension
+ getLogger().debug( "No wagons found in the extensions or other internal error: " + e.getMessage(), e );
+ }
}
else
{