svn commit: r680607 - in /maven/artifact/trunk: pom.xml src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java

[brett]

Author: brett
Date: Mon Jul 28 19:55:12 2008
New Revision: 680607

URL: http://svn.apache.org/viewvc?rev=680607&view=rev
Log:
[MNG-3599] correct proxying for WebDAV
Merged from: r680604 on maven-2.0.x

Modified:
    maven/artifact/trunk/pom.xml
    
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java

Modified: maven/artifact/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/artifact/trunk/pom.xml?rev=680607&r1=680606&r2=680607&view=diff
==============================================================================
--- maven/artifact/trunk/pom.xml (original)
+++ maven/artifact/trunk/pom.xml Mon Jul 28 19:55:12 2008
@@ -224,6 +224,6 @@
     </pluginManagement>
   </build>
   <properties>
-    <wagon.version>1.0-beta-3</wagon.version>
+    <wagon.version>1.0-beta-4-SNAPSHOT</wagon.version>
   </properties>
 </project>

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=680607&r1=680606&r2=680607&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
 Mon Jul 28 19:55:12 2008
@@ -50,6 +50,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;
@@ -243,7 +244,11 @@
                     getLogger().debug( "not adding permissions to wagon 
connection" );
                 }
 
-                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 );
             }
@@ -538,7 +543,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;