You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by br...@apache.org on 2005/02/08 07:42:32 UTC
cvs commit: maven-wagon/wagon-provider-api/src/test/java/org/apache/maven/wagon/repository RepositoryTest.java
brett 2005/02/07 22:42:32
Modified: wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http
HttpWagon.java
wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http
LightweightHttpWagon.java
wagon-provider-api/src/main/java/org/apache/maven/wagon/repository
Repository.java
wagon-provider-api/src/main/java/org/apache/maven/wagon
AbstractWagon.java Wagon.java
wagon-provider-api/src/test/java/org/apache/maven/wagon/repository
RepositoryTest.java
Log:
proxy is per-Wagon (one HTTP proxy, one FTP proxy, etc)
Revision Changes Path
1.5 +15 -13 maven-wagon/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
Index: HttpWagon.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HttpWagon.java 15 Dec 2004 21:16:07 -0000 1.4
+++ HttpWagon.java 8 Feb 2005 06:42:31 -0000 1.5
@@ -16,26 +16,30 @@
* limitations under the License.
*/
-import org.apache.commons.httpclient.*;
-import org.apache.commons.httpclient.util.DateParser;
-import org.apache.commons.httpclient.util.DateParseException;
+import org.apache.commons.httpclient.Credentials;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HostConfiguration;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpRecoverableException;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.util.DateParseException;
+import org.apache.commons.httpclient.util.DateParser;
import org.apache.commons.lang.StringUtils;
-import org.apache.maven.wagon.*;
-import org.apache.maven.wagon.resource.Resource;
+import org.apache.maven.wagon.AbstractWagon;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.resource.Resource;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.OutputStream;
import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
/**
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
@@ -80,8 +84,6 @@
HostConfiguration hc = new HostConfiguration();
- ProxyInfo proxyInfo = getRepository().getProxyInfo();
-
if ( proxyInfo != null )
{
String proxyUsername = proxyInfo.getUserName();
1.6 +1 -3 maven-wagon/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
Index: LightweightHttpWagon.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LightweightHttpWagon.java 3 Feb 2005 11:50:42 -0000 1.5
+++ LightweightHttpWagon.java 8 Feb 2005 06:42:32 -0000 1.6
@@ -23,7 +23,6 @@
import org.apache.maven.wagon.StreamWagon;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
@@ -95,7 +94,6 @@
previousProxyPort = System.getProperty( "http.proxyPort" );
previousProxyExclusions = System.getProperty( "http.nonProxyHosts" );
- final ProxyInfo proxyInfo = this.getRepository().getProxyInfo();
if ( proxyInfo != null )
{
System.setProperty( "http.proxyHost", proxyInfo.getHost() );
1.8 +1 -14 maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
Index: Repository.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Repository.java 13 Dec 2004 21:57:07 -0000 1.7
+++ Repository.java 8 Feb 2005 06:42:32 -0000 1.8
@@ -20,7 +20,6 @@
import org.apache.maven.wagon.PathUtils;
import org.apache.maven.wagon.WagonConstants;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.maven.wagon.proxy.ProxyInfo;
import java.io.Serializable;
@@ -49,8 +48,6 @@
private String url;
- private ProxyInfo proxyInfo;
-
private AuthenticationInfo authenticationInfo;
@@ -89,16 +86,6 @@
this.authenticationInfo = authenticationInfo;
}
- public ProxyInfo getProxyInfo()
- {
- return proxyInfo;
- }
-
- public void setProxyInfo( ProxyInfo proxyInfo )
- {
- this.proxyInfo = proxyInfo;
- }
-
public String getBasedir()
{
return basedir;
1.13 +21 -4 maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
Index: AbstractWagon.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractWagon.java 15 Dec 2004 11:29:45 -0000 1.12
+++ AbstractWagon.java 8 Feb 2005 06:42:32 -0000 1.13
@@ -18,7 +18,13 @@
*/
import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.events.*;
+import org.apache.maven.wagon.events.SessionEvent;
+import org.apache.maven.wagon.events.SessionEventSupport;
+import org.apache.maven.wagon.events.SessionListener;
+import org.apache.maven.wagon.events.TransferEvent;
+import org.apache.maven.wagon.events.TransferEventSupport;
+import org.apache.maven.wagon.events.TransferListener;
+import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
@@ -32,6 +38,8 @@
/**
* Implementation of common facilties for Wagon providers.
*
+ * @todo [BP] The proxy information should probably be validated to match the wagon type
+ *
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
@@ -46,6 +54,8 @@
protected TransferEventSupport transferEventSupport = new TransferEventSupport();
+ protected ProxyInfo proxyInfo = null;
+
// ----------------------------------------------------------------------
// Repository
// ----------------------------------------------------------------------
@@ -59,8 +69,14 @@
// Connection
// ----------------------------------------------------------------------
- public void connect( Repository repository ) throws
- ConnectionException, AuthenticationException
+ public void connect( Repository repository )
+ throws ConnectionException, AuthenticationException
+ {
+ connect( repository, null );
+ }
+
+ public void connect( Repository repository, ProxyInfo proxyInfo )
+ throws ConnectionException, AuthenticationException
{
if ( repository == null )
{
@@ -68,6 +84,7 @@
}
this.repository = repository;
+ this.proxyInfo = proxyInfo;
fireSessionOpening();
1.9 +4 -0 maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java
Index: Wagon.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/Wagon.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Wagon.java 15 Dec 2004 21:16:07 -0000 1.8
+++ Wagon.java 8 Feb 2005 06:42:32 -0000 1.9
@@ -21,6 +21,7 @@
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.events.SessionListener;
import org.apache.maven.wagon.events.TransferListener;
+import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.repository.Repository;
import java.io.File;
@@ -82,6 +83,9 @@
void connect( Repository source )
throws ConnectionException, AuthenticationException;
+ void connect( Repository source, ProxyInfo proxyInfo )
+ throws ConnectionException, AuthenticationException;
+
void openConnection()
throws ConnectionException, AuthenticationException;
1.3 +1 -6 maven-wagon/wagon-provider-api/src/test/java/org/apache/maven/wagon/repository/RepositoryTest.java
Index: RepositoryTest.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-provider-api/src/test/java/org/apache/maven/wagon/repository/RepositoryTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RepositoryTest.java 3 Jun 2004 18:27:01 -0000 1.2
+++ RepositoryTest.java 8 Feb 2005 06:42:32 -0000 1.3
@@ -20,7 +20,6 @@
import junit.framework.TestCase;
import org.apache.maven.wagon.WagonConstants;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.maven.wagon.proxy.ProxyInfo;
/**
* @author <a href="mailto:jvanzyl@maven.org">Jason van Zyl</a>
@@ -55,10 +54,6 @@
assertNotNull( repository.getAuthenticationInfo() );
- repository.setProxyInfo( new ProxyInfo() );
-
- assertNotNull( repository.getProxyInfo() );
-
repository.setBasedir( "directory" );
assertEquals( "directory", repository.getBasedir() );
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-cvs-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-cvs-help@maven.apache.org