Deprecate apache-http.

bug: 18067888
Change-Id: I8d830c20e952734e2bb63da1e785094b7a783308

45 files changed, 226 insertions, 0 deletions

diff --git a/src/org/apache/http/conn/BasicEofSensorWatcher.java b/src/org/apache/http/conn/BasicEofSensorWatcher.java
index 9a9f3c5..38f9737 100644
--- a/src/org/apache/http/conn/BasicEofSensorWatcher.java
+++ b/src/org/apache/http/conn/BasicEofSensorWatcher.java
@@ -45,7 +45,12 @@ import java.io.IOException;
  * @version $Revision: 672367 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class BasicEofSensorWatcher implements EofSensorWatcher {
 
 
diff --git a/src/org/apache/http/conn/BasicManagedEntity.java b/src/org/apache/http/conn/BasicManagedEntity.java
index 9719e1a..8b145b3 100644
--- a/src/org/apache/http/conn/BasicManagedEntity.java
+++ b/src/org/apache/http/conn/BasicManagedEntity.java
@@ -51,7 +51,12 @@ import org.apache.http.entity.HttpEntityWrapper;
  * @version $Revision: 672367 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class BasicManagedEntity extends HttpEntityWrapper
     implements ConnectionReleaseTrigger, EofSensorWatcher {
 
diff --git a/src/org/apache/http/conn/ClientConnectionManager.java b/src/org/apache/http/conn/ClientConnectionManager.java
index e3375e1..e554197 100644
--- a/src/org/apache/http/conn/ClientConnectionManager.java
+++ b/src/org/apache/http/conn/ClientConnectionManager.java
@@ -50,7 +50,12 @@ import org.apache.http.conn.scheme.SchemeRegistry;
  * @version   $Revision: 671717 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface ClientConnectionManager {
 
     /**
diff --git a/src/org/apache/http/conn/ClientConnectionManagerFactory.java b/src/org/apache/http/conn/ClientConnectionManagerFactory.java
index 4bedc4e..a2a66a2 100644
--- a/src/org/apache/http/conn/ClientConnectionManagerFactory.java
+++ b/src/org/apache/http/conn/ClientConnectionManagerFactory.java
@@ -40,7 +40,12 @@ import org.apache.http.params.HttpParams;
  * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface ClientConnectionManagerFactory {    
 
     ClientConnectionManager newInstance(
diff --git a/src/org/apache/http/conn/ClientConnectionOperator.java b/src/org/apache/http/conn/ClientConnectionOperator.java
index 980b867..ce8c879 100644
--- a/src/org/apache/http/conn/ClientConnectionOperator.java
+++ b/src/org/apache/http/conn/ClientConnectionOperator.java
@@ -59,7 +59,12 @@ import org.apache.http.protocol.HttpContext;
  * @version   $Revision: 645850 $ $Date: 2008-04-08 04:08:52 -0700 (Tue, 08 Apr 2008) $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface ClientConnectionOperator {
 
 
diff --git a/src/org/apache/http/conn/ClientConnectionRequest.java b/src/org/apache/http/conn/ClientConnectionRequest.java
index 6ba02d0..e0774b1 100644
--- a/src/org/apache/http/conn/ClientConnectionRequest.java
+++ b/src/org/apache/http/conn/ClientConnectionRequest.java
@@ -35,7 +35,12 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * Encapsulates a request for a {@link ManagedClientConnection}.
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface ClientConnectionRequest {
     
     /**
diff --git a/src/org/apache/http/conn/ConnectTimeoutException.java b/src/org/apache/http/conn/ConnectTimeoutException.java
index 83a731a..6cc6922 100644
--- a/src/org/apache/http/conn/ConnectTimeoutException.java
+++ b/src/org/apache/http/conn/ConnectTimeoutException.java
@@ -40,7 +40,12 @@ import java.io.InterruptedIOException;
  * @author <a href="mailto:laura@lwerner.org">Laura Werner</a>
  * 
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class ConnectTimeoutException extends InterruptedIOException {
 
     private static final long serialVersionUID = -4816682903149535989L;
diff --git a/src/org/apache/http/conn/ConnectionKeepAliveStrategy.java b/src/org/apache/http/conn/ConnectionKeepAliveStrategy.java
index 27d56cb..92872fc 100644
--- a/src/org/apache/http/conn/ConnectionKeepAliveStrategy.java
+++ b/src/org/apache/http/conn/ConnectionKeepAliveStrategy.java
@@ -44,7 +44,12 @@ import org.apache.http.protocol.HttpContext;
  * @version $Revision: $
  * 
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface ConnectionKeepAliveStrategy {
     
     /**
diff --git a/src/org/apache/http/conn/ConnectionPoolTimeoutException.java b/src/org/apache/http/conn/ConnectionPoolTimeoutException.java
index 7d4985e..fb40e8c 100644
--- a/src/org/apache/http/conn/ConnectionPoolTimeoutException.java
+++ b/src/org/apache/http/conn/ConnectionPoolTimeoutException.java
@@ -38,7 +38,12 @@ package org.apache.http.conn;
  * @author <a href="mailto:laura@lwerner.org">Laura Werner</a>
  * 
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class ConnectionPoolTimeoutException extends ConnectTimeoutException {
 
     private static final long serialVersionUID = -7898874842020245128L;
diff --git a/src/org/apache/http/conn/ConnectionReleaseTrigger.java b/src/org/apache/http/conn/ConnectionReleaseTrigger.java
index a9ac12e..12d2afd 100644
--- a/src/org/apache/http/conn/ConnectionReleaseTrigger.java
+++ b/src/org/apache/http/conn/ConnectionReleaseTrigger.java
@@ -52,7 +52,12 @@ import java.io.IOException;
  * @version $Revision: 672367 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface ConnectionReleaseTrigger {
 
     /**
diff --git a/src/org/apache/http/conn/EofSensorInputStream.java b/src/org/apache/http/conn/EofSensorInputStream.java
index 0e1b90e..8cc5825 100644
--- a/src/org/apache/http/conn/EofSensorInputStream.java
+++ b/src/org/apache/http/conn/EofSensorInputStream.java
@@ -59,7 +59,12 @@ import java.io.IOException;
  * @version $Revision: 672367 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 // don't use FilterInputStream as the base class, we'd have to
 // override markSupported(), mark(), and reset() to disable them
 public class EofSensorInputStream extends InputStream
diff --git a/src/org/apache/http/conn/EofSensorWatcher.java b/src/org/apache/http/conn/EofSensorWatcher.java
index 837f8d9..83a60ad 100644
--- a/src/org/apache/http/conn/EofSensorWatcher.java
+++ b/src/org/apache/http/conn/EofSensorWatcher.java
@@ -45,7 +45,12 @@ import java.io.IOException;
  * @version $Revision: 552264 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface EofSensorWatcher {
 
     /**
diff --git a/src/org/apache/http/conn/HttpHostConnectException.java b/src/org/apache/http/conn/HttpHostConnectException.java
index 743ca77..ea64170 100644
--- a/src/org/apache/http/conn/HttpHostConnectException.java
+++ b/src/org/apache/http/conn/HttpHostConnectException.java
@@ -37,7 +37,12 @@ import org.apache.http.HttpHost;
 /**
  * A {@link ConnectException} that specifies the {@link HttpHost} that was
  * being connected to.
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class HttpHostConnectException extends ConnectException {
 
     private static final long serialVersionUID = -3194482710275220224L;
diff --git a/src/org/apache/http/conn/ManagedClientConnection.java b/src/org/apache/http/conn/ManagedClientConnection.java
index f642cb9..1b00a43 100644
--- a/src/org/apache/http/conn/ManagedClientConnection.java
+++ b/src/org/apache/http/conn/ManagedClientConnection.java
@@ -57,7 +57,12 @@ import org.apache.http.conn.routing.HttpRoute;
  * @version   $Revision: 672969 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface ManagedClientConnection extends
     HttpClientConnection, HttpInetConnection, ConnectionReleaseTrigger {
 
diff --git a/src/org/apache/http/conn/MultihomePlainSocketFactory.java b/src/org/apache/http/conn/MultihomePlainSocketFactory.java
index e9549ab..ee7c047 100644
--- a/src/org/apache/http/conn/MultihomePlainSocketFactory.java
+++ b/src/org/apache/http/conn/MultihomePlainSocketFactory.java
@@ -52,7 +52,12 @@ import org.apache.http.params.HttpParams;
  * the {@link #connectSocket(Socket, String, int, InetAddress, int, HttpParams)}
  * method cannot be reliably interrupted by closing the socket returned by the
  * {@link #createSocket()} method.
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public final class MultihomePlainSocketFactory implements SocketFactory {
 
     /**
diff --git a/src/org/apache/http/conn/OperatedClientConnection.java b/src/org/apache/http/conn/OperatedClientConnection.java
index 2eda8e9..32f6601 100644
--- a/src/org/apache/http/conn/OperatedClientConnection.java
+++ b/src/org/apache/http/conn/OperatedClientConnection.java
@@ -53,7 +53,12 @@ import org.apache.http.params.HttpParams;
  * @version   $Revision: 646087 $ $Date: 2008-04-08 14:36:46 -0700 (Tue, 08 Apr 2008) $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface OperatedClientConnection
     extends HttpClientConnection, HttpInetConnection {
 
diff --git a/src/org/apache/http/conn/params/ConnConnectionPNames.java b/src/org/apache/http/conn/params/ConnConnectionPNames.java
index ff1a090..d5edc86 100644
--- a/src/org/apache/http/conn/params/ConnConnectionPNames.java
+++ b/src/org/apache/http/conn/params/ConnConnectionPNames.java
@@ -37,7 +37,12 @@ package org.apache.http.conn.params;
  * @version $Revision: 576068 $
  * 
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface ConnConnectionPNames {
 
 
diff --git a/src/org/apache/http/conn/params/ConnConnectionParamBean.java b/src/org/apache/http/conn/params/ConnConnectionParamBean.java
index 094b152..c982454 100644
--- a/src/org/apache/http/conn/params/ConnConnectionParamBean.java
+++ b/src/org/apache/http/conn/params/ConnConnectionParamBean.java
@@ -38,7 +38,12 @@ import org.apache.http.params.HttpParams;
  * Allows for setting parameters relating to connections on
  * {@link HttpParams}.  This class ensures that the values set on the params
  * are type-safe. 
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class ConnConnectionParamBean extends HttpAbstractParamBean {
     
     public ConnConnectionParamBean (final HttpParams params) {
diff --git a/src/org/apache/http/conn/params/ConnManagerPNames.java b/src/org/apache/http/conn/params/ConnManagerPNames.java
index 1184b12..89efba0 100644
--- a/src/org/apache/http/conn/params/ConnManagerPNames.java
+++ b/src/org/apache/http/conn/params/ConnManagerPNames.java
@@ -37,7 +37,12 @@ package org.apache.http.conn.params;
  * @version $Revision: 658781 $
  * 
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface ConnManagerPNames {
 
     /**
diff --git a/src/org/apache/http/conn/params/ConnManagerParamBean.java b/src/org/apache/http/conn/params/ConnManagerParamBean.java
index 830b7bf..29ddaa6 100644
--- a/src/org/apache/http/conn/params/ConnManagerParamBean.java
+++ b/src/org/apache/http/conn/params/ConnManagerParamBean.java
@@ -38,7 +38,12 @@ import org.apache.http.params.HttpParams;
  * Allows for setting parameters relating to connection managers on
  * {@link HttpParams}.  This class ensures that the values set on the params
  * are type-safe. 
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class ConnManagerParamBean extends HttpAbstractParamBean {
 
     public ConnManagerParamBean (final HttpParams params) {
diff --git a/src/org/apache/http/conn/params/ConnManagerParams.java b/src/org/apache/http/conn/params/ConnManagerParams.java
index c6e042e..47af4c6 100644
--- a/src/org/apache/http/conn/params/ConnManagerParams.java
+++ b/src/org/apache/http/conn/params/ConnManagerParams.java
@@ -46,7 +46,12 @@ import org.apache.http.params.HttpParams;
  * @since 4.0
  *
  * @see ConnManagerPNames
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public final class ConnManagerParams implements ConnManagerPNames {
 
     /** The default maximum number of connections allowed overall */
diff --git a/src/org/apache/http/conn/params/ConnPerRoute.java b/src/org/apache/http/conn/params/ConnPerRoute.java
index abff04e..5ca7796 100644
--- a/src/org/apache/http/conn/params/ConnPerRoute.java
+++ b/src/org/apache/http/conn/params/ConnPerRoute.java
@@ -43,7 +43,12 @@ import org.apache.http.conn.routing.HttpRoute;
  * @version $Revision: 651813 $
  * 
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface ConnPerRoute {
 
     int getMaxForRoute(HttpRoute route);
diff --git a/src/org/apache/http/conn/params/ConnPerRouteBean.java b/src/org/apache/http/conn/params/ConnPerRouteBean.java
index c6a36e3..f5723a8 100644
--- a/src/org/apache/http/conn/params/ConnPerRouteBean.java
+++ b/src/org/apache/http/conn/params/ConnPerRouteBean.java
@@ -46,7 +46,12 @@ import org.apache.http.conn.routing.HttpRoute;
  * @version $Revision: 652947 $
  * 
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public final class ConnPerRouteBean implements ConnPerRoute {
 
     /** The default maximum number of connections allowed per host */
diff --git a/src/org/apache/http/conn/params/ConnRoutePNames.java b/src/org/apache/http/conn/params/ConnRoutePNames.java
index f9d42db..7cc8ef7 100644
--- a/src/org/apache/http/conn/params/ConnRoutePNames.java
+++ b/src/org/apache/http/conn/params/ConnRoutePNames.java
@@ -36,7 +36,12 @@ package org.apache.http.conn.params;
  * @version $Revision: 613656 $
  * 
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface ConnRoutePNames {
 
     /**
diff --git a/src/org/apache/http/conn/params/ConnRouteParamBean.java b/src/org/apache/http/conn/params/ConnRouteParamBean.java
index 9464c02..8ad13c6 100644
--- a/src/org/apache/http/conn/params/ConnRouteParamBean.java
+++ b/src/org/apache/http/conn/params/ConnRouteParamBean.java
@@ -42,7 +42,12 @@ import org.apache.http.params.HttpParams;
  * Allows for setting parameters relating to connection routes on
  * {@link HttpParams}.  This class ensures that the values set on the params
  * are type-safe. 
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class ConnRouteParamBean extends HttpAbstractParamBean {
     
     public ConnRouteParamBean (final HttpParams params) {
diff --git a/src/org/apache/http/conn/params/ConnRouteParams.java b/src/org/apache/http/conn/params/ConnRouteParams.java
index 2fa1654..3a06921 100644
--- a/src/org/apache/http/conn/params/ConnRouteParams.java
+++ b/src/org/apache/http/conn/params/ConnRouteParams.java
@@ -49,7 +49,12 @@ import org.apache.http.conn.routing.HttpRoute;
  * @version $Revision: 658785 $
  * 
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class ConnRouteParams implements ConnRoutePNames {
 
     /**
diff --git a/src/org/apache/http/conn/routing/BasicRouteDirector.java b/src/org/apache/http/conn/routing/BasicRouteDirector.java
index a3714ec..12e4507 100644
--- a/src/org/apache/http/conn/routing/BasicRouteDirector.java
+++ b/src/org/apache/http/conn/routing/BasicRouteDirector.java
@@ -44,7 +44,12 @@ package org.apache.http.conn.routing;
  * @version $Revision: 620255 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class BasicRouteDirector implements HttpRouteDirector {
 
     // public default constructor
diff --git a/src/org/apache/http/conn/routing/HttpRoute.java b/src/org/apache/http/conn/routing/HttpRoute.java
index 1e870b8..826c462 100644
--- a/src/org/apache/http/conn/routing/HttpRoute.java
+++ b/src/org/apache/http/conn/routing/HttpRoute.java
@@ -47,7 +47,12 @@ import org.apache.http.HttpHost;
  * @version $Revision: 653041 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public final class HttpRoute implements RouteInfo, Cloneable {
 
     /** The target host to connect to. */
diff --git a/src/org/apache/http/conn/routing/HttpRouteDirector.java b/src/org/apache/http/conn/routing/HttpRouteDirector.java
index 8cfcf67..f82ffbb 100644
--- a/src/org/apache/http/conn/routing/HttpRouteDirector.java
+++ b/src/org/apache/http/conn/routing/HttpRouteDirector.java
@@ -45,7 +45,12 @@ package org.apache.http.conn.routing;
  * @version $Revision: 620255 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface HttpRouteDirector {
 
     /** Indicates that the route can not be established at all. */
diff --git a/src/org/apache/http/conn/routing/HttpRoutePlanner.java b/src/org/apache/http/conn/routing/HttpRoutePlanner.java
index 489702a..4cc5957 100644
--- a/src/org/apache/http/conn/routing/HttpRoutePlanner.java
+++ b/src/org/apache/http/conn/routing/HttpRoutePlanner.java
@@ -42,7 +42,12 @@ import org.apache.http.protocol.HttpContext;
  * Encapsulates logic to compute a {@link HttpRoute} to a target host.
  * Implementations may for example be based on parameters, or on the
  * standard Java system properties.
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface HttpRoutePlanner {
     
     /**
diff --git a/src/org/apache/http/conn/routing/RouteInfo.java b/src/org/apache/http/conn/routing/RouteInfo.java
index 3449cb1..af7fc6c 100644
--- a/src/org/apache/http/conn/routing/RouteInfo.java
+++ b/src/org/apache/http/conn/routing/RouteInfo.java
@@ -46,7 +46,12 @@ import org.apache.http.HttpHost;
  * @version $Revision: 652200 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface RouteInfo {
 
     /**
diff --git a/src/org/apache/http/conn/routing/RouteTracker.java b/src/org/apache/http/conn/routing/RouteTracker.java
index ba8213e..c041638 100644
--- a/src/org/apache/http/conn/routing/RouteTracker.java
+++ b/src/org/apache/http/conn/routing/RouteTracker.java
@@ -46,7 +46,12 @@ import org.apache.http.HttpHost;
  * @version $Revision: 620254 $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public final class RouteTracker implements RouteInfo, Cloneable {
 
     /** The target host to connect to. */
diff --git a/src/org/apache/http/conn/scheme/HostNameResolver.java b/src/org/apache/http/conn/scheme/HostNameResolver.java
index ca6615c..d488a4b 100644
--- a/src/org/apache/http/conn/scheme/HostNameResolver.java
+++ b/src/org/apache/http/conn/scheme/HostNameResolver.java
@@ -33,7 +33,13 @@ package org.apache.http.conn.scheme;
 
 import java.io.IOException;
 import java.net.InetAddress;
+/**
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
+*/
 
+@Deprecated
 public interface HostNameResolver {
 
     InetAddress resolve (String hostname) throws IOException;
diff --git a/src/org/apache/http/conn/scheme/LayeredSocketFactory.java b/src/org/apache/http/conn/scheme/LayeredSocketFactory.java
index 8dc6c6c..b9f5348 100644
--- a/src/org/apache/http/conn/scheme/LayeredSocketFactory.java
+++ b/src/org/apache/http/conn/scheme/LayeredSocketFactory.java
@@ -42,7 +42,12 @@ import java.net.UnknownHostException;
  * @author Michael Becke
  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface LayeredSocketFactory extends SocketFactory {
 
     /**
diff --git a/src/org/apache/http/conn/scheme/PlainSocketFactory.java b/src/org/apache/http/conn/scheme/PlainSocketFactory.java
index b15df44..0c43bfc 100644
--- a/src/org/apache/http/conn/scheme/PlainSocketFactory.java
+++ b/src/org/apache/http/conn/scheme/PlainSocketFactory.java
@@ -46,7 +46,12 @@ import org.apache.http.params.HttpParams;
  * 
  * @author <a href="mailto:rolandw at apache.org">Roland Weber</a>
  * @author Michael Becke
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public final class PlainSocketFactory implements SocketFactory {
 
     /**
diff --git a/src/org/apache/http/conn/scheme/Scheme.java b/src/org/apache/http/conn/scheme/Scheme.java
index 590d59d..73b740e 100644
--- a/src/org/apache/http/conn/scheme/Scheme.java
+++ b/src/org/apache/http/conn/scheme/Scheme.java
@@ -53,7 +53,12 @@ import org.apache.http.util.LangUtils;
  * @author Michael Becke 
  * @author Jeff Dever
  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public final class Scheme {
 
     /** The name of this scheme, in lowercase. (e.g. http, https) */
diff --git a/src/org/apache/http/conn/scheme/SchemeRegistry.java b/src/org/apache/http/conn/scheme/SchemeRegistry.java
index 2ee8685..5f37286 100644
--- a/src/org/apache/http/conn/scheme/SchemeRegistry.java
+++ b/src/org/apache/http/conn/scheme/SchemeRegistry.java
@@ -48,7 +48,12 @@ import org.apache.http.HttpHost;
  * @version   $Revision: 648356 $ $Date: 2008-04-15 10:57:53 -0700 (Tue, 15 Apr 2008) $
  *
  * @since 4.0
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public final class SchemeRegistry {
 
     /** The available schemes in this registry. */
diff --git a/src/org/apache/http/conn/scheme/SocketFactory.java b/src/org/apache/http/conn/scheme/SocketFactory.java
index bb553b2..c6bc03c 100644
--- a/src/org/apache/http/conn/scheme/SocketFactory.java
+++ b/src/org/apache/http/conn/scheme/SocketFactory.java
@@ -50,7 +50,12 @@ import org.apache.http.params.HttpParams;
  * @author <a href="mailto:rolandw at apache.org">Roland Weber</a>
  * @author Michael Becke
  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface SocketFactory {
 
     /**
diff --git a/src/org/apache/http/conn/ssl/AbstractVerifier.java b/src/org/apache/http/conn/ssl/AbstractVerifier.java
index deda1d0..a56a6d4 100644
--- a/src/org/apache/http/conn/ssl/AbstractVerifier.java
+++ b/src/org/apache/http/conn/ssl/AbstractVerifier.java
@@ -57,7 +57,12 @@ import javax.net.ssl.SSLSocket;
  * implementations.
  * 
  * @author Julius Davies
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public abstract class AbstractVerifier implements X509HostnameVerifier {
 
     /**
diff --git a/src/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java b/src/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java
index 05828fb..c2bf4c4 100644
--- a/src/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java
+++ b/src/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java
@@ -36,7 +36,12 @@ package org.apache.http.conn.ssl;
  * off. This implementation is a no-op, and never throws the SSLException.
  * 
  * @author Julius Davies
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class AllowAllHostnameVerifier extends AbstractVerifier {
 
     public final void verify(
diff --git a/src/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java b/src/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java
index f4129d6..48a7bf9 100644
--- a/src/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java
+++ b/src/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java
@@ -44,7 +44,12 @@ import javax.net.ssl.SSLException;
  * including "a.b.foo.com".
  * 
  * @author Julius Davies
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class BrowserCompatHostnameVerifier extends AbstractVerifier {
 
     public final void verify(
diff --git a/src/org/apache/http/conn/ssl/SSLSocketFactory.java b/src/org/apache/http/conn/ssl/SSLSocketFactory.java
index 9195b4f..1e46fee 100644
--- a/src/org/apache/http/conn/ssl/SSLSocketFactory.java
+++ b/src/org/apache/http/conn/ssl/SSLSocketFactory.java
@@ -134,8 +134,13 @@ import java.security.UnrecoverableKeyException;
  *   </ul>
  * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
  * @author Julius Davies
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
 
+@Deprecated
 public class SSLSocketFactory implements LayeredSocketFactory {
 
     public static final String TLS   = "TLS";
diff --git a/src/org/apache/http/conn/ssl/StrictHostnameVerifier.java b/src/org/apache/http/conn/ssl/StrictHostnameVerifier.java
index 5eb0d96..bd9e70d 100644
--- a/src/org/apache/http/conn/ssl/StrictHostnameVerifier.java
+++ b/src/org/apache/http/conn/ssl/StrictHostnameVerifier.java
@@ -51,7 +51,12 @@ import javax.net.ssl.SSLException;
  * such as "a.b.foo.com".
  * 
  * @author Julius Davies
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class StrictHostnameVerifier extends AbstractVerifier {
 
     public final void verify(
diff --git a/src/org/apache/http/conn/ssl/X509HostnameVerifier.java b/src/org/apache/http/conn/ssl/X509HostnameVerifier.java
index 05ad04d..e38db5f 100644
--- a/src/org/apache/http/conn/ssl/X509HostnameVerifier.java
+++ b/src/org/apache/http/conn/ssl/X509HostnameVerifier.java
@@ -56,7 +56,12 @@ import java.security.cert.X509Certificate;
  * @author <a href="mailto:hauer@psicode.com">Sebastian Hauer</a>
  *
  * @since 4.0 (8-Dec-2006)
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public interface X509HostnameVerifier extends HostnameVerifier {
 
     boolean verify(String host, SSLSession session);
diff --git a/src/org/apache/http/conn/util/InetAddressUtils.java b/src/org/apache/http/conn/util/InetAddressUtils.java
index 71f2190..9a3cddb 100644
--- a/src/org/apache/http/conn/util/InetAddressUtils.java
+++ b/src/org/apache/http/conn/util/InetAddressUtils.java
@@ -35,7 +35,12 @@ import java.util.regex.Pattern;
 
 /**
  * A collection of utilities relating to InetAddresses.
+ *
+ * @deprecated Please use {@link java.net.URL#openConnection} instead.
+ *     Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
+ *     for further details.
  */
+@Deprecated
 public class InetAddressUtils {
 
     private InetAddressUtils() {