PR: MNG-122

cleanup artifact metadata retrieval exceptions

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

maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java

@@ -118,8 +118,8 @@ public class DeployTask
         }
         catch ( ArtifactDeploymentException e )
         {
-            // TODO: deployment exception that does not give a trace
+            throw new BuildException(
-            throw new BuildException( "Error deploying artifact", e );
+                "Error deploying artifact '" + artifact.getDependencyConflictId() + "': " + e.getMessage(), e );
         }
     }
 

maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java

@@ -69,8 +69,8 @@ public class InstallTask
         }
         catch ( ArtifactInstallationException e )
         {
-            // TODO: install exception that does not give a trace
+            throw new BuildException(
-            throw new BuildException( "Error installing artifact", e );
+                "Error installing artifact '" + artifact.getDependencyConflictId() + "': " + e.getMessage(), e );
         }
     }
 

maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

@@ -440,7 +440,8 @@ public class DefaultPluginManager
     }
 
     public MavenReport getReport( MavenProject project, MojoExecution mojoExecution, MavenSession session )
-        throws ArtifactNotFoundException, PluginConfigurationException, PluginManagerException
+        throws ArtifactNotFoundException, PluginConfigurationException, PluginManagerException,
+        ArtifactResolutionException
     {
         MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
         PluginDescriptor descriptor = mojoDescriptor.getPluginDescriptor();
@@ -495,7 +496,8 @@ public class DefaultPluginManager
 
     private Mojo getConfiguredMojo( MavenSession session, Xpp3Dom dom, MavenProject project, boolean report,
                                     MojoExecution mojoExecution )
-        throws PluginConfigurationException, ArtifactNotFoundException, PluginManagerException
+        throws PluginConfigurationException, ArtifactNotFoundException, PluginManagerException,
+        ArtifactResolutionException
     {
         MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
 
@@ -570,7 +572,7 @@ public class DefaultPluginManager
 
     private void ensurePluginContainerIsComplete( PluginDescriptor pluginDescriptor, PlexusContainer pluginContainer,
                                                   MavenProject project, MavenSession session )
-        throws PluginConfigurationException, ArtifactNotFoundException
+        throws ArtifactNotFoundException, PluginManagerException, ArtifactResolutionException
     {
         // if the plugin's already been used once, don't re-do this step...
         // otherwise, we have to finish resolving the plugin's classpath and start the container.
@@ -578,12 +580,19 @@ public class DefaultPluginManager
         {
             Artifact pluginArtifact = (Artifact) pluginDescriptor.getArtifacts().get( 0 );
 
-            try
-            {
             ArtifactRepository localRepository = session.getLocalRepository();
 
-                ResolutionGroup resolutionGroup = artifactMetadataSource.retrieve( pluginArtifact, localRepository,
+            ResolutionGroup resolutionGroup;
+            try
+            {
+                resolutionGroup = artifactMetadataSource.retrieve( pluginArtifact, localRepository,
                                                                    project.getPluginArtifactRepositories() );
+            }
+            catch ( ArtifactMetadataRetrievalException e )
+            {
+                throw new ArtifactResolutionException( "Unable to download metadata from repository for plugin '" +
+                    pluginArtifact.getId() + "': " + e.getMessage(), pluginArtifact, e );
+            }
 
             Set dependencies = new HashSet( resolutionGroup.getArtifacts() );
 
@@ -605,8 +614,16 @@ public class DefaultPluginManager
                 {
                     artifact = project.replaceWithActiveArtifact( artifact );
 
+                    try
+                    {
                         pluginContainer.addJarResource( artifact.getFile() );
                     }
+                    catch ( PlexusContainerException e )
+                    {
+                        throw new PluginManagerException( "Error adding plugin dependency '" +
+                            artifact.getDependencyConflictId() + "' into plugin manager: " + e.getMessage(), e );
+                    }
+                }
             }
 
             pluginDescriptor.setClassRealm( pluginContainer.getContainerRealm() );
@@ -624,19 +641,6 @@ public class DefaultPluginManager
 
             pluginDescriptor.setArtifacts( allResolved );
         }
-            catch ( ArtifactResolutionException e )
-            {
-                throw new PluginConfigurationException( pluginDescriptor, "Cannot resolve plugin dependencies", e );
-            }
-            catch ( PlexusContainerException e )
-            {
-                throw new PluginConfigurationException( pluginDescriptor, "Cannot start plugin container", e );
-            }
-            catch ( ArtifactMetadataRetrievalException e )
-            {
-                throw new PluginConfigurationException( pluginDescriptor, "Cannot resolve plugin dependencies", e );
-            }
-        }
     }
 
     private void resolveCoreArtifacts( List unresolved, ArtifactRepository localRepository,

maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java

@@ -46,7 +46,8 @@ public interface PluginManager
         InvalidDependencyVersionException, PluginManagerException;
 
     MavenReport getReport( MavenProject project, MojoExecution mojoExecution, MavenSession session )
-        throws ArtifactNotFoundException, PluginConfigurationException, PluginManagerException;
+        throws ArtifactNotFoundException, PluginConfigurationException, PluginManagerException,
+        ArtifactResolutionException;
 
     PluginDescriptor getPluginDescriptorForPrefix( String prefix );
 

maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java

@@ -624,11 +624,13 @@ public class DefaultPluginVersionManager
             }
             catch ( IOException e )
             {
-                throw new PluginVersionResolutionException( groupId, artifactId, "Cannot read plugin registry", e );
+                throw new PluginVersionResolutionException( groupId, artifactId,
+                                                            "Error readin plugin registry: " + e.getMessage(), e );
             }
             catch ( XmlPullParserException e )
             {
-                throw new PluginVersionResolutionException( groupId, artifactId, "Cannot parse plugin registry", e );
+                throw new PluginVersionResolutionException( groupId, artifactId,
+                                                            "Error parsing plugin registry: " + e.getMessage(), e );
             }
 
             if ( pluginRegistry == null )
@@ -648,6 +650,7 @@ public class DefaultPluginVersionManager
 
         String version = null;
 
+        // This takes the spec version and resolves a real version
         try
         {
             ResolutionGroup resolutionGroup =
@@ -656,12 +659,27 @@ public class DefaultPluginVersionManager
             // switching this out with the actual resolved artifact instance, since the MMSource re-creates the pom
             // artifact.
             artifact = resolutionGroup.getPomArtifact();
+        }
+        catch ( ArtifactMetadataRetrievalException e )
+        {
+            throw new PluginVersionResolutionException( groupId, artifactId, e.getMessage(), e );
+        }
 
         // make sure this artifact was actually resolved to a file in the repo...
         if ( artifact.getFile() != null )
         {
-                MavenProject pluginProject = mavenProjectBuilder.buildFromRepository( artifact, project
+            MavenProject pluginProject;
-                    .getPluginArtifactRepositories(), localRepository, false );
+            try
+            {
+                pluginProject = mavenProjectBuilder.buildFromRepository( artifact,
+                                                                         project.getPluginArtifactRepositories(),
+                                                                         localRepository, false );
+            }
+            catch ( ProjectBuildingException e )
+            {
+                throw new PluginVersionResolutionException( groupId, artifactId,
+                                                            "Unable to build resolve plugin project information", e );
+            }
 
             boolean pluginValid = true;
 
@@ -686,16 +704,6 @@ public class DefaultPluginVersionManager
                 version = artifactVersion;
             }
         }
-        }
-        catch ( ArtifactMetadataRetrievalException e )
-        {
-            getLogger().debug( "Failed to resolve " + metaVersionId + " version", e );
-        }
-        catch ( ProjectBuildingException e )
-        {
-            throw new PluginVersionResolutionException( groupId, artifactId,
-                                                        "Unable to build resolve plugin project information", e );
-        }
 
         return version;
     }

maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java

@@ -156,8 +156,8 @@ public class DeployMojo
         }
         catch ( ArtifactDeploymentException e )
         {
-            // TODO: deployment exception that does not give a trace
+            throw new MojoExecutionException(
-            throw new MojoExecutionException( "Error deploying artifact", e );
+                "Error deploying artifact '" + artifact.getDependencyConflictId() + "': " + e.getMessage(), e );
         }
     }
 }

maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java

@@ -90,8 +90,8 @@ public class InstallFileMojo
         }
         catch ( ArtifactInstallationException e )
         {
-            // TODO: install exception that does not give a trace
+            throw new MojoExecutionException(
-            throw new MojoExecutionException( "Error installing artifact", e );
+                "Error installing artifact '" + artifact.getDependencyConflictId() + "': " + e.getMessage(), e );
         }
     }
 }

maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java

@@ -125,8 +125,8 @@ public class InstallMojo
         }
         catch ( ArtifactInstallationException e )
         {
-            // TODO: install exception that does not give a trace
+            throw new MojoExecutionException(
-            throw new MojoExecutionException( "Error installing artifact", e );
+                "Error installing artifact '" + artifact.getDependencyConflictId() + "': " + e.getMessage(), e );
         }
     }
 }

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

@@ -27,7 +27,6 @@ import org.apache.maven.artifact.repository.metadata.Metadata;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
-import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
 import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
