Author: bentmann
Date: Tue Mar 30 18:39:31 2010
New Revision: 929217
URL: http://svn.apache.org/viewvc?rev=929217&view=rev
Log:
[MNG-2741] [regression] Meaningless error message: "Error transferring file"
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java?rev=929217&r1=929216&r2=929217&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
Tue Mar 30 18:39:31 2010
@@ -631,11 +631,11 @@ public class LegacyRepositorySystem
}
catch ( org.apache.maven.wagon.TransferFailedException e )
{
- throw new ArtifactTransferFailedException( "Error transferring
artifact.", e );
+ throw new ArtifactTransferFailedException( getMessage( e, "Error
transferring artifact." ), e );
}
catch ( org.apache.maven.wagon.ResourceDoesNotExistException e )
{
- throw new ArtifactDoesNotExistException( "Requested artifact does
not exist.", e );
+ throw new ArtifactDoesNotExistException( getMessage( e, "Requested
artifact does not exist." ), e );
}
}
@@ -649,7 +649,7 @@ public class LegacyRepositorySystem
}
catch ( org.apache.maven.wagon.TransferFailedException e )
{
- throw new ArtifactTransferFailedException( "Error transferring
artifact.", e );
+ throw new ArtifactTransferFailedException( getMessage( e, "Error
transferring artifact." ), e );
}
}
@@ -708,4 +708,18 @@ public class LegacyRepositorySystem
return artifactRepository;
}
+ private static String getMessage( Throwable error, String def )
+ {
+ if ( error == null )
+ {
+ return def;
+ }
+ String msg = error.getMessage();
+ if ( StringUtils.isNotEmpty( msg ) )
+ {
+ return msg;
+ }
+ return getMessage( error.getCause(), def );
+ }
+
}
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java?rev=929217&r1=929216&r2=929217&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
Tue Mar 30 18:39:31 2010
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -170,7 +171,7 @@ public class DefaultPluginPrefixResolver
}
}
- List<ArtifactRepository> recheck = new ArrayList<ArtifactRepository>();
+ Map<String, List<ArtifactRepository>> recheck = new HashMap<String,
List<ArtifactRepository>>();
// Process all the remote repositories.
//
@@ -195,11 +196,13 @@ public class DefaultPluginPrefixResolver
{
if ( logger.isDebugEnabled() )
{
- logger.warn( "Failed to retrieve " + remotePath +
": " + e.getMessage(), e );
+ logger.warn( "Failed to retrieve " + remotePath +
" from " + repository.getId() + ": "
+ + e.getMessage(), e );
}
else
{
- logger.warn( "Failed to retrieve " + remotePath +
": " + e.getMessage() );
+ logger.warn( "Failed to retrieve " + remotePath +
" from " + repository.getId() + ": "
+ + e.getMessage() );
}
}
catch ( ArtifactDoesNotExistException e )
@@ -209,7 +212,13 @@ public class DefaultPluginPrefixResolver
}
else if ( !request.isOffline() && !request.isForceUpdate() )
{
- recheck.add( repository );
+ List<ArtifactRepository> repos = recheck.get( pluginGroup
);
+ if ( repos == null )
+ {
+ repos = new ArrayList<ArtifactRepository>();
+ recheck.put( pluginGroup, repos );
+ }
+ repos.add( repository );
}
PluginPrefixResult result = resolveFromRepository( request,
pluginGroup, groupMetadataFile, repository );
@@ -225,7 +234,13 @@ public class DefaultPluginPrefixResolver
//
for ( String pluginGroup : request.getPluginGroups() )
{
- for ( ArtifactRepository repository : recheck )
+ List<ArtifactRepository> repos = recheck.get( pluginGroup );
+ if ( repos == null )
+ {
+ continue;
+ }
+
+ for ( ArtifactRepository repository : repos )
{
String localPath = getLocalMetadataPath( pluginGroup,
repository );
@@ -241,11 +256,13 @@ public class DefaultPluginPrefixResolver
{
if ( logger.isDebugEnabled() )
{
- logger.warn( "Failed to retrieve " + remotePath + ": "
+ e.getMessage(), e );
+ logger.warn( "Failed to retrieve " + remotePath + "
from " + repository.getId() + ": "
+ + e.getMessage(), e );
}
else
{
- logger.warn( "Failed to retrieve " + remotePath + ": "
+ e.getMessage() );
+ logger.warn( "Failed to retrieve " + remotePath + "
from " + repository.getId() + ": "
+ + e.getMessage() );
}
}
catch ( ArtifactDoesNotExistException e )
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java?rev=929217&r1=929216&r2=929217&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
Tue Mar 30 18:39:31 2010
@@ -128,11 +128,13 @@ public class DefaultPluginVersionResolve
{
if ( logger.isDebugEnabled() )
{
- logger.warn( "Failed to retrieve " + remotePath + ": "
+ e.getMessage(), e );
+ logger.warn( "Failed to retrieve " + remotePath + "
from " + repository.getId() + ": "
+ + e.getMessage(), e );
}
else
{
- logger.warn( "Failed to retrieve " + remotePath + ": "
+ e.getMessage() );
+ logger.warn( "Failed to retrieve " + remotePath + "
from " + repository.getId() + ": "
+ + e.getMessage() );
}
continue;
