You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/04/21 15:47:42 UTC
svn commit: r164058 - in
/maven/components/trunk/maven-core/src/main/java/org/apache/maven:
DefaultMaven.java project/DefaultMavenProjectBuilder.java
Author: brett
Date: Thu Apr 21 06:47:42 2005
New Revision: 164058
URL: http://svn.apache.org/viewcvs?rev=164058&view=rev
Log:
improve error handling for failed downloads
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=164058&r1=164057&r2=164058&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Thu Apr 21 06:47:42 2005
@@ -20,6 +20,7 @@
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResponse;
import org.apache.maven.execution.MavenSession;
@@ -246,7 +247,8 @@
{
if ( exception.getCause() == null )
{
- logFailure( response, (PluginExecutionException) exception );
+ PluginExecutionException e = (PluginExecutionException) exception;
+ logFailure( response, e, e.getLongMessage() );
}
else
{
@@ -254,6 +256,10 @@
logError( response );
}
}
+ else if ( exception instanceof ArtifactResolutionException )
+ {
+ logFailure( response, exception, null );
+ }
else
{
// TODO: this should be a "FATAL" exception, reported to the
@@ -354,7 +360,7 @@
line();
}
- protected void logFailure( MavenExecutionResponse r, PluginExecutionException e )
+ protected void logFailure( MavenExecutionResponse r, Throwable e, String longMessage )
{
line();
@@ -366,9 +372,9 @@
line();
- if ( e.getLongMessage() != null )
+ if ( longMessage != null )
{
- getLogger().info( e.getLongMessage() );
+ getLogger().info( longMessage );
line();
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=164058&r1=164057&r2=164058&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Apr 21 06:47:42 2005
@@ -19,6 +19,7 @@
import org.apache.maven.MavenConstants;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.MavenMetadataSource;
+import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
@@ -178,7 +179,6 @@
ArtifactRepository localRepository )
throws ProjectBuildingException
{
- Settings settings = readSettings();
Model model = findModelFromRepository( artifact, remoteArtifactRepositories, localRepository );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org