add repository base to artifact files, they are expected to be absolute

git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@367176 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java b/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
index fdc9b7643f322ff05cc8bf9b3db8922211cb7648..ffb8cdcd4c4e704ac6846d70c1921065c11652f6 100644 (file)
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
+++ b/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/DefaultArtifactDiscoverer.java
@@ -31,14 +31,15 @@ import java.util.StringTokenizer;
  *
  * @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 @@ public class DefaultArtifactDiscoverer
         {
             String path = artifactPaths[i];
 
-            Artifact artifact = buildArtifact( path );
+            Artifact artifact = buildArtifact( repositoryBase, path );
 
             if ( artifact != null )
             {
@@ -65,7 +66,7 @@ public class DefaultArtifactDiscoverer
         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 @@ public class DefaultArtifactDiscoverer
 
         if ( finalResult != null )
         {
-            finalResult.setFile( new File( path ) );
+            finalResult.setFile( new File( repositoryBase, path ) );
         }
 
         return finalResult;

diff --git a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java b/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
index 25929bf081c07a07693a2da36a0e3d72db752fc9..40b1d22a08ed7f93aabe71d15c224fbfc5e68009 100644 (file)
--- a/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
+++ b/maven-repository-discovery/src/main/java/org/apache/maven/repository/discovery/LegacyArtifactDiscoverer.java
@@ -53,7 +53,7 @@ public class LegacyArtifactDiscoverer
         {
             String path = artifactPaths[i];
 
-            Artifact artifact = buildArtifact( path );
+            Artifact artifact = buildArtifact( repositoryBase, path );
             if ( artifact != null )
             {
                 if ( includeSnapshots || !artifact.isSnapshot() )
@@ -69,7 +69,7 @@ public class LegacyArtifactDiscoverer
     /**
      * @noinspection CollectionDeclaredAsConcreteClass
      */
-    private Artifact buildArtifact( String path )
+    private Artifact buildArtifact( File repositoryBase, String path )
     {
         StringTokenizer tokens = new StringTokenizer( path, "/\\" );
 
@@ -326,7 +326,7 @@ public class LegacyArtifactDiscoverer
                                                                      Artifact.SCOPE_RUNTIME, type );
                         }
 
-                        result.setFile( new File( path ) );
+                        result.setFile( new File( repositoryBase, path ) );
                     }
                 }
             }