You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/09/15 02:03:37 UTC

svn commit: r695312 - in /maven/sandbox/trunk/mercury: mercury-external/src/main/java/org/apache/maven/mercury/builder/api/ mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mer...

Author: ogusakov
Date: Sun Sep 14 17:03:36 2008
New Revision: 695312

URL: http://svn.apache.org/viewvc?rev=695312&view=rev
Log:
renamed MetadataProcessor to DependencyProcessor as this is what it actually does

Added:
    maven/sandbox/trunk/mercury/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java   (contents, props changed)
      - copied, changed from r694493, maven/sandbox/trunk/mercury/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/MetadataProcessor.java
Removed:
    maven/sandbox/trunk/mercury/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/MetadataProcessor.java
Modified:
    maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java
    maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
    maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
    maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReader.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReaderFactory.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Factory.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2Factory.java
    maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java

Copied: maven/sandbox/trunk/mercury/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java (from r694493, maven/sandbox/trunk/mercury/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/MetadataProcessor.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java?p2=maven/sandbox/trunk/mercury/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java&p1=maven/sandbox/trunk/mercury/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/MetadataProcessor.java&r1=694493&r2=695312&rev=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/MetadataProcessor.java (original)
+++ maven/sandbox/trunk/mercury/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java Sun Sep 14 17:03:36 2008
@@ -5,7 +5,7 @@
 
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
 
-public interface MetadataProcessor
+public interface DependencyProcessor
 {
     List<ArtifactBasicMetadata> getDependencies( ArtifactBasicMetadata bmd, MetadataReader mdReader, Hashtable env )
     throws MetadataReaderException;

Propchange: maven/sandbox/trunk/mercury/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java (original)
+++ maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java Sun Sep 14 17:03:36 2008
@@ -8,7 +8,7 @@
 import org.apache.maven.mercury.artifact.Artifact;
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
 import org.apache.maven.mercury.artifact.QualityRange;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
 import org.apache.maven.mercury.crypto.api.StreamVerifierException;
 import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
@@ -32,7 +32,7 @@
 extends TestCase
 {
   Repository repo;
-  MetadataProcessor mdProcessor;
+  DependencyProcessor mdProcessor;
   RepositoryReader reader;
   List<ArtifactBasicMetadata> query;
   

Modified: maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java (original)
+++ maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java Sun Sep 14 17:03:36 2008
@@ -14,7 +14,7 @@
 import org.apache.maven.mercury.artifact.Artifact;
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
 import org.apache.maven.mercury.artifact.DefaultArtifact;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
 import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
 import org.apache.maven.mercury.crypto.pgp.PgpStreamVerifierFactory;
@@ -47,7 +47,7 @@
   
   File targetDirectory; 
   
-  MetadataProcessor mdProcessor;
+  DependencyProcessor mdProcessor;
   
   RepositoryReader reader;
   RepositoryWriter writer;

Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java Sun Sep 14 17:03:36 2008
@@ -10,7 +10,7 @@
 import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
 import org.apache.maven.mercury.artifact.api.ArtifactListProcessor;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.metadata.sat.DefaultSatSolver;
 import org.apache.maven.mercury.metadata.sat.SatException;
 import org.apache.maven.mercury.repository.api.ArtifactBasicResults;
@@ -56,7 +56,7 @@
       , List<Comparator<MetadataTreeNode>> comparators
       , Map<String,ArtifactListProcessor> processors
       , List<Repository> repositories
-      , MetadataProcessor processor
+      , DependencyProcessor processor
                      )
   throws RepositoryException
   {

Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java Sun Sep 14 17:03:36 2008
@@ -8,7 +8,7 @@
 
 import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.repository.api.Repository;
 import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
 import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
@@ -32,7 +32,7 @@
   DependencyTreeBuilder mt;
   LocalRepositoryM2 localRepo;
   List<Repository> reps;
-  MetadataProcessor processor;
+  DependencyProcessor processor;
   
   //----------------------------------------------------------------------------------------------
   @Override

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java Sun Sep 14 17:03:36 2008
@@ -1,7 +1,7 @@
 package org.apache.maven.mercury.repository.api;
 
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.builder.api.MetadataReader;
 import org.apache.maven.mercury.builder.api.MetadataReaderException;
 
@@ -16,14 +16,14 @@
 public abstract class AbstracRepositoryReader
 implements RepositoryReader, MetadataReader
 {
-  protected MetadataProcessor _mdProcessor;
+  protected DependencyProcessor _mdProcessor;
   
-  public void setMetadataProcessor( MetadataProcessor mdProcessor )
+  public void setMetadataProcessor( DependencyProcessor mdProcessor )
   {
     _mdProcessor = mdProcessor;
   }
   
-  public MetadataProcessor getMetadataProcessor()
+  public DependencyProcessor getMetadataProcessor()
   {
     return _mdProcessor;
   }

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepository.java Sun Sep 14 17:03:36 2008
@@ -6,7 +6,7 @@
 
 import org.apache.maven.mercury.artifact.Quality;
 import org.apache.maven.mercury.artifact.QualityRange;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.transport.api.Server;
 import org.codehaus.plexus.i18n.DefaultLanguage;
 import org.codehaus.plexus.i18n.Language;
@@ -161,7 +161,7 @@
     writerRegistry.remove( type );
   }
   //---------------------------------------------------------------------------
-  public static RepositoryReader getReader( String type, Repository repo, MetadataProcessor mdProcessor )
+  public static RepositoryReader getReader( String type, Repository repo, DependencyProcessor mdProcessor )
   throws IllegalArgumentException, RepositoryException
   {
     if( type == null || type.length() < 1 )

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/Repository.java Sun Sep 14 17:03:36 2008
@@ -2,7 +2,7 @@
 
 import org.apache.maven.mercury.artifact.Quality;
 import org.apache.maven.mercury.artifact.QualityRange;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.transport.api.Server;
 
 
@@ -80,7 +80,7 @@
      * @return default reader or null, if none exists
      * @throws RepositoryException 
      */
-    RepositoryReader getReader( MetadataProcessor processor )
+    RepositoryReader getReader( DependencyProcessor processor )
     throws RepositoryException;
     
     /**
@@ -89,7 +89,7 @@
      * @return reader instance for the specified protocol
      * @throws NonExistentProtocolException if protocol not supported
      */
-    RepositoryReader getReader( MetadataProcessor processor, String protocol )
+    RepositoryReader getReader( DependencyProcessor processor, String protocol )
     throws RepositoryException;
 
     

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReader.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReader.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReader.java Sun Sep 14 17:03:36 2008
@@ -3,7 +3,7 @@
 import java.util.List;
 
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.builder.api.MetadataReader;
 import org.apache.maven.mercury.builder.api.MetadataReaderException;
 
@@ -64,8 +64,8 @@
   /**
    * Need if to trick circular dependency on maven-project, projectBuilder hides behind this processor
    */
-  public void setMetadataProcessor( MetadataProcessor mdProcessor );
-  public MetadataProcessor getMetadataProcessor();
+  public void setMetadataProcessor( DependencyProcessor mdProcessor );
+  public DependencyProcessor getMetadataProcessor();
   
   /**
    * read content pointed by relative path. It will return content bytes

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReaderFactory.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReaderFactory.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReaderFactory.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReaderFactory.java Sun Sep 14 17:03:36 2008
@@ -1,9 +1,9 @@
 package org.apache.maven.mercury.repository.api;
 
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 
 public interface RepositoryReaderFactory
 {
-  public RepositoryReader getReader( Repository repo, MetadataProcessor mdProcessor )
+  public RepositoryReader getReader( Repository repo, DependencyProcessor mdProcessor )
   throws RepositoryException;
 }

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java Sun Sep 14 17:03:36 2008
@@ -8,7 +8,7 @@
 import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.apache.maven.mercury.artifact.api.ArtifactListProcessor;
 import org.apache.maven.mercury.artifact.api.ArtifactListProcessorException;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.builder.api.MetadataReader;
 import org.apache.maven.mercury.builder.api.MetadataReaderException;
 
@@ -30,7 +30,7 @@
 
   private LocalRepository       _localRepository;
   
-  private MetadataProcessor     _processor;
+  private DependencyProcessor     _processor;
 
   private Map<String,ArtifactListProcessor>   _processors;
   
@@ -39,7 +39,7 @@
   public VirtualRepositoryReader(
                   LocalRepository localRepository
                 , List<RemoteRepository> remoteRepositories
-                , MetadataProcessor processor
+                , DependencyProcessor processor
                           )
   throws RepositoryException
   {
@@ -58,7 +58,7 @@
       this._repositories.addAll( remoteRepositories );
   }
   //----------------------------------------------------------------------------------------------------------------------------
-  public VirtualRepositoryReader( List<Repository> repositories, MetadataProcessor processor  )
+  public VirtualRepositoryReader( List<Repository> repositories, DependencyProcessor processor  )
   throws RepositoryException
   {
     if( processor == null )

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2.java Sun Sep 14 17:03:36 2008
@@ -2,7 +2,7 @@
 
 import java.io.File;
 
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.repository.api.AbstractRepository;
 import org.apache.maven.mercury.repository.api.LocalRepository;
 import org.apache.maven.mercury.repository.api.NonExistentProtocolException;
@@ -46,7 +46,7 @@
         return directory;
     }
     //----------------------------------------------------------------------------------
-    public RepositoryReader getReader( MetadataProcessor processor ) 
+    public RepositoryReader getReader( DependencyProcessor processor ) 
     {
       if( reader == null )
         reader = new LocalRepositoryReaderM2( this, processor );
@@ -55,7 +55,7 @@
     }
     //----------------------------------------------------------------------------------
     // TODO oleg: what happens in multi-threaded execution?? 
-    public RepositoryReader getReader( MetadataProcessor processor, String protocol )
+    public RepositoryReader getReader( DependencyProcessor processor, String protocol )
     {
        return getReader(processor);
     }

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java Sun Sep 14 17:03:36 2008
@@ -14,7 +14,7 @@
 import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
 import org.apache.maven.mercury.artifact.version.VersionException;
 import org.apache.maven.mercury.artifact.version.VersionRange;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.builder.api.MetadataReader;
 import org.apache.maven.mercury.builder.api.MetadataReaderException;
 import org.apache.maven.mercury.crypto.api.StreamObserverException;
@@ -46,7 +46,7 @@
   LocalRepository _repo;
   File _repoDir;
   //---------------------------------------------------------------------------------------------------------------
-  public LocalRepositoryReaderM2( LocalRepository repo, MetadataProcessor mdProcessor )
+  public LocalRepositoryReaderM2( LocalRepository repo, DependencyProcessor mdProcessor )
   {
     if( repo == null )
       throw new IllegalArgumentException("localRepo cannot be null");

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Factory.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Factory.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Factory.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Factory.java Sun Sep 14 17:03:36 2008
@@ -1,6 +1,6 @@
 package org.apache.maven.mercury.repository.local.m2;
 
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.repository.api.AbstractRepository;
 import org.apache.maven.mercury.repository.api.LocalRepository;
 import org.apache.maven.mercury.repository.api.Repository;
@@ -21,7 +21,7 @@
     AbstractRepository.register( AbstractRepository.DEFAULT_REPOSITORY_TYPE, factory  );
   }
   
-  public RepositoryReader getReader( Repository repo, MetadataProcessor mdProcessor)
+  public RepositoryReader getReader( Repository repo, DependencyProcessor mdProcessor)
   throws RepositoryException
   {
     if( repo == null || !(repo instanceof LocalRepository) )

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java Sun Sep 14 17:03:36 2008
@@ -8,7 +8,7 @@
 
 import org.apache.commons.digester.Digester;
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.builder.api.MetadataReader;
 import org.apache.maven.mercury.builder.api.MetadataReaderException;
 import org.xml.sax.SAXException;
@@ -22,7 +22,7 @@
  *
  */
 public class MetadataProcessorMock
-implements MetadataProcessor
+implements DependencyProcessor
 {
 
   public List<ArtifactBasicMetadata> getDependencies( ArtifactBasicMetadata bmd, MetadataReader mdReader, Hashtable env )

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryM2.java Sun Sep 14 17:03:36 2008
@@ -1,6 +1,6 @@
 package org.apache.maven.mercury.repository.remote.m2;
 
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.repository.api.AbstractRepository;
 import org.apache.maven.mercury.repository.api.LocalRepository;
 import org.apache.maven.mercury.repository.api.NonExistentProtocolException;
@@ -28,13 +28,13 @@
         return _server;
     }
     //----------------------------------------------------------------------------------
-    public RepositoryReader getReader( MetadataProcessor processor )
+    public RepositoryReader getReader( DependencyProcessor processor )
     throws RepositoryException
     {
       return new RemoteRepositoryReaderM2( this, processor );
     }
     //----------------------------------------------------------------------------------
-    public RepositoryReader getReader( MetadataProcessor processor, String protocol )
+    public RepositoryReader getReader( DependencyProcessor processor, String protocol )
     throws RepositoryException
     {
       return getReader(processor);

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java Sun Sep 14 17:03:36 2008
@@ -17,7 +17,7 @@
 import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
 import org.apache.maven.mercury.artifact.version.VersionException;
 import org.apache.maven.mercury.artifact.version.VersionRange;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.builder.api.MetadataReader;
 import org.apache.maven.mercury.builder.api.MetadataReaderException;
 import org.apache.maven.mercury.repository.api.AbstracRepositoryReader;
@@ -72,13 +72,13 @@
   List<LocalRepository> _localRepos;
   File _defaultRoot;
   //---------------------------------------------------------------------------------------------------------------
-  public RemoteRepositoryReaderM2( RemoteRepository repo, MetadataProcessor mdProcessor )
+  public RemoteRepositoryReaderM2( RemoteRepository repo, DependencyProcessor mdProcessor )
   throws RepositoryException
   {
     this( repo, mdProcessor, null );
   }
   //---------------------------------------------------------------------------------------------------------------
-  public RemoteRepositoryReaderM2( RemoteRepository repo, MetadataProcessor mdProcessor, List<LocalRepository> localRepos )
+  public RemoteRepositoryReaderM2( RemoteRepository repo, DependencyProcessor mdProcessor, List<LocalRepository> localRepos )
   throws RepositoryException
   {
     if( repo == null )

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2Factory.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2Factory.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2Factory.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2Factory.java Sun Sep 14 17:03:36 2008
@@ -1,6 +1,6 @@
 package org.apache.maven.mercury.repository.remote.m2;
 
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.repository.api.AbstractRepository;
 import org.apache.maven.mercury.repository.api.RemoteRepository;
 import org.apache.maven.mercury.repository.api.Repository;
@@ -21,7 +21,7 @@
     AbstractRepository.register( AbstractRepository.DEFAULT_REPOSITORY_TYPE, factory  );
   }
   
-  public RepositoryReader getReader( Repository repo, MetadataProcessor mdProcessor )
+  public RepositoryReader getReader( Repository repo, DependencyProcessor mdProcessor )
   throws RepositoryException
   {
     if( repo == null || !(repo instanceof RemoteRepository) )

Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java?rev=695312&r1=695311&r2=695312&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java Sun Sep 14 17:03:36 2008
@@ -16,7 +16,7 @@
 import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
 import org.apache.maven.mercury.artifact.Quality;
 import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
-import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.builder.api.MetadataReader;
 import org.apache.maven.mercury.builder.api.MetadataReaderException;
 import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
@@ -75,7 +75,7 @@
     _repo = repo;
     
     _reader = _repo.getReader( 
-        new MetadataProcessor() {
+        new DependencyProcessor() {
 
       public List<ArtifactBasicMetadata> getDependencies( ArtifactBasicMetadata bmd, MetadataReader mdReader, Hashtable env )
       throws MetadataReaderException