From 3045b7fcfc7682b7ffab24da35f045115ce13117 Mon Sep 17 00:00:00 2001
From: Trygve Laugstol <trygvis@apache.org>
Date: Thu, 7 Oct 2004 10:00:55 +0000
Subject: [PATCH] o Better error reporting.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163187 13f79535-47bb-0310-9956-ffa450edef68
---
 .../maven/artifact/MavenMetadataSource.java   | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
index 143ac51eca..17a6957266 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
@@ -1,19 +1,20 @@
 package org.apache.maven.artifact;
 
-import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-
 import java.io.FileReader;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
  *
@@ -61,22 +62,26 @@ public Set retrieve( Artifact artifact )
     {
         Set artifacts;
 
+        Artifact metadataArtifact = new DefaultArtifact( artifact.getGroupId(),
+                                                         artifact.getArtifactId(),
+                                                         artifact.getVersion(),
+                                                         "pom" );
+
         try
         {
-            Artifact metadataArtifact = new DefaultArtifact( artifact.getGroupId(),
-                                                             artifact.getArtifactId(),
-                                                             artifact.getVersion(),
-                                                             "pom" );
-
             artifactResolver.resolve( metadataArtifact, remoteRepositories, localRepository );
 
             Model model = reader.read( new FileReader( metadataArtifact.getFile() ) );
 
             artifacts = createArtifacts( model.getDependencies(), localRepository );
         }
+        catch ( ArtifactResolutionException e )
+        {
+            throw new ArtifactMetadataRetrievalException( "Error while resolving metadata artifact", e );
+        }
         catch ( Exception e )
         {
-            throw new ArtifactMetadataRetrievalException( "Cannot read artifact source: ", e );
+            throw new ArtifactMetadataRetrievalException( "Cannot read artifact source: " + metadataArtifact.getFile(), e );
         }
 
         return artifacts;