svn commit: r1165843 - in /maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader: DefaultDownloader.java Downloader.java

[rfscholte]

Author: rfscholte
Date: Tue Sep  6 21:05:25 2011
New Revision: 1165843

URL: http://svn.apache.org/viewvc?rev=1165843&view=rev
Log:
Fix to support MRRESOURCES-55: Support groupId:artifactId:version:type and 
groupId:artifactId:version:type:classifier as resource bundle references
Patch contributed by Andrew Phillips, reviewed and adjusted by Robert Scholte

Modified:
    
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
    
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java

Modified: 
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java?rev=1165843&r1=1165842&r2=1165843&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
 (original)
+++ 
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/DefaultDownloader.java
 Tue Sep  6 21:05:25 2011
@@ -6,6 +6,7 @@ import org.apache.maven.artifact.reposit
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.versioning.VersionRange;
 
 import java.io.File;
 import java.util.List;
@@ -47,9 +48,31 @@ public class DefaultDownloader
         throws DownloadException, DownloadNotFoundException
 
     {
+        return download( groupId, artifactId, version, "jar", null, 
localRepository, remoteRepositories );
+    }
+    
+    public File download( String groupId,
+                          String artifactId,
+                          String version,
+                          String type,
+                          String classifier,
+                          ArtifactRepository localRepository,
+                          List/*<ArtifactRepository>*/ remoteRepositories )
+        throws DownloadException, DownloadNotFoundException
+
+    {
         Artifact artifact =
-            artifactFactory.createArtifact( groupId, artifactId, version, 
Artifact.SCOPE_RUNTIME, "jar" );
+            artifactFactory.createDependencyArtifact( groupId, artifactId, 
VersionRange.createFromVersion( version ), type, classifier, 
Artifact.SCOPE_RUNTIME );
 
+        return download( artifact, localRepository, remoteRepositories );
+    }
+    
+    private File download( Artifact artifact,
+                            ArtifactRepository localRepository,
+                            List/*<ArtifactRepository>*/ remoteRepositories )
+        throws DownloadException, DownloadNotFoundException
+        
+    {
         try
         {
             artifactResolver.resolve( artifact, remoteRepositories, 
localRepository );
@@ -63,6 +86,6 @@ public class DefaultDownloader
             throw new DownloadNotFoundException( "Requested download does not 
exist.", e );
         }
 
-        return artifact.getFile();
+        return artifact.getFile();    
     }
 }

Modified: 
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java?rev=1165843&r1=1165842&r2=1165843&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java
 (original)
+++ 
maven/shared/trunk/maven-downloader/src/main/java/org/apache/maven/shared/downloader/Downloader.java
 Tue Sep  6 21:05:25 2011
@@ -25,4 +25,13 @@ public interface Downloader
                           ArtifactRepository localRepository,
                           List remoteRepositories )
         throws DownloadException, DownloadNotFoundException;
+
+    public File download( String groupId,
+                          String artifactId,
+                          String version,
+                          String type,
+                          String classifier,
+                          ArtifactRepository localRepository,
+                          List remoteRepositories )
+        throws DownloadException, DownloadNotFoundException;
 }