You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ni...@apache.org on 2008/07/09 15:19:05 UTC
svn commit: r675159 -
/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
Author: nicolas
Date: Wed Jul 9 06:19:04 2008
New Revision: 675159
URL: http://svn.apache.org/viewvc?rev=675159&view=rev
Log:
regression
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=675159&r1=675158&r2=675159&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java Wed Jul 9 06:19:04 2008
@@ -76,7 +76,6 @@
import java.util.Map.Entry;
import java.util.Properties;
-
/**
* DefaultRepositoryProxyConnectors
*
@@ -89,7 +88,7 @@
implements RepositoryProxyConnectors, RegistryListener, Initializable
{
private Logger log = LoggerFactory.getLogger( DefaultRepositoryProxyConnectors.class );
-
+
/**
* @plexus.requirement
*/
@@ -170,7 +169,7 @@
try
{
File downloadedFile =
- transferFile( connector, targetRepository, targetPath, repository, localFile, requestProperties );
+ transferFile( connector, targetRepository, targetPath, localFile, requestProperties );
if ( fileExists( downloadedFile ) )
{
@@ -231,7 +230,7 @@
try
{
- transferFile( connector, targetRepository, targetPath, repository, localRepoFile, requestProperties );
+ transferFile( connector, targetRepository, targetPath, localRepoFile, requestProperties );
if ( hasBeenUpdated( localRepoFile, originalMetadataTimestamp ) )
{
@@ -349,7 +348,7 @@
long originalMetadataTimestamp = getLastModified( localRepoFile );
try
{
- transferFile( connector, targetRepository, targetPath, repository, localRepoFile, requestProperties );
+ transferFile( connector, targetRepository, targetPath, localRepoFile, requestProperties );
if ( hasBeenUpdated( localRepoFile, originalMetadataTimestamp ) )
{
@@ -485,20 +484,19 @@
/**
* Perform the transfer of the file.
*
- * @param connector the connector configuration to use.
- * @param remoteRepository the remote repository get the resource from.
- * @param remotePath the path in the remote repository to the resource to get.
- * @param repository the managed repository that will hold the transfered file
- * @param localFile the local file to place the downloaded resource into
+ * @param connector the connector configuration to use.
+ * @param remoteRepository the remote repository get the resource from.
+ * @param remotePath the path in the remote repository to the resource to get.
+ * @param localFile the local file to place the downloaded resource into
* @param requestProperties the request properties to utilize for policy handling.
* @return the local file that was downloaded, or null if not downloaded.
- * @throws NotFoundException if the file was not found on the remote repository.
- * @throws NotModifiedException if the localFile was present, and the resource was present on remote repository, but
- * the remote resource is not newer than the local File.
- * @throws ProxyException if transfer was unsuccessful.
+ * @throws NotFoundException if the file was not found on the remote repository.
+ * @throws NotModifiedException if the localFile was present, and the resource was present on remote repository,
+ * but the remote resource is not newer than the local File.
+ * @throws ProxyException if transfer was unsuccessful.
*/
private File transferFile( ProxyConnector connector, RemoteRepositoryContent remoteRepository, String remotePath,
- ManagedRepositoryContent repository, File localFile, Properties requestProperties )
+ File localFile, Properties requestProperties )
throws ProxyException, NotModifiedException
{
String url = remoteRepository.getURL().getUrl();
@@ -562,10 +560,10 @@
boolean connected = connectToRepository( connector, wagon, remoteRepository );
if ( connected )
{
- localFile = transferSimpleFile( wagon, remoteRepository, remotePath, repository, localFile );
+ localFile = transferSimpleFile( wagon, remoteRepository, remotePath, localFile );
- transferChecksum( wagon, remoteRepository, remotePath, repository, localFile, ".sha1" );
- transferChecksum( wagon, remoteRepository, remotePath, repository, localFile, ".md5" );
+ transferChecksum( wagon, remoteRepository, remotePath, localFile, ".sha1" );
+ transferChecksum( wagon, remoteRepository, remotePath, localFile, ".md5" );
}
}
catch ( NotFoundException e )
@@ -629,13 +627,12 @@
* @param wagon the wagon instance (should already be connected) to use.
* @param remoteRepository the remote repository to transfer from.
* @param remotePath the remote path to the resource to get.
- * @param repository the managed repository that will hold the transfered file
* @param localFile the local file that should contain the downloaded contents
* @param type the type of checksum to transfer (example: ".md5" or ".sha1")
* @throws ProxyException if copying the downloaded file into place did not succeed.
*/
private void transferChecksum( Wagon wagon, RemoteRepositoryContent remoteRepository, String remotePath,
- ManagedRepositoryContent repository, File localFile, String type )
+ File localFile, String type )
throws ProxyException
{
String url = remoteRepository.getURL().getUrl() + remotePath;
@@ -649,7 +646,7 @@
try
{
File hashFile = new File( localFile.getAbsolutePath() + type );
- transferSimpleFile( wagon, remoteRepository, remotePath + type, repository, hashFile );
+ transferSimpleFile( wagon, remoteRepository, remotePath + type, hashFile );
log.debug( "Checksum" + type + " Downloaded: " + hashFile );
}
catch ( NotFoundException e )
@@ -675,17 +672,16 @@
/**
* Perform the transfer of the remote file to the local file specified.
*
- * @param wagon the wagon instance to use.
+ * @param wagon the wagon instance to use.
* @param remoteRepository the remote repository to use
- * @param remotePath the remote path to attempt to get
- * @param repository the managed repository that will hold the transfered file
- * @param localFile the local file to save to
+ * @param remotePath the remote path to attempt to get
+ * @param localFile the local file to save to
* @return The local file that was transfered.
* @throws ProxyException if there was a problem moving the downloaded file into place.
* @throws WagonException if there was a problem tranfering the file.
*/
private File transferSimpleFile( Wagon wagon, RemoteRepositoryContent remoteRepository, String remotePath,
- ManagedRepositoryContent repository, File localFile )
+ File localFile )
throws ProxyException
{
assert ( remotePath != null );
@@ -695,8 +691,9 @@
try
{
- temp = File.createTempFile( localFile.getName() + ".", null, new File( repository.getRepoRoot() ) );
-
+ localFile.getParentFile().mkdirs();
+ temp = File.createTempFile(localFile.getName() + ".", null, localFile.getParentFile());
+
boolean success = false;
if ( !localFile.exists() )
@@ -852,7 +849,6 @@
throw new ProxyException( "Unable to overwrite existing target file: " + target.getAbsolutePath() );
}
- target.getParentFile().mkdirs();
if ( !temp.renameTo( target ) )
{
log.warn( "Unable to rename tmp file to its final name... resorting to copy command." );
@@ -1008,15 +1004,15 @@
{
/* do nothing */
}
-
+
private void logProcess( String managedRepoId, String resource, String event )
{
-
+
}
-
+
private void logRejection( String managedRepoId, String remoteRepoId, String resource, String reason )
{
-
+
}
private void initConnectorsAndNetworkProxies()