You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/09/04 18:21:03 UTC

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

Author: jdcasey
Date: Thu Sep  4 09:21:03 2008
New Revision: 692137

URL: http://svn.apache.org/viewvc?rev=692137&view=rev
Log:
bump to beta-4 of wagon. Cleaned up the ProxyInfoProvider anonymous implementations a little

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=692137&r1=692136&r2=692137&view=diff
==============================================================================
--- maven/artifact/trunk/pom.xml (original)
+++ maven/artifact/trunk/pom.xml Thu Sep  4 09:21:03 2008
@@ -225,6 +225,6 @@
     </pluginManagement>
   </build>
   <properties>
-    <wagon.version>1.0-beta-4-SNAPSHOT</wagon.version>
+    <wagon.version>1.0-beta-4</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=692137&r1=692136&r2=692137&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 Thu Sep  4 09:21:03 2008
@@ -244,9 +244,11 @@
                     getLogger().debug( "not adding permissions to wagon connection" );
                 }
 
-                wagon.connect( artifactRepository, getAuthenticationInfo( repository.getId() ), new ProxyInfoProvider(){
-                    public ProxyInfo getProxyInfo(String protocol) {
-                        return (ProxyInfo) proxies.get( protocol );
+                wagon.connect( artifactRepository, getAuthenticationInfo( repository.getId() ), new ProxyInfoProvider()
+                {
+                    public ProxyInfo getProxyInfo( String protocol )
+                    {
+                        return getProxy( protocol );
                     }
                 });
 
@@ -543,9 +545,11 @@
         try
         {
             wagon.connect( new Repository( repository.getId(), repository.getUrl() ),
-                           getAuthenticationInfo( repository.getId() ), new ProxyInfoProvider(){
-                public ProxyInfo getProxyInfo(String protocol) {
-                    return (ProxyInfo) proxies.get( protocol );
+                           getAuthenticationInfo( repository.getId() ), new ProxyInfoProvider()
+            {
+                public ProxyInfo getProxyInfo( String protocol )
+                {
+                    return getProxy( protocol );
                 }
             });