Added proxy information to HttpBrowser (closes #56)

jodd-http/src/main/java/jodd/http/HttpBrowser.java

@@ -21,8 +21,16 @@ public HttpBrowser() {
 		httpConnectionProvider = JoddHttp.httpConnectionProvider;
 	}
 
+	/**
+	 * Defines proxy for a browser.
+	 */
+	public void setProxyInfo(ProxyInfo proxyInfo) {
+		httpConnectionProvider.useProxy(proxyInfo);
+	}
+
 	/**
 	 * Defines {@link jodd.http.HttpConnectionProvider} for this browser session.
+	 * Resets the previous proxy definition, if set.
 	 */
 	public void setHttpConnectionProvider(HttpConnectionProvider httpConnectionProvider) {
 		this.httpConnectionProvider = httpConnectionProvider;
@@ -146,5 +154,4 @@ protected void addCookies(HttpRequest httpRequest) {
 			httpRequest.header("cookie", cookieString.toString(), true);
 		}
 	}
-
 }

jodd-http/src/main/java/jodd/http/HttpConnectionProvider.java

@@ -9,6 +9,12 @@
  */
 public interface HttpConnectionProvider {
 
+	/**
+	 * Specifies {@link ProxyInfo proxy} for provide to use.
+	 */
+	public void useProxy(ProxyInfo proxyInfo);
+
+
  	/**
 	 * Creates new {@link HttpConnection}
 	 * from {@link jodd.http.HttpRequest request}.

jodd-http/src/main/java/jodd/http/net/ProxyInfo.java → jodd-http/src/main/java/jodd/http/ProxyInfo.java

@@ -1,8 +1,6 @@
 // Copyright (c) 2003-2013, Jodd Team (jodd.org). All Rights Reserved.
 
-package jodd.http.net;
-
-import javax.net.SocketFactory;
+package jodd.http;
 
 /**
  * Proxy information.
@@ -98,20 +96,4 @@ public String getProxyPassword() {
 		return proxyPassword;
 	}
 
-	/**
-	 * Returns socket factory based on socket
-	 */
-	public SocketFactory getSocketFactory() {
-		switch (proxyType) {
-			case NONE:
-				return SocketFactory.getDefault();
-			case HTTP:
-				return new HTTPProxySocketFactory(this);
-			case SOCKS4:
-				return new Socks4ProxySocketFactory(this);
-			case SOCKS5:
-				return new Socks5ProxySocketFactory(this);
-		}
-		return null;
-	}
 }

jodd-http/src/main/java/jodd/http/net/HTTPProxySocketFactory.java

@@ -3,6 +3,7 @@
 package jodd.http.net;
 
 import jodd.http.HttpException;
+import jodd.http.ProxyInfo;
 import jodd.util.Base64;
 
 import javax.net.SocketFactory;

jodd-http/src/main/java/jodd/http/net/SocketHttpConnectionProvider.java

@@ -5,6 +5,7 @@
 import jodd.http.HttpConnection;
 import jodd.http.HttpConnectionProvider;
 import jodd.http.HttpRequest;
+import jodd.http.ProxyInfo;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocket;
@@ -42,7 +43,7 @@ public HttpConnection createHttpConnection(HttpRequest httpRequest) throws IOExc
 
 			socket = sslSocket;
 		} else {
-			SocketFactory socketFactory = proxy.getSocketFactory();
+			SocketFactory socketFactory = getSocketFactory(proxy);
 
 			socket = createSocket(socketFactory, httpRequest.host(), httpRequest.port());
 		}
@@ -57,4 +58,21 @@ protected Socket createSocket(SocketFactory socketFactory, String host, int port
 		return socketFactory.createSocket(host, port);
 	}
 
+	/**
+	 * Returns socket factory based on proxy type.
+	 */
+	public SocketFactory getSocketFactory(ProxyInfo proxy) {
+		switch (proxy.getProxyType()) {
+			case NONE:
+				return SocketFactory.getDefault();
+			case HTTP:
+				return new HTTPProxySocketFactory(proxy);
+			case SOCKS4:
+				return new Socks4ProxySocketFactory(proxy);
+			case SOCKS5:
+				return new Socks5ProxySocketFactory(proxy);
+		}
+		return null;
+	}
+
 }

jodd-http/src/main/java/jodd/http/net/Socks4ProxySocketFactory.java

@@ -3,6 +3,7 @@
 package jodd.http.net;
 
 import jodd.http.HttpException;
+import jodd.http.ProxyInfo;
 
 import javax.net.SocketFactory;
 import java.io.IOException;

jodd-http/src/main/java/jodd/http/net/Socks5ProxySocketFactory.java

@@ -3,6 +3,7 @@
 package jodd.http.net;
 
 import jodd.http.HttpException;
+import jodd.http.ProxyInfo;
 
 import java.io.IOException;
 import java.io.InputStream;