Adding resolved flag to Artifact.

This is done to counter the possibility that an artifact's file is set without the artifact actually being resolved, as in the case where the artifact is a snapshot version, but no snapshot-enabled repositories exist (think plugin resolution). This also has the beneficial side-effect of providing a more intuitive method of checking whether an artifact has been resolved (rather than artifact.getFile() != null).


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

maven-artifact-manager/pom.xml

@@ -22,6 +22,11 @@
       <artifactId>plexus-container-default</artifactId>
       <version>1.0-alpha-4</version>
     </dependency>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.0.2-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-provider-api</artifactId>

maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java

@@ -244,6 +244,8 @@ public void getArtifact( Artifact artifact, ArtifactRepository repository )
         if ( policy.isEnabled() )
         {
             getRemoteFile( repository, artifact.getFile(), remotePath, downloadMonitor, policy.getChecksumPolicy() );
+            
+            artifact.setResolved( true );
         }
         else
         {

maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java

@@ -114,6 +114,11 @@ private void resolve( Artifact artifact, List remoteRepositories, ArtifactReposi
                     {
                         wagonManager.getArtifact( artifact, remoteRepositories );
                     }
+                    
+                    if ( !artifact.isResolved() )
+                    {
+                        throw new ArtifactResolutionException( "Failed to resolve artifact, possibly due to a repository list that is not appropriately equipped for this artifact's metadata.", artifact, remoteRepositories );
+                    }
 
                     // must be after the artifact is downloaded
                     for ( Iterator i = artifact.getMetadataList().iterator(); i.hasNext(); )
@@ -135,6 +140,11 @@ private void resolve( Artifact artifact, List remoteRepositories, ArtifactReposi
                     throw new ArtifactResolutionException( e.getMessage(), artifact, remoteRepositories, e );
                 }
             }
+            else if ( destination.exists() )
+            {
+                // locally resolved...no need to hit the remote repo.
+                artifact.setResolved( true );
+            }
         }
     }
 

maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java

@@ -128,5 +128,9 @@ public interface Artifact
     void setArtifactId( String artifactId );
 
     boolean isSnapshot();
+    
+    void setResolved( boolean resolved );
+    
+    boolean isResolved();
 
 }

maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java

@@ -72,6 +72,8 @@ public class DefaultArtifact
 
     private VersionRange versionRange;
 
+    private boolean resolved = false;
+
     public DefaultArtifact( String groupId, String artifactId, VersionRange versionRange, String scope, String type,
                             String classifier, ArtifactHandler artifactHandler )
     {
@@ -436,4 +438,14 @@ public boolean isSnapshot()
         }
     }
 
+    public void setResolved( boolean resolved )
+    {
+        this.resolved = resolved;
+    }
+
+    public boolean isResolved()
+    {
+        return resolved;
+    }
+
 }

maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java

@@ -150,6 +150,12 @@ public ArtifactResolutionException( String message, Artifact artifact, List remo
               remoteRepositories, artifact.getDownloadUrl(), artifact.getDependencyTrail(), t );
     }
 
+    public ArtifactResolutionException( String message, Artifact artifact, List remoteRepositories )
+    {
+        this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(),
+              remoteRepositories, artifact.getDownloadUrl(), artifact.getDependencyTrail() );
+    }
+
     public ArtifactResolutionException( String message, Artifact artifact )
     {
         this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(), null,

maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java

@@ -220,4 +220,14 @@ public int compareTo( Object o )
     {
         return artifact.compareTo( o );
     }
+
+    public void setResolved( boolean resolved )
+    {
+        artifact.setResolved( resolved );
+    }
+
+    public boolean isResolved()
+    {
+        return artifact.isResolved();
+    }
 }