You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/03/06 05:49:55 UTC
svn commit: r634162 -
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Author: brett
Date: Wed Mar 5 20:49:54 2008
New Revision: 634162
URL: http://svn.apache.org/viewvc?rev=634162&view=rev
Log:
[MNG-3341] it doesn't make sense to swallow this exception since we are attempting to deploy the metadata
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=634162&r1=634161&r2=634162&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Wed Mar 5 20:49:54 2008
@@ -332,7 +332,16 @@
"System is offline. Cannot resolve required metadata:\n" + metadata.extendedToString() );
}
- File file = getArtifactMetadataFromDeploymentRepository( metadata, localRepository, remoteRepository );
+ File file;
+ try
+ {
+ file = getArtifactMetadataFromDeploymentRepository( metadata, localRepository, remoteRepository );
+ }
+ catch ( TransferFailedException e )
+ {
+ throw new RepositoryMetadataResolutionException( metadata + " could not be retrieved from repository: " +
+ remoteRepository.getId() + " due to an error: " + e.getMessage(), e );
+ }
try
{
@@ -351,6 +360,7 @@
private File getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata,
ArtifactRepository localRepository,
ArtifactRepository remoteRepository )
+ throws TransferFailedException
{
File file = new File( localRepository.getBasedir(),
localRepository.pathOfLocalRepositoryMetadata( metadata, remoteRepository ) );
@@ -371,17 +381,6 @@
file.delete();
}
}
- catch ( TransferFailedException e )
- {
- getLogger().warn( metadata + " could not be retrieved from repository: " + remoteRepository.getId() +
- " due to an error: " + e.getMessage() );
- getLogger().debug( "Exception", e );
-
- // TODO: [jc; 08-Nov-2005] revisit this for 2.1
- // suppressing logging to avoid logging this error twice.
- // We don't want to interrupt program flow here. Just allow empty metadata instead.
- // rethrowing this would change behavior.
- }
return file;
}
@@ -405,7 +404,16 @@
if ( metadata instanceof RepositoryMetadata )
{
getLogger().info( "Retrieving previous metadata from " + deploymentRepository.getId() );
- file = getArtifactMetadataFromDeploymentRepository( metadata, localRepository, deploymentRepository );
+ try
+ {
+ file = getArtifactMetadataFromDeploymentRepository( metadata, localRepository, deploymentRepository );
+ }
+ catch ( TransferFailedException e )
+ {
+ throw new RepositoryMetadataDeploymentException( metadata +
+ " could not be retrieved from repository: " + deploymentRepository.getId() + " due to an error: " +
+ e.getMessage(), e );
+ }
}
else
{