svn commit: r712855 - in /maven/mercury/trunk/mercury-plexus/src: main/java/org/apache/maven/mercury/plexus/ test/java/org/apache/maven/mercury/plexus/

[jvanzyl]

Author: jvanzyl
Date: Mon Nov 10 14:20:21 2008
New Revision: 712855

URL: http://svn.apache.org/viewvc?rev=712855&view=rev
Log:
o making changes to the API

Modified:
    
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
    
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
    
maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java

Modified: 
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
URL: 
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java?rev=712855&r1=712854&r2=712855&view=diff
==============================================================================
--- 
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
 (original)
+++ 
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
 Mon Nov 10 14:20:21 2008
@@ -158,7 +158,7 @@
     
   }
   //---------------------------------------------------------------
-  public List<Artifact> read( List<Repository> repos, 
List<ArtifactBasicMetadata> artifacts )
+  public List<Artifact> read( List<Repository> repos, List<ArtifactMetadata> 
artifacts )
   throws RepositoryException
   {
     if( Util.isEmpty( repos ) )
@@ -182,7 +182,7 @@
     return al;
     
   }
-  public List<Artifact> read( List<Repository> repo, ArtifactBasicMetadata... 
artifacts )
+  public List<Artifact> read( List<Repository> repo, ArtifactMetadata... 
artifacts )
       throws RepositoryException
   {
     return read( repo, Arrays.asList( artifacts ) );
@@ -214,6 +214,14 @@
         , secRing , keyId, keyPass
                                       );
   }
+  
+  public List<ArtifactMetadata> resolve( List<Repository> repos, 
ArtifactScopeEnum scope, ArtifactMetadata metadata )
+      throws RepositoryException  
+  {
+    return resolve( repos, scope, new ArtifactQueryList( metadata ), null, 
null );
+      
+  }
+  
   //---------------------------------------------------------------
   public List<ArtifactMetadata> resolve( List<Repository> repos
                                         , ArtifactScopeEnum   scope

Modified: 
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
URL: 
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java?rev=712855&r1=712854&r2=712855&view=diff
==============================================================================
--- 
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
 (original)
+++ 
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
 Mon Nov 10 14:20:21 2008
@@ -137,9 +137,9 @@
    * @return
    * @throws PlexusMercuryException
    */
-  public List<Artifact> read( List<Repository> repo, 
List<ArtifactBasicMetadata> artifacts )
+  public List<Artifact> read( List<Repository> repo, List<ArtifactMetadata> 
artifacts )
   throws RepositoryException;
-  public List<Artifact> read( List<Repository> repo, ArtifactBasicMetadata... 
artifacts )
+  public List<Artifact> read( List<Repository> repo, ArtifactMetadata... 
artifacts )
   throws RepositoryException;
 
   /**
@@ -160,4 +160,8 @@
                                       , ArtifactExclusionList exclusions
                                       )
   throws RepositoryException;
+  
+  public List<ArtifactMetadata> resolve( List<Repository> repos, 
ArtifactScopeEnum scope, ArtifactMetadata metadata )
+  throws RepositoryException;  
+  
 }

Modified: 
maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: 
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=712855&r1=712854&r2=712855&view=diff
==============================================================================
--- 
maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
 (original)
+++ 
maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
 Mon Nov 10 14:20:21 2008
@@ -150,7 +150,7 @@
   public void testRead()
   throws RepositoryException
   {
-    ArtifactBasicMetadata bmd = new ArtifactBasicMetadata(artifactCoord);
+    ArtifactMetadata bmd = new ArtifactMetadata(artifactCoord);
     
     Collection<Artifact> res = pm.read( repos, bmd );