@@ -43,15 +42,9 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -118,7 +111,8 @@ public class MavenMetadataSource
                 }
                 catch ( ProjectBuildingException e )
                 {
-                    throw new ArtifactMetadataRetrievalException( "Unable to read the metadata file", e );
+                    throw new ArtifactMetadataRetrievalException( "Unable to read the metadata file for artifact '" +
+                        artifact.getDependencyConflictId() + "': " + e.getMessage(), e );
                 }
 
                 if ( project != null )
@@ -172,8 +166,6 @@ public class MavenMetadataSource
         // TODO: this could come straight from the project, negating the need to set it in the project itself?
         artifact.setDownloadUrl( pomArtifact.getDownloadUrl() );
 
-        try
-        {
         ResolutionGroup result;
 
         if ( project == null )
@@ -190,35 +182,41 @@ public class MavenMetadataSource
             {
                 // TODO: we could possibly use p.getDependencyArtifacts instead of this call, but they haven't been filtered
                 // or used the inherited scope (should that be passed to the buildFromRepository method above?)
+                try
+                {
                     artifacts =
                         project.createArtifacts( artifactFactory, artifact.getScope(), artifact.getDependencyFilter() );
                 }
+                catch ( InvalidDependencyVersionException e )
+                {
+                    throw new ArtifactMetadataRetrievalException( "Error in metadata for artifact '" +
+                        artifact.getDependencyConflictId() + "': " + e.getMessage(), e );
+                }
+            }
 
-                List repositories =
+            List repositories = aggregateRepositoryLists( remoteRepositories, project.getRemoteArtifactRepositories() );
-                    aggregateRepositoryLists( remoteRepositories, project.getRemoteArtifactRepositories() );
 
             result = new ResolutionGroup( pomArtifact, artifacts, repositories );
         }
 
         return result;
     }
-        catch ( ProjectBuildingException e )
-        {
-            throw new ArtifactMetadataRetrievalException( "Unable to read the metadata file", e );
-        }
-        catch ( InvalidDependencyVersionException e )
-        {
-            throw new ArtifactMetadataRetrievalException( "Unable to read the metadata file", e );
-        }
-    }
 
     private List aggregateRepositoryLists( List remoteRepositories, List remoteArtifactRepositories )
-        throws ProjectBuildingException
+        throws ArtifactMetadataRetrievalException
     {
         if ( superProject == null )
+        {
+            try
             {
                 superProject = mavenProjectBuilder.buildStandaloneSuperProject( null );
             }
+            catch ( ProjectBuildingException e )
+            {
+                throw new ArtifactMetadataRetrievalException(
+                    "Unable to parse the Maven built-in model: " + e.getMessage(), e );
+            }
+        }
 
         List repositories = new ArrayList();
 
@@ -372,40 +370,4 @@ public class MavenMetadataSource
 
         return versions;
     }
-
-    /**
-     * @todo share with DefaultPluginMappingManager.
-     */
-    private static Metadata readMetadata( File mappingFile )
-        throws ArtifactMetadataRetrievalException
-    {
-        Metadata result;
-
-        Reader fileReader = null;
-        try
-        {
-            fileReader = new FileReader( mappingFile );
-
-            MetadataXpp3Reader mappingReader = new MetadataXpp3Reader();
-
-            result = mappingReader.read( fileReader );
-        }
-        catch ( FileNotFoundException e )
-        {
-            throw new ArtifactMetadataRetrievalException( "Cannot read version information from: " + mappingFile, e );
-        }
-        catch ( IOException e )
-        {
-            throw new ArtifactMetadataRetrievalException( "Cannot read version information from: " + mappingFile, e );
-        }
-        catch ( XmlPullParserException e )
-        {
-            throw new ArtifactMetadataRetrievalException( "Cannot parse version information from: " + mappingFile, e );
-        }
-        finally
-        {
-            IOUtil.close( fileReader );
-        }
-        return result;
-    }
 }