svn commit: r689259 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java

[jd...@apache.org]

Author: jdcasey
Date: Tue Aug 26 15:06:10 2008
New Revision: 689259

URL: http://svn.apache.org/viewvc?rev=689259&view=rev
Log:
Removing complex artifact-resolver lookup, since this is no longer used in any maven versions.

Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?rev=689259&r1=689258&r2=689259&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java Tue Aug 26 15:06:10 2008
@@ -19,6 +19,15 @@
  * under the License.
  */
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -39,26 +48,10 @@
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.project.artifact.MavenMetadataSource;
 import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.util.StringUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * @plexus.component role="org.apache.maven.plugin.assembly.artifact.DependencyResolver" role-hint="default"
  *
@@ -66,17 +59,12 @@
  * @version $Id$
  */
 public class DefaultDependencyResolver
-    extends AbstractLogEnabled implements DependencyResolver, Contextualizable
+    extends AbstractLogEnabled implements DependencyResolver
 {
 
-    private static final String[] PREFERRED_RESOLVER_HINTS = {
-      "project-cache-aware", // Provided in Maven 2.1-SNAPSHOT
-      "default"
-    };
-
-    // Commenting this out as a component requirement, so we can look for the new
-    // resolver in maven 2.1-snapshot, then fail back to the default one.
-//     * @plexus.requirement
+    /**
+     * @plexus.requirement
+     */
     private ArtifactResolver resolver;
 
     /**
@@ -266,42 +254,4 @@
         return map;
     }
 
-    public void contextualize( Context context )
-        throws ContextException
-    {
-        PlexusContainer container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
-
-        for ( int i = 0; i < PREFERRED_RESOLVER_HINTS.length; i++ )
-        {
-            String hint = PREFERRED_RESOLVER_HINTS[i];
-
-            try
-            {
-                resolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE, hint );
-                break;
-            }
-            catch ( ComponentLookupException e )
-            {
-                getLogger().debug( "Cannot find ArtifactResolver with hint: " + hint, e );
-            }
-        }
-
-        if ( resolver == null )
-        {
-            try
-            {
-                resolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE );
-            }
-            catch ( ComponentLookupException e )
-            {
-                getLogger().debug( "Cannot find ArtifactResolver with no hint.", e );
-            }
-        }
-
-        if ( resolver == null )
-        {
-            throw new ContextException( "Failed to lookup a valid ArtifactResolver implementation. Tried hints:\n"
-                                        + Arrays.asList( PREFERRED_RESOLVER_HINTS ) );
-        }
-    }
 }