svn commit: r367176 - in /maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery: DefaultArtifactDiscoverer.java LegacyArtifactDiscoverer.java

[brett]

Author: brett
Date: Sun Jan  8 19:32:02 2006
New Revision: 367176

URL: http://svn.apache.org/viewcvs?rev=367176&view=rev
Log:
add repository base to artifact files, they are expected to be absolute

Modified:
    
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
    
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java

Modified: 
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
URL: 
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java?rev=367176&r1=367175&r2=367176&view=diff
==============================================================================
--- 
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
 (original)
+++ 
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
 Sun Jan  8 19:32:02 2006
@@ -31,14 +31,15 @@
  *
  * @author John Casey
  * @author Brett Porter
- *
  * @plexus.component 
role="org.apache.maven.repository.discovery.ArtifactDiscoverer" 
role-hint="default" instantiation-strategy="per-lookup"
  */
 public class DefaultArtifactDiscoverer
     extends AbstractArtifactDiscoverer
     implements ArtifactDiscoverer
 {
-    /** @plexus.requirement */
+    /**
+     * @plexus.requirement
+     */
     private ArtifactFactory artifactFactory;
 
     public List discoverArtifacts( File repositoryBase, String 
blacklistedPatterns, boolean includeSnapshots )
@@ -51,7 +52,7 @@
         {
             String path = artifactPaths[i];
 
-            Artifact artifact = buildArtifact( path );
+            Artifact artifact = buildArtifact( repositoryBase, path );
 
             if ( artifact != null )
             {
@@ -65,7 +66,7 @@
         return artifacts;
     }
 
-    private Artifact buildArtifact( String path )
+    private Artifact buildArtifact( File repositoryBase, String path )
     {
         List pathParts = new ArrayList();
         StringTokenizer st = new StringTokenizer( path, "/\\" );
@@ -215,7 +216,7 @@
 
         if ( finalResult != null )
         {
-            finalResult.setFile( new File( path ) );
+            finalResult.setFile( new File( repositoryBase, path ) );
         }
 
         return finalResult;

Modified: 
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
URL: 
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java?rev=367176&r1=367175&r2=367176&view=diff
==============================================================================
--- 
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
 (original)
+++ 
maven/repository-manager/trunk/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
 Sun Jan  8 19:32:02 2006
@@ -53,7 +53,7 @@
         {
             String path = artifactPaths[i];
 
-            Artifact artifact = buildArtifact( path );
+            Artifact artifact = buildArtifact( repositoryBase, path );
             if ( artifact != null )
             {
                 if ( includeSnapshots || !artifact.isSnapshot() )
@@ -69,7 +69,7 @@
     /**
      * @noinspection CollectionDeclaredAsConcreteClass
      */
-    private Artifact buildArtifact( String path )
+    private Artifact buildArtifact( File repositoryBase, String path )
     {
         StringTokenizer tokens = new StringTokenizer( path, "/\\" );
 
@@ -326,7 +326,7 @@
                                                                      
Artifact.SCOPE_RUNTIME, type );
                         }
 
-                        result.setFile( new File( path ) );
+                        result.setFile( new File( repositoryBase, path ) );
                     }
                 }
             }