Author: brett
Date: Mon Jul 28 19:32:21 2008
New Revision: 680604
URL: http://svn.apache.org/viewvc?rev=680604&view=rev
Log:
[MNG-3599] correct proxy handling for WebDAV
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/maven-2.0.x/pom.xml
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=680604&r1=680603&r2=680604&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 Jul 28 19:32:21 2008
@@ -36,6 +36,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;
@@ -250,7 +251,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 );
@@ -428,7 +433,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;
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=680604&r1=680603&r2=680604&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Mon Jul 28 19:32:21 2008
@@ -264,7 +264,7 @@
<properties>
<mavenVersion>2.0.10-SNAPSHOT</mavenVersion>
- <wagonVersion>1.0-beta-3</wagonVersion>
+ <wagonVersion>1.0-beta-4-SNAPSHOT</wagonVersion>
</properties>
<!--start-->
