Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-1908] rollback the change on trunk since it degrades performance significantly at present 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390765 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2006-04-02 00:32:42 +00:00
parent 7f3012c19f
commit bc048ca9cc
3 changed files with 84 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
View File

@ -73,7 +73,7 @@ public class DefaultWagonManager
private Map serverPermissionsMap = new HashMap(); private Map serverPermissionsMap = new HashMap();
private Map mirrors = new HashMap(); private Map mirrors = new HashMap();
private Map serverConfigurationMap = new HashMap(); private Map serverConfigurationMap = new HashMap();
private TransferListener downloadMonitor; private TransferListener downloadMonitor;
@ -128,14 +128,14 @@ public class DefaultWagonManager
try try
{ {
wagon = getWagon( protocol ); wagon = getWagon( protocol );
configureWagon( wagon, repository ); configureWagon( wagon, repository );
} }
catch ( UnsupportedProtocolException e ) catch ( UnsupportedProtocolException e )
{ {
throw new TransferFailedException( "Unsupported Protocol: '" + protocol + "': " + e.getMessage(), e ); throw new TransferFailedException( "Unsupported Protocol: '" + protocol + "': " + e.getMessage(), e );
} }
if ( downloadMonitor != null ) if ( downloadMonitor != null )
{ {
wagon.addTransferListener( downloadMonitor ); wagon.addTransferListener( downloadMonitor );
@ -255,8 +255,7 @@ public class DefaultWagonManager
} }
} }
// if it already exists locally we were just trying to force it - ignore the update if ( !successful )
if ( !successful && !artifact.getFile().exists() )
{ {
throw new ResourceDoesNotExistException( "Unable to download the artifact from any repository" ); throw new ResourceDoesNotExistException( "Unable to download the artifact from any repository" );
} }
@ -350,8 +349,6 @@ public class DefaultWagonManager
File temp = new File( destination + ".tmp" ); File temp = new File( destination + ".tmp" );
temp.deleteOnExit(); temp.deleteOnExit();
boolean downloaded = false;
try try
{ {
wagon.connect( new Repository( repository.getId(), repository.getUrl() ), wagon.connect( new Repository( repository.getId(), repository.getUrl() ),
@ -369,38 +366,51 @@ public class DefaultWagonManager
retry = false; retry = false;
// This should take care of creating destination directory now on // This should take care of creating destination directory now on
if ( destination.exists() ) wagon.get( remotePath, temp );
// keep the checksum files from showing up on the download monitor...
if ( downloadMonitor != null )
{ {
downloaded = wagon.getIfNewer( remotePath, temp, destination.lastModified() ); wagon.removeTransferListener( downloadMonitor );
}
else
{
wagon.get( remotePath, temp );
downloaded = true;
} }
if ( downloaded ) // try to verify the SHA-1 checksum for this file.
try
{ {
// keep the checksum files from showing up on the download monitor... verifyChecksum( sha1ChecksumObserver, destination, temp, remotePath, ".sha1", wagon );
if ( downloadMonitor != null ) }
catch ( ChecksumFailedException e )
{
// if we catch a ChecksumFailedException, it means the transfer/read succeeded, but the checksum
// doesn't match. This could be a problem with the server (ibiblio HTTP-200 error page), so we'll
// try this up to two times. On the second try, we'll handle it as a bona-fide error, based on the
// repository's checksum checking policy.
if ( firstRun )
{ {
wagon.removeTransferListener( downloadMonitor ); getLogger().warn( "*** CHECKSUM FAILED - " + e.getMessage() + " - RETRYING" );
retry = true;
} }
else
{
handleChecksumFailure( checksumPolicy, e.getMessage(), e.getCause() );
}
}
catch ( ResourceDoesNotExistException sha1TryException )
{
getLogger().debug( "SHA1 not found, trying MD5", sha1TryException );
// try to verify the SHA-1 checksum for this file. // if this IS NOT a ChecksumFailedException, it was a problem with transfer/read of the checksum
// file...we'll try again with the MD5 checksum.
try try
{ {
verifyChecksum( sha1ChecksumObserver, destination, temp, remotePath, ".sha1", wagon ); verifyChecksum( md5ChecksumObserver, destination, temp, remotePath, ".md5", wagon );
} }
catch ( ChecksumFailedException e ) catch ( ChecksumFailedException e )
{ {
// if we catch a ChecksumFailedException, it means the transfer/read succeeded, but the checksum // if we also fail to verify based on the MD5 checksum, and the checksum transfer/read
// doesn't match. This could be a problem with the server (ibiblio HTTP-200 error page), so we'll // succeeded, then we need to determine whether to retry or handle it as a failure.
// try this up to two times. On the second try, we'll handle it as a bona-fide error, based on the
// repository's checksum checking policy.
if ( firstRun ) if ( firstRun )
{ {
getLogger().warn( "*** CHECKSUM FAILED - " + e.getMessage() + " - RETRYING" );
retry = true; retry = true;
} }
else else
@ -408,42 +418,18 @@ public class DefaultWagonManager
handleChecksumFailure( checksumPolicy, e.getMessage(), e.getCause() ); handleChecksumFailure( checksumPolicy, e.getMessage(), e.getCause() );
} }
} }
catch ( ResourceDoesNotExistException sha1TryException ) catch ( ResourceDoesNotExistException md5TryException )
{ {
getLogger().debug( "SHA1 not found, trying MD5", sha1TryException ); // this was a failed transfer, and we don't want to retry.
handleChecksumFailure( checksumPolicy, "Error retrieving checksum file for " + remotePath,
// if this IS NOT a ChecksumFailedException, it was a problem with transfer/read of the checksum md5TryException );
// file...we'll try again with the MD5 checksum.
try
{
verifyChecksum( md5ChecksumObserver, destination, temp, remotePath, ".md5", wagon );
}
catch ( ChecksumFailedException e )
{
// if we also fail to verify based on the MD5 checksum, and the checksum transfer/read
// succeeded, then we need to determine whether to retry or handle it as a failure.
if ( firstRun )
{
retry = true;
}
else
{
handleChecksumFailure( checksumPolicy, e.getMessage(), e.getCause() );
}
}
catch ( ResourceDoesNotExistException md5TryException )
{
// this was a failed transfer, and we don't want to retry.
handleChecksumFailure( checksumPolicy, "Error retrieving checksum file for " + remotePath,
md5TryException );
}
} }
}
// reinstate the download monitor... // reinstate the download monitor...
if ( downloadMonitor != null ) if ( downloadMonitor != null )
{ {
wagon.addTransferListener( downloadMonitor ); wagon.addTransferListener( downloadMonitor );
}
} }
// unset the firstRun flag, so we don't get caught in an infinite loop... // unset the firstRun flag, so we don't get caught in an infinite loop...
@ -469,32 +455,29 @@ public class DefaultWagonManager
releaseWagon( wagon ); releaseWagon( wagon );
} }
if ( downloaded ) if ( !temp.exists() )
{ {
if ( !temp.exists() ) throw new ResourceDoesNotExistException( "Downloaded file does not exist: " + temp );
}
// The temporary file is named destination + ".tmp" and is done this way to ensure
// that the temporary file is in the same file system as the destination because the
// File.renameTo operation doesn't really work across file systems.
// So we will attempt to do a File.renameTo for efficiency and atomicity, if this fails
// then we will use a brute force copy and delete the temporary file.
if ( !temp.renameTo( destination ) )
{
try
{ {
throw new ResourceDoesNotExistException( "Downloaded file does not exist: " + temp ); FileUtils.copyFile( temp, destination );
temp.delete();
} }
catch ( IOException e )
// The temporary file is named destination + ".tmp" and is done this way to ensure
// that the temporary file is in the same file system as the destination because the
// File.renameTo operation doesn't really work across file systems.
// So we will attempt to do a File.renameTo for efficiency and atomicity, if this fails
// then we will use a brute force copy and delete the temporary file.
if ( !temp.renameTo( destination ) )
{ {
try throw new TransferFailedException(
{ "Error copying temporary file to the final destination: " + e.getMessage(), e );
FileUtils.copyFile( temp, destination );
temp.delete();
}
catch ( IOException e )
{
throw new TransferFailedException(
"Error copying temporary file to the final destination: " + e.getMessage(), e );
}
} }
} }
} }
@ -523,8 +506,8 @@ public class DefaultWagonManager
// otherwise it is ignore // otherwise it is ignore
} }
private void verifyChecksum( ChecksumObserver checksumObserver, File destination, File tempDestination, private void verifyChecksum( ChecksumObserver checksumObserver, File destination, File tempDestination, String remotePath,
String remotePath, String checksumFileExtension, Wagon wagon ) String checksumFileExtension, Wagon wagon )
throws ResourceDoesNotExistException, TransferFailedException, AuthorizationException throws ResourceDoesNotExistException, TransferFailedException, AuthorizationException
{ {
try try
@ -560,10 +543,7 @@ public class DefaultWagonManager
if ( expectedChecksum.equals( actualChecksum ) ) if ( expectedChecksum.equals( actualChecksum ) )
{ {
File checksumFile = new File( destination + checksumFileExtension ); File checksumFile = new File( destination + checksumFileExtension );
if ( checksumFile.exists() ) if ( checksumFile.exists() ) checksumFile.delete();
{
checksumFile.delete();
}
FileUtils.copyFile( tempChecksumFile, checksumFile ); FileUtils.copyFile( tempChecksumFile, checksumFile );
} }
else else
@ -620,13 +600,13 @@ public class DefaultWagonManager
/** /**
* Set the proxy used for a particular protocol. * Set the proxy used for a particular protocol.
* *
* @param protocol the protocol (required) * @param protocol the protocol (required)
* @param host the proxy host name (required) * @param host the proxy host name (required)
* @param port the proxy port (required) * @param port the proxy port (required)
* @param username the username for the proxy, or null if there is none * @param username the username for the proxy, or null if there is none
* @param password the password for the proxy, or null if there is none * @param password the password for the proxy, or null if there is none
* @param nonProxyHosts the set of hosts not to use the proxy for. Follows Java system * @param nonProxyHosts the set of hosts not to use the proxy for. Follows Java system
* property format: <code>*.foo.com|localhost</code>. * property format: <code>*.foo.com|localhost</code>.
* @todo [BP] would be nice to configure this via plexus in some way * @todo [BP] would be nice to configure this via plexus in some way
*/ */
public void addProxy( String protocol, String host, int port, String username, String password, public void addProxy( String protocol, String host, int port, String username, String password,
@ -718,12 +698,12 @@ public class DefaultWagonManager
{ {
this.interactive = interactive; this.interactive = interactive;
} }
/** /**
* Applies the server configuration to the wagon * Applies the server configuration to the wagon
* *
* @param wagon the wagon to configure * @param wagon the wagon to configure
* @param repository the repository that has the configuration * @param repository the repository that has the configuration
* @throws WagonConfigurationException wraps any error given during configuration of the wagon instance * @throws WagonConfigurationException wraps any error given during configuration of the wagon instance
*/ */
@ -744,9 +724,7 @@ public class DefaultWagonManager
} }
catch ( final ComponentLookupException e ) catch ( final ComponentLookupException e )
{ {
throw new WagonConfigurationException( repositoryId, throw new WagonConfigurationException( repositoryId, "Unable to lookup wagon configurator. Wagon configuration cannot be applied.", e );
"Unable to lookup wagon configurator. Wagon configuration cannot be applied.",
e );
} }
catch ( ComponentConfigurationException e ) catch ( ComponentConfigurationException e )
{ {
@ -769,7 +747,7 @@ public class DefaultWagonManager
} }
} }
} }
public void addConfiguration( String repositoryId, Xpp3Dom configuration ) public void addConfiguration( String repositoryId, Xpp3Dom configuration )
{ {

9
maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
View File

@ -78,11 +78,10 @@ public class DefaultRepositoryMetadataManager
File file = new File( localRepository.getBasedir(), File file = new File( localRepository.getBasedir(),
localRepository.pathOfLocalRepositoryMetadata( metadata, repository ) ); localRepository.pathOfLocalRepositoryMetadata( metadata, repository ) );
boolean checkForUpdates = boolean checkForUpdates = policy.checkOutOfDate( new Date( file.lastModified() ) ) || !file.exists();
policy.checkOutOfDate( new Date( file.lastModified() ) ) || !file.exists();
boolean metadataIsEmpty = true; boolean metadataIsEmpty = true;
if ( checkForUpdates ) if ( checkForUpdates )
{ {
getLogger().info( metadata.getKey() + ": checking for updates from " + repository.getId() ); getLogger().info( metadata.getKey() + ": checking for updates from " + repository.getId() );
@ -202,8 +201,6 @@ public class DefaultRepositoryMetadataManager
if ( !m.getVersioning().getSnapshot().isLocalCopy() ) if ( !m.getVersioning().getSnapshot().isLocalCopy() )
{ {
// TODO: I think this is incorrect (it results in localCopy set in a remote profile). Probably
// harmless so not removing at this point until full tests in place.
m.getVersioning().getSnapshot().setLocalCopy( true ); m.getVersioning().getSnapshot().setLocalCopy( true );
metadata.setMetadata( m ); metadata.setMetadata( m );
metadata.storeInLocalRepository( localRepository, repository ); metadata.storeInLocalRepository( localRepository, repository );
@ -375,7 +372,7 @@ public class DefaultRepositoryMetadataManager
getLogger().info( "Repository '" + repository.getId() + "' will be blacklisted" ); getLogger().info( "Repository '" + repository.getId() + "' will be blacklisted" );
getLogger().debug( "Exception", e ); getLogger().debug( "Exception", e );
repository.setBlacklisted( allowBlacklisting ); repository.setBlacklisted( allowBlacklisting );
throw e; throw e;
} }
} }

36
maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
View File

@ -21,7 +21,6 @@ import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.manager.WagonManager; import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.transform.ArtifactTransformationManager; import org.apache.maven.artifact.transform.ArtifactTransformationManager;
import org.apache.maven.wagon.ResourceDoesNotExistException; import org.apache.maven.wagon.ResourceDoesNotExistException;
@ -33,7 +32,6 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -106,32 +104,6 @@ public class DefaultArtifactResolver
transformationManager.transformForResolve( artifact, remoteRepositories, localRepository ); transformationManager.transformForResolve( artifact, remoteRepositories, localRepository );
File destination = artifact.getFile(); File destination = artifact.getFile();
List repositories = remoteRepositories;
// TODO: would prefer the snapshot transformation took care of this. Maybe we need a "shouldresolve" flag.
if ( artifact.isSnapshot() && artifact.getBaseVersion().equals( artifact.getVersion() ) &&
destination.exists() )
{
Date comparisonDate = new Date( destination.lastModified() );
// cull to list of repositories that would like an update
repositories = new ArrayList( remoteRepositories );
for ( Iterator i = repositories.iterator(); i.hasNext(); )
{
ArtifactRepository repository = (ArtifactRepository) i.next();
ArtifactRepositoryPolicy policy = repository.getSnapshots();
if ( !policy.isEnabled() || !policy.checkOutOfDate( comparisonDate ) )
{
i.remove();
}
}
if ( !repositories.isEmpty() )
{
// someone wants to check for updates
force = true;
}
}
boolean resolved = false; boolean resolved = false;
if ( !destination.exists() || force ) if ( !destination.exists() || force )
{ {
@ -149,10 +121,10 @@ public class DefaultArtifactResolver
} }
else else
{ {
wagonManager.getArtifact( artifact, repositories ); wagonManager.getArtifact( artifact, remoteRepositories );
} }
if ( !artifact.isResolved() && !destination.exists() ) if ( !artifact.isResolved() )
{ {
throw new ArtifactResolutionException( throw new ArtifactResolutionException(
"Failed to resolve artifact, possibly due to a repository list that is not appropriately equipped for this artifact's metadata.", "Failed to resolve artifact, possibly due to a repository list that is not appropriately equipped for this artifact's metadata.",
@ -266,7 +238,7 @@ public class DefaultArtifactResolver
missingArtifacts.add( node.getArtifact() ); missingArtifacts.add( node.getArtifact() );
} }
} }
if ( missingArtifacts.size() > 0 ) if ( missingArtifacts.size() > 0 )
{ {
throw new MultipleArtifactsNotFoundException( originatingArtifact, missingArtifacts, remoteRepositories ); throw new MultipleArtifactsNotFoundException( originatingArtifact, missingArtifacts, remoteRepositories );
@ -300,4 +272,4 @@ public class DefaultArtifactResolver
remoteRepositories, source, null, listeners ); remoteRepositories, source, null, listeners );
} }
} }