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 06:01:20 UTC
svn commit: r634165 - in /maven/artifact/trunk/src:
main/java/org/apache/maven/artifact/manager/
test/java/org/apache/maven/artifact/repository/metadata/
Author: brett
Date: Wed Mar 5 21:01:19 2008
New Revision: 634165
URL: http://svn.apache.org/viewvc?rev=634165&view=rev
Log:
[MNG-3341] only look in the original deployment repository for metadata to update
Merged from r634129 on the maven-2.0.x branch
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManagerTest.java
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=634165&r1=634164&r2=634165&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Wed Mar 5 21:01:19 2008
@@ -400,7 +400,8 @@
try
{
- getRemoteFile( repository, artifact.getFile(), remotePath, downloadMonitor, policy.getChecksumPolicy(), false );
+ getRemoteFile( getMirrorRepository( repository ), artifact.getFile(), remotePath, downloadMonitor,
+ policy.getChecksumPolicy(), false );
}
finally
{
@@ -438,6 +439,15 @@
{
String remotePath = repository.pathOfRemoteRepositoryMetadata( metadata );
+ getRemoteFile( getMirrorRepository( repository ), destination, remotePath, null, checksumPolicy, true );
+ }
+
+ public void getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata, ArtifactRepository repository,
+ File destination, String checksumPolicy )
+ throws TransferFailedException, ResourceDoesNotExistException
+ {
+ String remotePath = repository.pathOfRemoteRepositoryMetadata( metadata );
+
getRemoteFile( repository, destination, remotePath, null, checksumPolicy, true );
}
@@ -452,15 +462,6 @@
// TODO: better excetpions - transfer failed is not enough?
failIfNotOnline();
-
- ArtifactRepository mirror = getMirror( repository.getId() );
-
- if ( mirror != null )
- {
- repository = repositoryFactory.createArtifactRepository( mirror.getId(), mirror.getUrl(),
- repository.getLayout(), repository.getSnapshots(),
- repository.getReleases() );
- }
String protocol = repository.getProtocol();
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/WagonManager.java?rev=634165&r1=634164&r2=634165&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/WagonManager.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/WagonManager.java Wed Mar 5 21:01:19 2008
@@ -106,6 +106,10 @@
String checksumPolicy )
throws TransferFailedException, ResourceDoesNotExistException;
+ void getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata, ArtifactRepository remoteRepository,
+ File file, String checksumPolicyWarn )
+ throws TransferFailedException, ResourceDoesNotExistException;
+
void setOnline( boolean online );
boolean isOnline();
Modified: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManagerTest.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManagerTest.java?rev=634165&r1=634164&r2=634165&view=diff
==============================================================================
--- maven/artifact/trunk/src/test/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManagerTest.java (original)
+++ maven/artifact/trunk/src/test/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManagerTest.java Wed Mar 5 21:01:19 2008
@@ -94,7 +94,7 @@
try
{
- wagonManager.getArtifactMetadata( null, null, null, null );
+ wagonManager.getArtifactMetadataFromDeploymentRepository( null, null, null, null );
wagonManagerCtl.setMatcher( MockControl.ALWAYS_MATCHER );
wagonManagerCtl.setThrowable( new ResourceDoesNotExistException( "Test error" ) );
}
@@ -184,7 +184,7 @@
try
{
- wagonManager.getArtifactMetadata( null, null, null, null );
+ wagonManager.getArtifactMetadataFromDeploymentRepository( null, null, null, null );
wagonManagerCtl.setMatcher( MockControl.ALWAYS_MATCHER );
wagonManagerCtl.setThrowable( new TransferFailedException( "Test error" ) );
}
@@ -219,9 +219,17 @@
Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- new DefaultRepositoryMetadataManager( wagonManager, updateCheckManager, logger ).resolveAlways( metadata,
- localRepo,
- localRepo );
+ try
+ {
+ new DefaultRepositoryMetadataManager( wagonManager, updateCheckManager, logger ).resolveAlways( metadata,
+ localRepo,
+ localRepo );
+ fail( "Should have thrown an exception due to transfer failure" );
+ }
+ catch ( RepositoryMetadataResolutionException e )
+ {
+ assertTrue( true );
+ }
// helps the lastUpdate interval be significantly different.
Thread.sleep( 1000 );
@@ -271,7 +279,7 @@
try
{
- wagonManager.getArtifactMetadata( null, null, null, null );
+ wagonManager.getArtifactMetadataFromDeploymentRepository( null, null, null, null );
wagonManagerCtl.setMatcher( MockControl.ALWAYS_MATCHER );
wagonManagerCtl.setVoidCallable();
}