Author: brett
Date: Thu Apr 21 07:17:14 2005
New Revision: 164065
URL: http://svn.apache.org/viewcvs?rev=164065&view=rev
Log:
improved error handling for failed downloads
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java?rev=164065&r1=164064&r2=164065&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
Thu Apr 21 07:17:14 2005
@@ -1,5 +1,7 @@
package org.apache.maven.artifact.resolver;
+import org.apache.maven.artifact.Artifact;
+
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -23,20 +25,51 @@
public class ArtifactResolutionException
extends Exception
{
+ private String groupId;
+
+ private String artifactId;
+ private String version;
- public ArtifactResolutionException( String message )
+ private String type;
+
+ public ArtifactResolutionException( String message, String groupId, String
artifactId, String version, String type, Throwable t )
{
- super( message );
+ super( "Unable to resolve artifact " + groupId + ":" + artifactId +
":" + version + ":" + type + "\n" + message, t );
+
+ this.groupId = groupId;
+ this.artifactId = artifactId;
+ this.type = type;
+ this.version = version;
}
- public ArtifactResolutionException( Throwable cause )
+ public ArtifactResolutionException( String message, Artifact artifact,
Throwable t )
{
- super( cause );
+ this( message, artifact.getGroupId(), artifact.getArtifactId(),
artifact.getVersion(), artifact.getType(), t );
}
public ArtifactResolutionException( String message, Throwable cause )
{
super( message, cause );
+ }
+
+ public String getGroupId()
+ {
+ return groupId;
+ }
+
+ public String getArtifactId()
+ {
+ return artifactId;
+ }
+
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public String getType()
+ {
+ return type;
}
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=164065&r1=164064&r2=164065&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Thu Apr 21 07:17:14 2005
@@ -128,11 +128,11 @@
}
catch ( ResourceDoesNotExistException e )
{
- throw new ArtifactResolutionException( artifactNotFound(
localPath, remoteRepositories ), e );
+ throw new ArtifactResolutionException( artifactNotFound(
localPath, remoteRepositories ), artifact, e );
}
catch ( TransferFailedException e )
{
- throw new ArtifactResolutionException( "Error downloading
artifact " + artifact, e );
+ throw new ArtifactResolutionException( e.getMessage(),
artifact, e );
}
catch ( ArtifactMetadataRetrievalException e )
{
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=164065&r1=164064&r2=164065&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Thu Apr 21 07:17:14 2005
@@ -95,10 +95,6 @@
{
response.setException( e );
}
- catch ( PluginNotFoundException e )
- {
- response.setException( e );
- }
catch ( ArtifactHandlerNotFoundException e )
{
response.setException( e );
@@ -233,7 +229,7 @@
}
private void processPluginConfiguration( MavenProject project,
MavenSession mavenSession, Map phaseMap )
- throws LifecycleExecutionException, PluginNotFoundException
+ throws LifecycleExecutionException, ArtifactResolutionException
{
for ( Iterator i = project.getPlugins().iterator(); i.hasNext(); )
{
@@ -251,7 +247,7 @@
* @param session
*/
private void processPluginPhases( Plugin plugin, MavenSession session, Map
phaseMap )
- throws LifecycleExecutionException, PluginNotFoundException
+ throws LifecycleExecutionException, ArtifactResolutionException
{
String groupId = plugin.getGroupId();
@@ -336,7 +332,7 @@
}
private void processGoalChain( String task, MavenSession session, Map
phaseMap )
- throws LifecycleExecutionException, PluginNotFoundException
+ throws LifecycleExecutionException, ArtifactResolutionException
{
if ( phaseMap.containsKey( task ) )
{
@@ -368,7 +364,7 @@
}
private void verifyMojoPhase( String task, MavenSession session, Map
phaseMap )
- throws LifecycleExecutionException, PluginNotFoundException
+ throws LifecycleExecutionException, ArtifactResolutionException
{
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( task
);
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=164065&r1=164064&r2=164065&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Thu Apr 21 07:17:14 2005
@@ -199,7 +199,7 @@
}
public void verifyPluginForGoal( String goalName, MavenSession session )
- throws PluginNotFoundException, PluginManagerException
+ throws ArtifactResolutionException, PluginManagerException
{
String pluginId = PluginDescriptor.getPluginIdFromGoal( goalName );
@@ -207,7 +207,7 @@
}
public void verifyPlugin( String groupId, String artifactId, MavenSession
session )
- throws PluginNotFoundException, PluginManagerException
+ throws ArtifactResolutionException, PluginManagerException
{
if ( !isPluginInstalled( groupId, artifactId ) )
{
@@ -258,7 +258,15 @@
}
catch ( ArtifactResolutionException e )
{
- throw new PluginNotFoundException( groupId, artifactId,
version, e );
+ if ( groupId.equals( e.getGroupId() ) && artifactId.equals(
e.getArtifactId() ) &&
+ version.equals( e.getVersion() ) && "maven-plugin".equals(
e.getType() ) )
+ {
+ throw new PluginNotFoundException( groupId, artifactId,
version, e );
+ }
+ else
+ {
+ throw e;
+ }
}
catch ( ComponentLookupException e )
{
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=164065&r1=164064&r2=164065&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
Thu Apr 21 07:17:14 2005
@@ -36,10 +36,10 @@
MojoDescriptor getMojoDescriptor( String goalId );
void verifyPluginForGoal( String goalName, MavenSession session )
- throws PluginNotFoundException, PluginManagerException;
+ throws ArtifactResolutionException, PluginManagerException;
void verifyPlugin( String groupId, String artifactId, MavenSession session
)
- throws PluginNotFoundException, PluginManagerException;
+ throws ArtifactResolutionException, PluginManagerException;
PluginDescriptor getPluginDescriptor( String groupId, String artifactId );
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java?rev=164065&r1=164064&r2=164065&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
Thu Apr 21 07:17:14 2005
@@ -25,12 +25,11 @@
* @version $Id$
*/
public class PluginNotFoundException
- extends Throwable
+ extends ArtifactResolutionException
{
public PluginNotFoundException( String groupId, String artifactId, String
version, ArtifactResolutionException e )
{
- super(
- "Plugin could not found in any remote repositories: [" + groupId +
":" + artifactId + ":" + version + "]",
- e );
+ super( "Plugin could not be found - check that the goal name is
correct", groupId, artifactId, version,
+ "maven-plugin", e );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
