svn commit: r834908 - in /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven: artifact/resolver/ArtifactCollector.java repository/legacy/resolver/DefaultLegacyArtifactCollector.java

[bentmann]

Author: bentmann
Date: Wed Nov 11 15:26:46 2009
New Revision: 834908

URL: http://svn.apache.org/viewvc?rev=834908&view=rev
Log:
o Restored backward-compat

Modified:
    
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
    
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java

Modified: 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java?rev=834908&r1=834907&r2=834908&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
 (original)
+++ 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
 Wed Nov 11 15:26:46 2009
@@ -19,8 +19,24 @@
  * under the License.
  */
 
+import java.util.List;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+
 @Deprecated
 public interface ArtifactCollector
     extends org.apache.maven.repository.legacy.resolver.LegacyArtifactCollector
 {
+
+    @Deprecated
+    ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact 
originatingArtifact,
+                                      ArtifactRepository localRepository, 
List<ArtifactRepository> remoteRepositories,
+                                      ArtifactMetadataSource source, 
ArtifactFilter filter,
+                                      List<ResolutionListener> listeners )
+        throws ArtifactResolutionException;
+
 }

Modified: 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java?rev=834908&r1=834907&r2=834908&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
 (original)
+++ 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
 Wed Nov 11 15:26:46 2009
@@ -32,8 +32,6 @@
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.metadata.ResolutionGroup;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
-import org.apache.maven.artifact.repository.RepositoryRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
@@ -773,4 +771,14 @@
                         filter, listeners, null );
     }
 
+    public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact 
originatingArtifact,
+                                             ArtifactRepository 
localRepository,
+                                             List<ArtifactRepository> 
remoteRepositories,
+                                             ArtifactMetadataSource source, 
ArtifactFilter filter,
+                                             List<ResolutionListener> 
listeners )
+    {
+        return collect( artifacts, originatingArtifact, null, localRepository, 
remoteRepositories, source, filter,
+                        listeners );
+    }
+
 }