Author: jdcasey
Date: Mon Aug 25 18:24:27 2008
New Revision: 688932
URL: http://svn.apache.org/viewvc?rev=688932&view=rev
Log:
Reinstating all changes since 2.0.9 that aren't associated with the two major
changes related to concrete/dynamic build sections and POM interpolation.
[...]
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=688932&r1=688931&r2=688932&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Mon Aug 25 18:24:27 2008
@@ -49,6 +49,7 @@
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.observers.ChecksumObserver;
import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.proxy.ProxyInfoProvider;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.codehaus.plexus.PlexusConstants;
@@ -239,7 +240,11 @@
}
}
- wagon.connect( artifactRepository, getAuthenticationInfo( repository.getId() ), getProxy( protocol ) );
+ wagon.connect( artifactRepository, getAuthenticationInfo(
repository.getId() ), new ProxyInfoProvider(){
+ public ProxyInfo getProxyInfo(String protocol) {
+ return (ProxyInfo) proxies.get( protocol );
+ }
+ });
wagon.put( source, remotePath );
@@ -433,7 +438,11 @@
try
{
wagon.connect( new Repository( repository.getId(),
repository.getUrl() ),
- getAuthenticationInfo( repository.getId() ),
getProxy( protocol ) );
+ getAuthenticationInfo( repository.getId() ), new
ProxyInfoProvider(){
+ public ProxyInfo getProxyInfo(String protocol) {
+ return (ProxyInfo) proxies.get( protocol );
+ }
+ });
boolean firstRun = true;
boolean retry = true;
@@ -465,10 +474,20 @@
downloaded = true;
}
}
- else
+ catch ( NoSuchAlgorithmException e )
+ {
+ throw new TransferFailedException( "Unable to add checksum
methods: " + e.getMessage(), e );
+ }
+ finally
{
- wagon.get( remotePath, temp );
- downloaded = true;
+ if ( md5ChecksumObserver != null )
+ {
+ wagon.removeTransferListener( md5ChecksumObserver );
+ }
+ if ( sha1ChecksumObserver != null )
+ {
+ wagon.removeTransferListener( sha1ChecksumObserver );
+ }
}
if ( downloaded )
The 2.0.x branch is currently uncompilable [0]. Since this state reaches
almost two weeks back, I wasn't sure if people are already aware of that.
Benjamin
[0] http://ci.sonatype.org/job/Maven-2.0.x-with-bootstrap/94/console
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
